From 444edb209c0e2b984c411eaa085e81ed7b9fdee4 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Tue, 2 Jul 2019 01:14:11 -0700
Subject: [PATCH] Remove summoned entities on server shutdown

---
 Changelog.txt                                                    | 1 +
 src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java | 1 +
 src/main/java/com/gmail/nossr50/util/player/UserManager.java     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/Changelog.txt b/Changelog.txt
index 3ad695e07..d1f1b014e 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,6 +1,7 @@
 Version 2.1.92
     Call Of The Wild (COTW) no longer cares if entities of the same type are nearby when attempting to summon a new entity
     Most COTW messages have been tweaked and new COTW messages have been added
+    COTW Horses now always spawn in as adults
     By default players are no longer allowed to breed COTW summoned animals with other animals, you can turn this off (see the notes)
     Changed the sound effect for COTW (Fireworks -> Pop)
     Fixed a bug where COTW summon limit was global instead of per player
diff --git a/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java b/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java
index 735c8d3c0..ca898856b 100644
--- a/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java
@@ -456,6 +456,7 @@ public class TamingManager extends SkillManager {
         horse.setColor(Horse.Color.values()[Misc.getRandom().nextInt(Horse.Color.values().length)]);
         horse.setStyle(Horse.Style.values()[Misc.getRandom().nextInt(Horse.Style.values().length)]);
         horse.setJumpStrength(Math.max(AdvancedConfig.getInstance().getMinHorseJumpStrength(), Math.min(Math.min(Misc.getRandom().nextDouble(), Misc.getRandom().nextDouble()) * 2, AdvancedConfig.getInstance().getMaxHorseJumpStrength())));
+        horse.setAdult();
 
         //TODO: setSpeed, once available
 
diff --git a/src/main/java/com/gmail/nossr50/util/player/UserManager.java b/src/main/java/com/gmail/nossr50/util/player/UserManager.java
index b2044766c..396770c58 100644
--- a/src/main/java/com/gmail/nossr50/util/player/UserManager.java
+++ b/src/main/java/com/gmail/nossr50/util/player/UserManager.java
@@ -44,6 +44,7 @@ public final class UserManager {
      */
     public static void remove(Player player) {
         McMMOPlayer mcMMOPlayer = getPlayer(player);
+        mcMMOPlayer.cleanup();
         player.removeMetadata(mcMMO.playerDataKey, mcMMO.p);
 
         if(playerDataSet != null && playerDataSet.contains(mcMMOPlayer)) {