EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-10-31 17:43:44 +01:00
Code Issues Projects Releases Wiki Activity

Re-add WorldEdit check

Browse Source
This commit is contained in:
Jesse Boyd
2016-04-07 02:14:50 +10:00
parent fab60a0d53
commit f7810860da
3 changed files with 10 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_8_3.java
View File

@@ -13,7 +13,6 @@ import com.intellectualcrafters.plot.util.ReflectionUtils.RefMethod.RefExecutor;
import com.intellectualcrafters.plot.util.SetQueue; import com.intellectualcrafters.plot.util.SetQueue;
import com.intellectualcrafters.plot.util.SetQueue.ChunkWrapper; import com.intellectualcrafters.plot.util.SetQueue.ChunkWrapper;
import com.intellectualcrafters.plot.util.TaskManager; import com.intellectualcrafters.plot.util.TaskManager;
import com.plotsquared.bukkit.util.BukkitUtil;
import com.plotsquared.bukkit.util.SendChunk; import com.plotsquared.bukkit.util.SendChunk;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
@@ -261,17 +260,6 @@ public class FastQueue_1_8_3 extends SlowQueue {
return new FastChunk_1_8_3(wrap); return new FastChunk_1_8_3(wrap);
} }
@Override
public void regenerateChunk(String worldname, ChunkLoc loc) {
World world = BukkitUtil.getWorld(worldname);
Chunk chunk = world.getChunkAt(loc.x, loc.z);
if (chunk.getTileEntities().length > 0) {
Object w = methodGetHandleWorld.of(world).call();
((Collection) this.tileEntityListTick.of(w).get()).clear();
}
super.regenerateChunk(worldname, loc);
}
/** /**
* This should be overridden by any specialized queues * This should be overridden by any specialized queues
* @param plotChunk * @param plotChunk

12
Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_9.java
View File

@@ -80,18 +80,6 @@ public class FastQueue_1_9 extends SlowQueue {
MainUtil.initCache(); MainUtil.initCache();
} }
@Override
public void regenerateChunk(String worldname, ChunkLoc loc) {
World world = BukkitUtil.getWorld(worldname);
Chunk chunk = world.getChunkAt(loc.x, loc.z);
if (chunk.getTileEntities().length > 0) {
Object c = methodGetHandleChunk.of(chunk).call();
Object w = methodGetWorld.of(c).call();
((Collection) this.tileEntityListTick.of(w).get()).clear();
}
super.regenerateChunk(worldname, loc);
}
/** /**
* This should be overridden by any specialized queues * This should be overridden by any specialized queues
* @param plotChunk * @param plotChunk

14
Core/src/main/java/com/intellectualcrafters/plot/PS.java
View File

@@ -171,10 +171,16 @@ public class PS {
if (Settings.KILL_ROAD_MOBS || Settings.KILL_ROAD_VEHICLES) { if (Settings.KILL_ROAD_MOBS || Settings.KILL_ROAD_VEHICLES) {
this.IMP.runEntityTask(); this.IMP.runEntityTask();
} }
if (this.IMP.initWorldEdit()) { try {
this.worldedit = WorldEdit.getInstance(); if (this.IMP.initWorldEdit()) {
WorldEdit.getInstance().getEventBus().register(new WESubscriber()); this.worldedit = WorldEdit.getInstance();
new WE_Anywhere(); WorldEdit.getInstance().getEventBus().register(new WESubscriber());
new WE_Anywhere();
}
} catch (Throwable e) {
e.printStackTrace();
PS.debug("Incompatible version of WorldEdit, please upgrade: http://builds.enginehub.org/job/worldedit?branch=master");
} }
// Events // Events