Uses a trial generic event to expose add-on data as K,V pairs.

BentoBoxWorld · Nov 26, 2018 · 5eea419 · 5eea419
1 parent 413887d
commit 5eea419
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -86,7 +86,7 @@
 		<dependency>
 			<groupId>world.bentobox</groupId>
 			<artifactId>bentobox</artifactId>
-			<version>0.12.0-SNAPSHOT</version>
+			<version>0.15.0-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>

diff --git a/src/main/java/world/bentobox/level/calculators/CalcIslandLevel.java b/src/main/java/world/bentobox/level/calculators/CalcIslandLevel.java
@@ -19,10 +19,10 @@
 import com.google.common.collect.Multiset.Entry;
 import com.google.common.collect.Multisets;
 
-import world.bentobox.level.Level;
 import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.util.Pair;
 import world.bentobox.bentobox.util.Util;
+import world.bentobox.level.Level;
 
 
 public class CalcIslandLevel {
@@ -345,5 +345,16 @@ public long getPointsToNextLevel() {
             return pointsToNextLevel;
         }
 
+        /* (non-Javadoc)
+         * @see java.lang.Object#toString()
+         */
+        @Override
+        public String toString() {
+            return "Results [report=" + report + ", mdCount=" + mdCount + ", uwCount=" + uwCount + ", ncCount="
+                    + ncCount + ", ofCount=" + ofCount + ", rawBlockCount=" + rawBlockCount + ", underWaterBlockCount="
+                    + underWaterBlockCount + ", level=" + level + ", deathHandicap=" + deathHandicap
+                    + ", pointsToNextLevel=" + pointsToNextLevel + "]";
+        }
+
     }
 }
diff --git a/src/main/java/world/bentobox/level/calculators/PlayerLevel.java b/src/main/java/world/bentobox/level/calculators/PlayerLevel.java
@@ -1,15 +1,18 @@
 package world.bentobox.level.calculators;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.UUID;
 
 import org.bukkit.World;
 
+import world.bentobox.bentobox.api.events.addon.AddonEvent;
+import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.level.Level;
 import world.bentobox.level.calculators.CalcIslandLevel.Results;
 import world.bentobox.level.event.IslandLevelCalculatedEvent;
 import world.bentobox.level.event.IslandPreLevelEvent;
-import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bentobox.database.objects.Island;
 
 
 /**
@@ -53,6 +56,13 @@ private void fireIslandLevelCalcEvent() {
         // Fire post calculation event
         IslandLevelCalculatedEvent ilce = new IslandLevelCalculatedEvent(targetPlayer, island, calc.getResult());
         addon.getServer().getPluginManager().callEvent(ilce);
+        Map<String, Object> keyValues = new HashMap<>();
+        keyValues.put("targetPlayer", targetPlayer);
+        keyValues.put("islandUUID", island.getUniqueId());
+        keyValues.put("level", calc.getResult().getLevel());
+        keyValues.put("pointsToNextLevel", calc.getResult().getPointsToNextLevel());
+        keyValues.put("deathHandicap", calc.getResult().getDeathHandicap());
+        addon.getServer().getPluginManager().callEvent(new AddonEvent().builder().addon(addon).keyValues(keyValues).build());
         Results results = ilce.getResults();
         // Save the results
         island.getMemberSet().forEach(m -> addon.setIslandLevel(world, m, results.getLevel()));