Removes tamed animal ownership on new island

Fixes #1450
BentoBoxWorld · Dec 24, 2020 · aec2e11 · aec2e11
1 parent 267387a
commit aec2e11
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/main/java/world/bentobox/bentobox/managers/island/NewIsland.java b/src/main/java/world/bentobox/bentobox/managers/island/NewIsland.java
@@ -7,6 +7,7 @@
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.World.Environment;
+import org.bukkit.entity.Tameable;
 import org.bukkit.util.Vector;
 
 import world.bentobox.bentobox.BStats;
@@ -246,6 +247,11 @@ private void postCreationTask(Island oldIsland) {
      * @param loc - the new island location
      */
     private void cleanUpUser(Location loc) {
+        // Remove any tamed animals
+        world.getEntitiesByClass(Tameable.class).stream()
+        .filter(Tameable::isTamed)
+        .filter(t -> t.getOwner() != null && t.getOwner().equals(user.getPlayer()))
+        .forEach(t -> t.setOwner(null));
         // Clear any old home locations (they should be clear, but just in case)
         plugin.getPlayers().clearHomeLocations(world, user.getUniqueId());
         // Set home location