Przeglądaj źródła

Prevent multiple events from being fired.

GJ 11 lat temu
rodzic
commit
d6630a0eb5

+ 6 - 6
src/main/java/com/gmail/nossr50/listeners/EntityListener.java

@@ -199,7 +199,12 @@ public class EntityListener implements Listener {
 
 
         Entity entity = event.getEntity();
         Entity entity = event.getEntity();
 
 
-        if (!(entity instanceof LivingEntity)) {
+        if (entity.hasMetadata(mcMMO.customDamageKey)) {
+            entity.removeMetadata(mcMMO.customDamageKey, plugin);
+            return;
+        }
+
+        if (Misc.isNPCEntity(entity) || !entity.isValid() || !(entity instanceof LivingEntity)) {
             return;
             return;
         }
         }
 
 
@@ -213,11 +218,6 @@ public class EntityListener implements Listener {
 
 
         if (livingEntity instanceof Player) {
         if (livingEntity instanceof Player) {
             Player player = (Player) entity;
             Player player = (Player) entity;
-
-            if (Misc.isNPCEntity(player)) {
-                return;
-            }
-
             McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
             McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 
 
             /* Check for invincibility */
             /* Check for invincibility */