Merge branch 'develop' of https://github.com/BentoBoxWorld/BentoBox.git…

… into develop
BentoBoxWorld · Jan 31, 2024 · c100fe0 · c100fe0
2 parents b255088 + 6bf12d5
commit c100fe0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommand.java
@@ -109,6 +109,10 @@ private void cleanUp(User target) {
 
         // Reset the XP
         if (getIWM().isOnLeaveResetXP(getWorld())) {
+            // Player collected XP (displayed)
+            target.getPlayer().setLevel(0);
+            target.getPlayer().setExp(0);
+            // Player total XP (not displayed)
             target.getPlayer().setTotalExperience(0);
         }
 

diff --git a/.../java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommand.java b/.../java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommand.java
@@ -218,6 +218,10 @@ private void cleanPlayer(User user) {
 
         // Reset the XP
         if (getIWM().isOnJoinResetXP(getWorld())) {
+            // Player collected XP (displayed)
+            user.getPlayer().setLevel(0);
+            user.getPlayer().setExp(0);
+            // Player total XP (not displayed)
             user.getPlayer().setTotalExperience(0);
         }
 

diff --git a/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java b/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java
@@ -1177,6 +1177,10 @@ private void teleported(World world, User user, String name, boolean newIsland,
 
             // Reset the XP
             if (plugin.getIWM().isOnJoinResetXP(world)) {
+                // Player collected XP (displayed)
+                user.getPlayer().setLevel(0);
+                user.getPlayer().setExp(0);
+                // Player total XP (not displayed)
                 user.getPlayer().setTotalExperience(0);
             }
 

diff --git a/src/main/java/world/bentobox/bentobox/managers/PlayersManager.java b/src/main/java/world/bentobox/bentobox/managers/PlayersManager.java
@@ -489,6 +489,10 @@ public void cleanLeavingPlayer(World world, User target, boolean kicked, Island
 
         // Reset the XP
         if (plugin.getIWM().isOnLeaveResetXP(world) && target.isPlayer()) {
+            // Player collected XP (displayed)
+            target.getPlayer().setLevel(0);
+            target.getPlayer().setExp(0);
+            // Player total XP (not displayed)
             target.getPlayer().setTotalExperience(0);
         }
         // Save player