Minor cleaning of events. Again.

DenizenScript · Mar 6, 2016 · e374f5b · e374f5b
1 parent 59fa30c
commit e374f5b
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 13 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/Denizen.java b/src/main/java/net/aufdemrand/denizen/Denizen.java
@@ -663,7 +663,7 @@ public void onEnable() {
             ScriptEvent.registerScriptEvent(new PlayerKickedScriptEvent());
             ScriptEvent.registerScriptEvent(new PlayerLeashesEntityScriptEvent());
             ScriptEvent.registerScriptEvent(new PlayerLeavesBedScriptEvent());
-            ScriptEvent.registerScriptEvent(new PlayerLevelsScriptEvent());
+            ScriptEvent.registerScriptEvent(new PlayerLevelsUpScriptEvent());
             ScriptEvent.registerScriptEvent(new PlayerLoginScriptEvent());
             ScriptEvent.registerScriptEvent(new PlayerOpensInvScriptEvent());
             ScriptEvent.registerScriptEvent(new PlayerPicksUpScriptEvent());

diff --git a/src/main/java/net/aufdemrand/denizen/events/player/PlayerChangesXPScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/player/PlayerChangesXPScriptEvent.java
@@ -3,6 +3,7 @@
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.events.BukkitScriptEvent;
 import net.aufdemrand.denizen.objects.dEntity;
+import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.aH;
@@ -20,9 +21,9 @@ public class PlayerChangesXPScriptEvent extends BukkitScriptEvent implements Lis
     // TODO: in area
     // <--[event]
     // @Events
-    // player changes xp
+    // player changes xp (in <area>)
     //
-    // @Regex ^on player changes xp$
+    // @Regex ^on player changes xp( in ((notable (cuboid|ellipsoid))|([^\s]+)))?$
     //
     // @Cancellable true
     //
@@ -41,8 +42,9 @@ public PlayerChangesXPScriptEvent() {
     }
 
     public static PlayerChangesXPScriptEvent instance;
-    public int amount;
     public PlayerExpChangeEvent event;
+    public int amount;
+    public dPlayer player;
 
     @Override
     public boolean couldMatch(ScriptContainer scriptContainer, String s) {
@@ -51,6 +53,11 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) {
 
     @Override
     public boolean matches(ScriptContainer scriptContainer, String s) {
+        String lower = CoreUtilities.toLowerCase(s);
+        if (!runInCheck(scriptContainer, s, lower, player.getLocation())) {
+            return false;
+        }
+
         return true;
     }
 
@@ -85,7 +92,7 @@ public boolean applyDetermination(ScriptContainer container, String determinatio
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(dEntity.isPlayer(event.getPlayer()) ? dEntity.getPlayerFrom(event.getPlayer()) : null, null);
+        return new BukkitScriptEntryData(player, null);
     }
 
     @Override
@@ -102,6 +109,7 @@ public void onPlayerChangesXP(PlayerExpChangeEvent event) {
             return;
         }
         amount = event.getAmount();
+        player = dPlayer.mirrorBukkitPlayer(event.getPlayer());
         this.event = event;
         fire();
         event.setAmount(amount);

diff --git a/src/main/java/net/aufdemrand/denizen/events/player/PlayerJumpScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/player/PlayerJumpScriptEvent.java
@@ -46,7 +46,10 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) {
     @Override
     public boolean matches(ScriptContainer scriptContainer, String s) {
         String lower = CoreUtilities.toLowerCase(s);
-        return runInCheck(scriptContainer, s, lower, event.getFrom());
+        if (!runInCheck(scriptContainer, s, lower, event.getFrom())) {
+            return false;
+        }
+        return true;
     }
 
     @Override

diff --git a/...vents/player/PlayerLevelsScriptEvent.java → ...nts/player/PlayerLevelsUpScriptEvent.java b/...vents/player/PlayerLevelsScriptEvent.java → ...nts/player/PlayerLevelsUpScriptEvent.java
@@ -18,13 +18,13 @@
 
 import java.util.List;
 
-public class PlayerLevelsScriptEvent extends BukkitScriptEvent implements Listener {
+public class PlayerLevelsUpScriptEvent extends BukkitScriptEvent implements Listener {
 
     // <--[event]
     // @Events
     // player levels up (from <level>) (to <level>) (in <area>)
     //
-    // @Regex ^on player levels up( from [^\s]+)?( to [^\s]+)?( in ((notable (cuboid|ellipsoid))|([^\s]+)))?$$
+    // @Regex ^on player levels up( from [^\s]+)?( to [^\s]+)?( in ((notable (cuboid|ellipsoid))|([^\s]+)))?$
     //
     // @Cancellable false
     //
@@ -36,11 +36,11 @@ public class PlayerLevelsScriptEvent extends BukkitScriptEvent implements Listen
     //
     // -->
 
-    public PlayerLevelsScriptEvent() {
+    public PlayerLevelsUpScriptEvent() {
         instance = this;
     }
 
-    public static PlayerLevelsScriptEvent instance;
+    public static PlayerLevelsUpScriptEvent instance;
     public int new_level;
     public int old_level;
     public dPlayer player;

diff --git a/src/main/java/net/aufdemrand/denizen/events/player/PlayerStatisticIncrementsScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/player/PlayerStatisticIncrementsScriptEvent.java
@@ -47,8 +47,8 @@ public PlayerStatisticIncrementsScriptEvent() {
     public Statistic statistic;
     public Integer previous_value;
     public Integer new_value;
-    public dMaterial material = null;
-    public dEntity entity = null;
+    public dMaterial material;
+    public dEntity entity;
     public PlayerStatisticIncrementEvent event;
 
     @Override
@@ -61,7 +61,7 @@ public boolean matches(ScriptContainer scriptContainer, String s) {
         String lower = CoreUtilities.toLowerCase(s);
         String stat = CoreUtilities.getXthArg(2, lower);
 
-        if (!stat.equals(CoreUtilities.toLowerCase(statistic.toString())) && !stat.equals("increments")) {
+        if (!stat.equals("increments") && !stat.equals(CoreUtilities.toLowerCase(statistic.toString()))) {
             return false;
         }