Fixes #253

Adds TeamKick and TeamLeave events to the reset check.
Do not reset challenges if data is stored per island. As in that case, they will already lose their data.

src/main/java/world/bentobox/challenges/listeners/ResetListener.java

@@ -1,6 +1,3 @@
-/**
- *
- */
 package world.bentobox.challenges.listeners;
 
 import org.bukkit.event.EventHandler;
@@ -10,43 +7,90 @@
 import world.bentobox.bentobox.api.events.island.IslandCreatedEvent;
 import world.bentobox.bentobox.api.events.island.IslandRegisteredEvent;
 import world.bentobox.bentobox.api.events.island.IslandResettedEvent;
+import world.bentobox.bentobox.api.events.team.TeamKickEvent;
+import world.bentobox.bentobox.api.events.team.TeamLeaveEvent;
 import world.bentobox.challenges.ChallengesAddon;
 
+
 /**
  * Resets challenges when the island is reset
- * @author tastybento
  *
+ * @author tastybento
  */
-public class ResetListener implements Listener {
+public record ResetListener(ChallengesAddon addon) implements Listener
+{
+    /**
+     * This method handles Island Created event.
+     *
+     * @param e Event that must be handled.
+     */
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onIslandCreated(IslandCreatedEvent e)
+    {
+        // Reset any challenges that can be assigned to the island or its owner.
+        if (this.addon.getChallengesSettings().isResetChallenges())
+        {
+            this.addon.getChallengesManager().resetAllChallenges(e.getOwner(),
+                e.getLocation().getWorld(),
+                e.getOwner());
+        }
+    }
 
-    private ChallengesAddon addon;
 
-    public ResetListener(ChallengesAddon addon) {
-        this.addon = addon;
+    /**
+     * This method handles Island Resetted event.
+     *
+     * @param e Event that must be handled.
+     */
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onIslandResetted(IslandResettedEvent e)
+    {
+        // Reset owner challenges only if data is stored per player.
+        if (this.addon.getChallengesSettings().isResetChallenges() &&
+            !this.addon.getChallengesSettings().isStoreAsIslandData())
+        {
+            this.addon.getChallengesManager().resetAllChallenges(e.getOwner(),
+                e.getLocation().getWorld(),
+                e.getOwner());
+        }
     }
 
 
     /**
-     * This method handles Island Created event.
+     * This method handles Island Registered event.
      *
      * @param e Event that must be handled.
      */
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onIslandCreated(IslandCreatedEvent e)
+    public void onIslandRegistered(IslandRegisteredEvent e)
     {
-        addon.getChallengesManager().resetAllChallenges(e.getOwner(), e.getLocation().getWorld(), e.getOwner());
+        // Reset owner challenges only if data is stored per player.
+        if (this.addon.getChallengesSettings().isResetChallenges() &&
+            !this.addon.getChallengesSettings().isStoreAsIslandData())
+        {
+            this.addon.getChallengesManager().resetAllChallenges(e.getOwner(),
+                e.getLocation().getWorld(),
+                e.getOwner());
+        }
     }
 
 
     /**
-     * This method handles Island Resetted event.
+     * This method handles Island Registered event.
      *
      * @param e Event that must be handled.
      */
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onIslandCreated(IslandResettedEvent e)
+    public void onTeamLeave(TeamLeaveEvent e)
     {
-        addon.getChallengesManager().resetAllChallenges(e.getOwner(), e.getLocation().getWorld(), e.getOwner());
+        // Reset player challenges only if data is stored per player.
+        if (this.addon.getChallengesSettings().isResetChallenges() &&
+            !this.addon.getChallengesSettings().isStoreAsIslandData())
+        {
+            this.addon.getChallengesManager().resetAllChallenges(e.getPlayerUUID(),
+                e.getLocation().getWorld(),
+                e.getOwner());
+        }
     }
 
 
@@ -56,8 +100,15 @@ public void onIslandCreated(IslandResettedEvent e)
      * @param e Event that must be handled.
      */
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onIslandCreated(IslandRegisteredEvent e)
+    public void onTeamKick(TeamKickEvent e)
     {
-        addon.getChallengesManager().resetAllChallenges(e.getOwner(), e.getLocation().getWorld(), e.getOwner());
+        // Reset player challenges only if data is stored per player.
+        if (this.addon.getChallengesSettings().isResetChallenges() &&
+            !this.addon.getChallengesSettings().isStoreAsIslandData())
+        {
+            this.addon.getChallengesManager().resetAllChallenges(e.getPlayerUUID(),
+                e.getLocation().getWorld(),
+                e.getOwner());
+        }
     }
 }