Fix entity death determination

DenizenScript · Jun 3, 2015 · e1e7c6f · e1e7c6f
1 parent 5d61773
commit e1e7c6f
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/events/core/EntityDeathSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/EntityDeathSmartEvent.java
@@ -156,6 +156,13 @@ public void entityDeath(EntityDeathEvent event) {
                 event.setDroppedExp(0);
             }
 
+            // XP
+            else if (aH.Argument.valueOf(determination)
+                    .matchesPrimitive(aH.PrimitiveType.Integer)) {
+                int xp = Integer.valueOf(determination.substring(3));
+                event.setDroppedExp(xp);
+            }
+
             // Drops
             else if (aH.Argument.valueOf(determination).matchesArgumentList(dItem.class)) {
                 dList drops = dList.valueOf(determination);
@@ -168,12 +175,7 @@ else if (aH.Argument.valueOf(determination).matchesArgumentList(dItem.class)) {
                 }
             }
 
-            // XP
-            else if (aH.Argument.valueOf(determination)
-                    .matchesPrimitive(aH.PrimitiveType.Integer)) {
-                int xp = Integer.valueOf(determination.substring(3));
-                event.setDroppedExp(xp);
-            } else if (!determination.toUpperCase().equals("NONE")) {
+            else if (!determination.toUpperCase().equals("NONE")) {
                 if (event instanceof PlayerDeathEvent) {
                     subEvent.setDeathMessage(determination);
                 }