Think I fixed the event crash

FoxDenStudio · Mar 31, 2017 · 7d1e4f1 · 7d1e4f1
1 parent 52bc279
commit 7d1e4f1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/main/java/net/foxdenstudio/sponge/foxguard/plugin/listener/BlockChangeListener.java b/src/main/java/net/foxdenstudio/sponge/foxguard/plugin/listener/BlockChangeListener.java
@@ -94,18 +94,26 @@ public void handle(ChangeBlockEvent event) throws Exception {
         //FoxGuardMain.instance().getLogger().info(player.getName());
 
         List<IHandler> handlerList;
-        World world = event.getTargetWorld();
+
+//        System.err.println(event);
+//        System.err.println(event.getClass());
+//        System.err.println(event.getTransactions());
+//        System.exit(1);
+
+//        if (1 == 1) return;
 
         List<Transaction<BlockSnapshot>> transactions = event.getTransactions();
         Set<IHandler> handlerSet = new HashSet<>();
         if (transactions.size() == 1) {
-            Vector3i pos = transactions.get(0).getFinal().getLocation().get().getBlockPosition();
+            final World world = transactions.get(0).getFinal().getLocation().get().getExtent();
+            final Vector3i pos = transactions.get(0).getFinal().getLocation().get().getBlockPosition();
             FGManager.getInstance().getRegionsInChunkAtPos(world, pos).stream()
                     .filter(region -> region.contains(pos, world))
                     .forEach(region -> region.getHandlers().stream()
                             .filter(IFGObject::isEnabled)
                             .forEach(handlerSet::add));
         } else {
+            final World world = transactions.get(0).getFinal().getLocation().get().getExtent();
             FGManager.getInstance().getRegionsAtMultiPosI(
                     world,
                     transactions.stream()

diff --git a/src/main/java/net/foxdenstudio/sponge/foxguard/plugin/listener/ExplosionListener.java b/src/main/java/net/foxdenstudio/sponge/foxguard/plugin/listener/ExplosionListener.java
@@ -81,7 +81,7 @@ public void handle(ExplosionEvent event) throws Exception {
             } else user = null;
         }
 
-        World world = event.getTargetWorld();
+        final World world = event.getExplosion().getLocation().getExtent();
         FlagBitSet flags = FLAG_SET.clone();
 
         Set<IHandler> handlerSet = new HashSet<>();

diff --git a/src/main/java/net/foxdenstudio/sponge/foxguard/plugin/listener/SpawnEntityListener.java b/src/main/java/net/foxdenstudio/sponge/foxguard/plugin/listener/SpawnEntityListener.java
@@ -107,10 +107,11 @@ public void handle(SpawnEntityEvent event) throws Exception {
         }
 
         List<IHandler> handlerList = new ArrayList<>();
-        World world = event.getTargetWorld();
+//        World world = event.getTargetWorld();
 
         for (Entity entity : event.getEntities()) {
             Vector3d pos = entity.getLocation().getPosition();
+            final World world = entity.getLocation().getExtent();
             FGManager.getInstance().getRegionsInChunkAtPos(world, pos).stream()
                     .filter(region -> region.contains(pos, world))
                     .forEach(region -> region.getHandlers().stream()