Fix mob spawn flag

SergeyDertan · Mar 10, 2019 · 3f24794 · 3f24794
1 parent 844bb40
commit 3f24794
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/src/main/java/Sergey_Dertan/SRegionProtector/Event/EmptyEvent.java b/src/main/java/Sergey_Dertan/SRegionProtector/Event/EmptyEvent.java
@@ -0,0 +1,25 @@
+package Sergey_Dertan.SRegionProtector.Event;
+
+import cn.nukkit.event.Event;
+import cn.nukkit.event.entity.EntitySpawnEvent;
+
+/**
+ * special for
+ *
+ * @see RegionEventsHandler#entitySpawn(EntitySpawnEvent)
+ * because EntitySpawnEvent can`t be cancelled
+ */
+public final class EmptyEvent extends Event {
+
+    private boolean isCancelled;
+
+    @Override
+    public void setCancelled() {
+        this.isCancelled = true;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return this.isCancelled;
+    }
+}
diff --git a/src/main/java/Sergey_Dertan/SRegionProtector/Event/RegionEventsHandler.java b/src/main/java/Sergey_Dertan/SRegionProtector/Event/RegionEventsHandler.java
@@ -99,17 +99,21 @@ public void entityDamage(EntityDamageEvent e) {
         }
     }
 
-    //mob spawn flag
+    //mob spawn & lightning strike flags
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void entitySpawn(EntitySpawnEvent e) {
+        EmptyEvent ev = new EmptyEvent();
         if (e.getEntity() instanceof EntityLightning) {
-            this.handleEvent(RegionFlags.FLAG_LIGHTNING_STRIKE, e.getPosition(), e);
+            this.handleEvent(RegionFlags.FLAG_LIGHTNING_STRIKE, e.getPosition(), ev);
+            if (ev.isCancelled()) e.getEntity().close();
             return;
         }
         if (!(e.getEntity() instanceof EntityMob) && !(e.getEntity() instanceof EntityAnimal) && !(e.getEntity() instanceof EntityWaterAnimal)) {
             return;
         }
-        this.handleEvent(RegionFlags.FLAG_MOB_SPAWN, e.getPosition(), e);
+        this.handleEvent(RegionFlags.FLAG_MOB_SPAWN, e.getPosition(), ev);
+        if (ev.isCancelled()) e.getEntity().close();
+
     }
 
     //lightning strike flag