Merge Recent Changes

DenizenScript · Jun 15, 2018 · 5d57c08 · 5d57c08
1 parent ba07053
commit 5d57c08
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/...ain/java/com/denizenscript/denizen2sponge/events/player/ExperienceChangesScriptEvent.java b/...ain/java/com/denizenscript/denizen2sponge/events/player/ExperienceChangesScriptEvent.java
@@ -39,10 +39,11 @@ public class ExperienceChangesScriptEvent extends ScriptEvent {
     //
     // @Context
     // player (PlayerTag) returns the player that changed experience.
+    // old_xp (IntegerTag) returns the old experience value.
     // new_xp (IntegerTag) returns the new experience value.
     //
     // @Determinations
-    // level (IntegerTag) sets the new experience value.
+    // xp (IntegerTag) sets the new experience value.
     // -->
 
     @Override
@@ -66,6 +67,8 @@ public boolean matches(ScriptEventData data) {
 
     public PlayerTag player;
 
+    public IntegerTag old_xp;
+
     public IntegerTag new_xp;
 
     public ChangeEntityExperienceEvent internal;
@@ -74,6 +77,7 @@ public boolean matches(ScriptEventData data) {
     public HashMap<String, AbstractTagObject> getDefinitions(ScriptEventData data) {
         HashMap<String, AbstractTagObject> defs = super.getDefinitions(data);
         defs.put("player", player);
+        defs.put("old_xp", old_xp);
         defs.put("new_xp", new_xp);
         return defs;
     }
@@ -93,6 +97,7 @@ public void onExperienceChanges(ChangeEntityExperienceEvent evt, @Root Player pl
         ExperienceChangesScriptEvent event = (ExperienceChangesScriptEvent) clone();
         event.internal = evt;
         event.player = new PlayerTag(player);
+        event.old_xp = new IntegerTag(evt.getOriginalExperience());
         event.new_xp = new IntegerTag(evt.getExperience());
         event.cancelled = evt.isCancelled();
         event.run();
@@ -101,7 +106,7 @@ public void onExperienceChanges(ChangeEntityExperienceEvent evt, @Root Player pl
 
     @Override
     public void applyDetermination(boolean errors, String determination, AbstractTagObject value) {
-        if (determination.equals("level")) {
+        if (determination.equals("xp")) {
             IntegerTag it = IntegerTag.getFor(this::error, value);
             new_xp = it;
             internal.setExperience((int) it.getInternal());

diff --git a/src/main/java/com/denizenscript/denizen2sponge/spongescripts/AdvancementScript.java b/src/main/java/com/denizenscript/denizen2sponge/spongescripts/AdvancementScript.java
@@ -45,7 +45,7 @@ public class AdvancementScript extends CommandScript {
     // parent (TextTag, only for children advancements), tree_id (TextTag, only for root
     // advancements), tree_name (TextTag, only for root advancements, optional),
     // position_x (NumberTag), and position_y (NumberTag).
-    // TODO: Add "Related information" such as criteria formatting, advancement types and examples.
+    // TODO: Add "Related information" such as advancement types and examples.
     // -->
 
     public AdvancementScript(String name, YAMLConfiguration section) {

diff --git a/src/main/java/com/denizenscript/denizen2sponge/utilities/flags/FlagHelper.java b/src/main/java/com/denizenscript/denizen2sponge/utilities/flags/FlagHelper.java
@@ -5,7 +5,6 @@
 import org.spongepowered.api.data.DataQuery;
 import org.spongepowered.api.data.DataRegistration;
 import org.spongepowered.api.data.key.Key;
-import org.spongepowered.api.data.key.KeyFactory;
 import org.spongepowered.api.data.value.mutable.Value;
 
 public class FlagHelper {