Separate "entity explodes" and "entity primes explosion" world events.

DenizenScript · Jul 4, 2013 · 0bd2f80 · 0bd2f80
1 parent 6834bd3
commit 0bd2f80
Showing 1 changed file with 13 additions and 6 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
@@ -127,15 +127,22 @@ public String doEvents(List<String> eventNames, dNPC npc, Player player, Map<Str
     public void blockBreak(BlockBreakEvent event) {
 
         Map<String, Object> context = new HashMap<String, Object>();
+        String blockType = event.getBlock().getType().name();
 
         context.put("location", new dLocation(event.getBlock().getLocation()));
         context.put("type", event.getBlock().getType().name());
 
         String determination = doEvents(Arrays.asList
         		("player breaks block",
-        		 "player breaks " + event.getBlock().getType().name(),
-        		 "player breaks " + event.getBlock().getType().name() + " with " +
-        				 new dItem(event.getPlayer().getItemInHand()).identify().split(":")[0]),
+        		 "player breaks " + blockType,
+        		 "player breaks block with " +
+        				 new dItem(event.getPlayer().getItemInHand()).identify().split(":")[0],
+        		 "player breaks block with " +
+                		 new dItem(event.getPlayer().getItemInHand()).identify(),
+        		 "player breaks " + blockType + " with " +
+        				 new dItem(event.getPlayer().getItemInHand()).identify().split(":")[0],
+        		 "player breaks " + blockType + " with " +
+                		 new dItem(event.getPlayer().getItemInHand()).identify()),
         		null, event.getPlayer(), context);
 
         if (determination.toUpperCase().startsWith("CANCELLED"))
@@ -316,7 +323,7 @@ public void entityDamage(EntityDamageEvent event) {
     	Entity entity = event.getEntity();
     	String entityType = entity.getType().name();
     	String cause = event.getCause().name();
-
+    	 
     	String determination;
 
     	Player contextPlayer = null;
@@ -599,8 +606,8 @@ public void explosionPrimeEvent(ExplosionPrimeEvent event) {
         context.put("fire", event.getFire());
 
         String determination = doEvents(Arrays.asList
-        		("entity explodes",
-        		 entity.getType().name() + " explodes"),
+        		("entity explosion primes",
+        		 entity.getType().name() + " explosion primes"),
         		null, null, context);
 
         if (determination.toUpperCase().startsWith("CANCELLED"))