Adds more API to enable Level manipulation from plugins

BentoBoxWorld · Jul 3, 2020 · 66b098e · 66b098e
1 parent 071d3d0
commit 66b098e
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 2 deletions.
diff --git a/src/main/java/world/bentobox/level/LevelsManager.java b/src/main/java/world/bentobox/level/LevelsManager.java
@@ -21,6 +21,7 @@
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 
+import world.bentobox.bentobox.api.events.addon.AddonBaseEvent;
 import world.bentobox.bentobox.api.events.addon.AddonEvent;
 import world.bentobox.bentobox.api.panels.PanelItem;
 import world.bentobox.bentobox.api.panels.builders.PanelBuilder;
@@ -127,10 +128,18 @@ public CompletableFuture<Results> calculateLevel(UUID targetPlayer, Island islan
         return result;
     }
 
+    /**
+     * Fires the IslandLevelCalculatedEvent and returns true if it is canceled
+     * @param targetPlayer - target player
+     * @param island - island
+     * @param results - results set
+     * @return true if canceled
+     */
     private boolean fireIslandLevelCalcEvent(UUID targetPlayer, Island island, Results results) {
         // Fire post calculation event
         IslandLevelCalculatedEvent ilce = new IslandLevelCalculatedEvent(targetPlayer, island, results);
         Bukkit.getPluginManager().callEvent(ilce);
+        if (ilce.isCancelled()) return true;
         // This exposes these values to plugins via the event
         Map<String, Object> keyValues = new HashMap<>();
         keyValues.put("eventName", "IslandLevelCalculatedEvent");
@@ -140,8 +149,14 @@ private boolean fireIslandLevelCalcEvent(UUID targetPlayer, Island island, Resul
         keyValues.put("pointsToNextLevel", results.getPointsToNextLevel());
         keyValues.put("deathHandicap", results.getDeathHandicap());
         keyValues.put("initialLevel", results.getInitialLevel());
-        new AddonEvent().builder().addon(addon).keyValues(keyValues).build();
-        return ilce.isCancelled();
+        keyValues.put("isCancelled", false);
+        AddonBaseEvent e = new AddonEvent().builder().addon(addon).keyValues(keyValues).build();
+        // Set the values if they were altered
+        results.setLevel((Long)e.getKeyValues().getOrDefault("level", results.getLevel()));
+        results.setInitialLevel((Long)e.getKeyValues().getOrDefault("initialLevel", results.getInitialLevel()));
+        results.setDeathHandicap((int)e.getKeyValues().getOrDefault("deathHandicap", results.getDeathHandicap()));
+        results.setPointsToNextLevel((Long)e.getKeyValues().getOrDefault("pointsToNextLevel", results.getPointsToNextLevel()));
+        return ((Boolean)e.getKeyValues().getOrDefault("isCancelled", false));
     }
 
     /**

diff --git a/src/main/java/world/bentobox/level/calculators/Results.java b/src/main/java/world/bentobox/level/calculators/Results.java
@@ -29,6 +29,13 @@ public class Results {
     public int getDeathHandicap() {
         return deathHandicap.get();
     }
+    /**
+     * Set the death handicap
+     * @param handicap
+     */
+    public void setDeathHandicap(int handicap) {
+        deathHandicap.set(handicap);
+    }
 
     /**
      * @return the report
@@ -56,6 +63,14 @@ public long getPointsToNextLevel() {
         return pointsToNextLevel.get();
     }
 
+    /**
+     * Set the points to next level
+     * @param points
+     */
+    public void setPointsToNextLevel(long points) {
+        pointsToNextLevel.set(points);
+    }
+
     public long getInitialLevel() {
         return initialLevel.get();
     }