Change LiquidSpreadsScriptEvent to LiquidSpreadScriptEvent.

Adjust meta for modern uses. Avoid conflict with block spread event during onLoad script parsing.
DenizenScript · Feb 13, 2015 · cedcc2b · cedcc2b
1 parent 1fb5358
commit cedcc2b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/Denizen.java b/src/main/java/net/aufdemrand/denizen/Denizen.java
@@ -11,7 +11,7 @@
 
 import net.aufdemrand.denizen.events.core.*;
 import net.aufdemrand.denizen.events.scriptevents.EntityTeleportScriptEvent;
-import net.aufdemrand.denizen.events.scriptevents.LiquidSpreadsScriptEvent;
+import net.aufdemrand.denizen.events.scriptevents.LiquidSpreadScriptEvent;
 import net.aufdemrand.denizen.events.scriptevents.VehicleMoveScriptEvent;
 import net.aufdemrand.denizen.objects.properties.bukkit.BukkitElementProperties;
 import net.aufdemrand.denizen.objects.properties.bukkit.BukkitListProperties;
@@ -588,7 +588,7 @@ public void onEnable() {
 
             ScriptEvent.registerScriptEvent(new VehicleMoveScriptEvent());
             ScriptEvent.registerScriptEvent(new EntityTeleportScriptEvent());
-            ScriptEvent.registerScriptEvent(new LiquidSpreadsScriptEvent());
+            ScriptEvent.registerScriptEvent(new LiquidSpreadScriptEvent());
 
 
             ObjectFetcher.registerWithObjectFetcher(dItem.class);      // i@

diff --git a/src/main/java/net/aufdemrand/denizen/events/scriptevents/LiquidSpreadsScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/scriptevents/LiquidSpreadsScriptEvent.java
@@ -13,29 +13,29 @@
 
 import java.util.HashMap;
 
-public class LiquidSpreadsScriptEvent extends ScriptEvent implements Listener  {
+public class LiquidSpreadScriptEvent extends ScriptEvent implements Listener  {
 
     // <--[event]
     // @Events
     // liquid spreads
     // <liquid block> spreads
     //
     // @Triggers when a liquid block spreads or dragon egg moves.
+    //
+    // @Cancellable true
+    //
     // @Context
     // <context.destination> returns the dLocation the block spread to.
     // <context.location> returns the dLocation the block spread from.
     // <context.material> returns the dMaterial of the block that spread.
     //
-    // @Determine
-    // "CANCELLED" to stop the block from spreading.
-    //
     // -->
 
 
-    public LiquidSpreadsScriptEvent() {
+    public LiquidSpreadScriptEvent() {
         instance = this;
     }
-    public static LiquidSpreadsScriptEvent instance;
+    public static LiquidSpreadScriptEvent instance;
     public dMaterial material;
     public dLocation from;
     public dLocation to;
@@ -54,7 +54,8 @@ public boolean matches(ScriptContainer scriptContainer, String s) {
         String mname2 = material.identifySimple().substring(2);
         return lower.startsWith("liquid spreads")
                 || lower.startsWith(mname + " spreads")
-                || lower.startsWith(mname2 + " spreads");
+                || lower.startsWith(mname2 + " spreads")
+                && !lower.equals("block spreads");
     }
 
     @Override