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

src/main/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommand.java

@@ -109,6 +109,10 @@ public class AdminDeleteCommand extends ConfirmableCommand {
 
         // 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);
         }
 

src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommand.java

@@ -218,6 +218,10 @@ public class IslandTeamInviteAcceptCommand extends ConfirmableCommand {
 
         // 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);
         }
 

src/main/java/world/bentobox/bentobox/managers/IslandsManager.java

@@ -1177,6 +1177,10 @@ public class IslandsManager {
 
             // 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);
             }
 

src/main/java/world/bentobox/bentobox/managers/PlayersManager.java

@@ -489,6 +489,10 @@ public class PlayersManager {
 
         // 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