ChromaGaming/LimitedCreative
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases 2 Packages Wiki Activity

Fixed: blockbreak in threaded mode requires cached value...

Browse source
This commit is contained in:
Jascha Starke 2013-09-30 19:35:43 +02:00
parent bd83e5b7cd
commit 9061e18db9
4 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/de/jaschastarke/minecraft/limitedcreative/ModBlockStates.java
View file

@ -90,9 +90,10 @@ public class ModBlockStates extends CoreModule<LimitedCreative> {
} }
@Override @Override
public void onDisable() { public void onDisable() {
if (model != null)
model.onDisable(); model.onDisable();
super.onDisable(); super.onDisable();
if (model instanceof Listener) if (model != null && model instanceof Listener)
listeners.removeListener((Listener) model); listeners.removeListener((Listener) model);
model = null; model = null;
} }

5
src/main/java/de/jaschastarke/minecraft/limitedcreative/blockstate/ThreadedModel.java
View file

@ -132,11 +132,6 @@ public class ThreadedModel extends AbstractModel implements DBModel, Listener {
} }
@Override @Override
public boolean isRestricted(Block block) { public boolean isRestricted(Block block) {
HasBlockState has = getMetaBlock(block);
if (!has.set) {
BlockState state = threads.callUpdate(block);
return state != null ? state.isRestricted() : false;
}
return getMetaBlock(block).restricted; return getMetaBlock(block).restricted;
} }

13
src/main/java/de/jaschastarke/minecraft/limitedcreative/blockstate/thread/ThreadLink.java
View file

@ -19,6 +19,9 @@ import de.jaschastarke.minecraft.limitedcreative.blockstate.ThreadedModel;
public class ThreadLink { public class ThreadLink {
private static final int BATCH_ACTION_LENGTH = 10; private static final int BATCH_ACTION_LENGTH = 10;
private static final int QUEUE_ACCESS_WARNING_DURATION = 5;
private static final int COUNT_WARNING_QUEUE = 5;
private static final int COUNT_ERROR_QUEUE = 20;
private Stack<Action> updateQueue = new Stack<Action>(); private Stack<Action> updateQueue = new Stack<Action>();
private boolean shutdown = false; private boolean shutdown = false;
@ -59,6 +62,11 @@ public class ThreadLink {
synchronized (updateQueue) { synchronized (updateQueue) {
while (updateQueue.isEmpty() && !shutdown) while (updateQueue.isEmpty() && !shutdown)
updateQueue.wait(); updateQueue.wait();
if (updateQueue.size() > (BATCH_ACTION_LENGTH * COUNT_ERROR_QUEUE)) {
getLog().severe("Extrem large DB-Queue in " + Thread.currentThread().getName() + ": " + updateQueue.size());
} else if (updateQueue.size() > (BATCH_ACTION_LENGTH * COUNT_WARNING_QUEUE)) {
getLog().warn("Large DB-Queue in " + Thread.currentThread().getName() + ": " + updateQueue.size());
}
for (int i = 0; i < BATCH_ACTION_LENGTH && !updateQueue.isEmpty(); i++) { for (int i = 0; i < BATCH_ACTION_LENGTH && !updateQueue.isEmpty(); i++) {
acts.add(updateQueue.pop()); acts.add(updateQueue.pop());
} }
@ -95,10 +103,15 @@ public class ThreadLink {
public void queueUpdate(Block block) { public void queueUpdate(Block block) {
long l = System.currentTimeMillis();
synchronized (updateQueue) { synchronized (updateQueue) {
updateQueue.add(new UpdateBlockStateAction(block)); updateQueue.add(new UpdateBlockStateAction(block));
updateQueue.notify(); updateQueue.notify();
} }
long l2 = System.currentTimeMillis();
if (l2 - l > QUEUE_ACCESS_WARNING_DURATION) {
getLog().warn("queueUpdate-action took to long: " + (l - 2) + "ms");
}
} }
public BlockState callUpdate(Block block) { public BlockState callUpdate(Block block) {

2
src/main/java/de/jaschastarke/minecraft/limitedcreative/regions/worldguard/CustomRegionManager.java
View file

@ -170,7 +170,7 @@ public class CustomRegionManager {
public String getRegionsHash(Location loc) { public String getRegionsHash(Location loc) {
StringBuilder hash = new StringBuilder(loc.getWorld().getName()); StringBuilder hash = new StringBuilder(loc.getWorld().getName());
List<String> idlist = getWGGlobalManager().get(loc.getWorld()).getApplicableRegionsIDs(BukkitUtil.toVector(loc)); List<String> idlist = getWGManager(loc.getWorld()).getApplicableRegionsIDs(BukkitUtil.toVector(loc));
if (idlist.size() > 0) { if (idlist.size() > 0) {
hash.append("#"); hash.append("#");
String[] ids = idlist.toArray(new String[idlist.size()]); String[] ids = idlist.toArray(new String[idlist.size()]);