Upstream
/
AreaShop
mirror of https://github.com/NLthijs48/AreaShop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Simplify WorldEdit 7 flushQueue vs. flushSession

This commit is contained in:
pmme 2018-12-28 09:22:54 +13:00 committed by Thijs Wiefferink
parent 5b327db316
commit 12bf467714
2 changed files with 2 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
areashop-worldedit-7_beta_1/src/main/java/me/wiefferink/areashop/handlers/WorldEditHandler7_beta_1.java
View File

@ -145,23 +145,7 @@ public class WorldEditHandler7_beta_1 extends WorldEditInterface {
pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
return false;
}
// flushQueue is for worldedit-bukkit-7.0.0-beta-01, later versions have renamed it to flushSession
boolean done = false;
for (String methodName : Arrays.asList("flushSession", "flushQueue")) {
try {
Method method = editSession.getClass().getMethod(methodName);
method.invoke(editSession);
done = true;
} catch (SecurityException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) {
// Try the next methodName
}
}
if(!done) {
pluginInterface.getLogger().warning("Could not restore schematic of " + regionInterface.getName() + ", flushSession() failed");
}
editSession.flushQueue();
return true;
}

19
areashop-worldedit-7_beta_4/src/main/java/me/wiefferink/areashop/handlers/WorldEditHandler7_beta_4.java
View File

@ -87,7 +87,6 @@ public class WorldEditHandler7_beta_4 extends WorldEditInterface {
return false;
}
EditSession editSession = pluginInterface.getWorldEdit().getWorldEdit().getEditSessionFactory().getEditSession(world, pluginInterface.getConfig().getInt("maximumBlocks"));
editSession.enableQueue();
ProtectedRegion region = regionInterface.getRegion();
// Get the origin and size of the region
BlockVector3 origin = BlockVector3.at(region.getMinimumPoint().getBlockX(), region.getMinimumPoint().getBlockY(), region.getMinimumPoint().getBlockZ());
@ -145,23 +144,7 @@ public class WorldEditHandler7_beta_4 extends WorldEditInterface {
pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
return false;
}
// flushQueue is for worldedit-bukkit-7.0.0-beta-01, later versions have renamed it to flushSession
boolean done = false;
for (String methodName : Arrays.asList("flushSession", "flushQueue")) {
try {
Method method = editSession.getClass().getMethod(methodName);
method.invoke(editSession);
done = true;
} catch (SecurityException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) {
// Try the next methodName
}
}
if(!done) {
pluginInterface.getLogger().warning("Could not restore schematic of " + regionInterface.getName() + ", flushSession() failed");
}
editSession.flushSession();
return true;
}