Fix hanging entity issues.

DenizenScript · Jul 1, 2015 · 6ed6d16 · 6ed6d16
1 parent 92a2057
commit 6ed6d16
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityBreaksHangingScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityBreaksHangingScriptEvent.java
@@ -17,9 +17,7 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.hanging.HangingBreakByEntityEvent;
 
-import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 
 public class EntityBreaksHangingScriptEvent extends BukkitScriptEvent implements Listener {
 
@@ -103,8 +101,8 @@ public boolean applyDetermination(ScriptContainer container, String determinatio
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(entity.isPlayer() ? dEntity.getPlayerFrom(event.getRemover()) : null,
-                entity.isCitizensNPC() ? dEntity.getNPCFrom(event.getRemover()) : null);
+        return new BukkitScriptEntryData(entity.isPlayer() ? entity.getDenizenPlayer() : null,
+                entity.isCitizensNPC() ? entity.getDenizenNPC() : null);
     }
 
     @Override

diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/HangingBreaksScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/HangingBreaksScriptEvent.java
@@ -57,15 +57,17 @@ public HangingBreaksScriptEvent() {
 
     @Override
     public boolean couldMatch(ScriptContainer scriptContainer, String s) {
-        return CoreUtilities.getXthArg(1, CoreUtilities.toLowerCase(s)).equals("breaks");
+        String lower = CoreUtilities.toLowerCase(s);
+        return CoreUtilities.getXthArg(1, lower).equals("breaks")
+                && !CoreUtilities.getXthArg(2, lower).equals("hanging");
     }
 
     @Override
     public boolean matches(ScriptContainer scriptContainer, String s) {
         String lower = CoreUtilities.toLowerCase(s);
         String hangCheck = CoreUtilities.getXthArg(0, lower);
         if (!hangCheck.equals("hanging")
-                && hanging.matchesEntity(hangCheck)) {
+                && !hanging.matchesEntity(hangCheck)) {
             return false;
         }