Fix entitydamage NPE, some formatting

DenizenScript · Aug 17, 2013 · 962ce1b · 962ce1b
1 parent ea0650f
commit 962ce1b
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java
@@ -560,7 +560,7 @@ else if (entity.isPlayer()) {
         events.add(entityType + " damaged");
         events.add(entityType + " damaged by " + cause);
 
-        if (isFatal == true) {
+        if (isFatal) {
             events.add("entity killed");
             events.add("entity killed by " + cause);
             events.add(entityType + " killed");
@@ -587,7 +587,7 @@ else if (entity.isPlayer()) {
                 damagerType = "npc";
 
                 // If we had no NPC in our regular context, use this one
-                if (npc == null) npc = subNPC;
+                npc = subNPC;
             }
             else if (damager.isPlayer()) {
                 subPlayer = new dPlayer(damager.getPlayer());
@@ -622,7 +622,7 @@ else if (damager.isPlayer()) {
             subEvents.add(damagerType + " damages entity");
             subEvents.add(damagerType + " damages " + entityType);
 
-            if (isFatal == true) {
+            if (isFatal) {
                 events.add("entity killed by entity");
                 events.add("entity killed by " + damagerType);
                 events.add(entityType + " killed by entity");
@@ -634,7 +634,7 @@ else if (damager.isPlayer()) {
                 subEvents.add(damagerType + " kills " + entityType);
             }
 
-            determination = doEvents(subEvents, subNPC, subPlayer.getPlayerEntity(), context);
+            determination = doEvents(subEvents, subNPC, (subPlayer != null?subPlayer.getPlayerEntity():null), context);
 
             if (determination.toUpperCase().startsWith("CANCELLED"))
                 event.setCancelled(true);