JavaJava19
diff --git a/‎core/src/main/java/be/isach/ultracosmetics/UltraCosmetics.java‎
Lines changed: 5 additions & 0 deletions b/‎core/src/main/java/be/isach/ultracosmetics/UltraCosmetics.java‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎core/src/main/java/be/isach/ultracosmetics/cosmetics/pets/PetSnowman.java‎
Lines changed: 3 additions & 0 deletions b/‎core/src/main/java/be/isach/ultracosmetics/cosmetics/pets/PetSnowman.java‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎core/src/main/java/be/isach/ultracosmetics/listeners/MainListener.java‎
Lines changed: 10 additions & 0 deletions b/‎core/src/main/java/be/isach/ultracosmetics/listeners/MainListener.java‎
Lines changed: 10 additions & 0 deletions
@@ -288,6 +288,11 @@ public void onDisable() {
             }
 
             if (playerManager != null) {
+                // make sure pets are properly removed on server shutdown
+                for (UltraPlayer player : playerManager.getUltraPlayers()) {
+                    player.clear();
+                }
+
                 playerManager.dispose();
             }
 
 
@@ -5,6 +5,7 @@
 import be.isach.ultracosmetics.cosmetics.type.PetType;
 import be.isach.ultracosmetics.player.UltraPlayer;
 import be.isach.ultracosmetics.util.ItemFactory;
+import be.isach.ultracosmetics.util.ServerVersion;
 import be.isach.ultracosmetics.util.UCMaterial;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Snowman;
@@ -18,6 +19,8 @@
 public class PetSnowman extends Pet {
     public PetSnowman(UltraPlayer owner, UltraCosmetics ultraCosmetics) {
         super(owner, ultraCosmetics, PetType.getByName("snowman"), ItemFactory.create(UCMaterial.SNOWBALL, UltraCosmeticsData.get().getItemNoPickupString()));
+        // setDerp was added in 1.9, so skip the task if we're on 1.8
+        if (UltraCosmeticsData.get().getServerVersion() == ServerVersion.v1_8_R3) return;
         Bukkit.getScheduler().runTaskLater(getUltraCosmetics(), () -> {
             if (getOwner() != null && getEntity() != null) {
                 Snowman snowman = (Snowman) getEntity();
 
@@ -1,8 +1,11 @@
 package be.isach.ultracosmetics.listeners;
 
 import be.isach.ultracosmetics.UltraCosmeticsData;
+
+import org.bukkit.entity.EntityType;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
+import org.bukkit.event.block.EntityBlockFormEvent;
 import org.bukkit.event.inventory.InventoryPickupItemEvent;
 import org.bukkit.event.player.PlayerInteractAtEntityEvent;
 import org.bukkit.event.player.PlayerPickupItemEvent;
@@ -41,4 +44,11 @@ public void onPlayerPickup(PlayerPickupItemEvent event) {
             event.setCancelled(true);
         }
     }
+
+    @EventHandler
+    public void onSnowmanTrail(EntityBlockFormEvent event) {
+        if (event.getEntity().getType() != EntityType.SNOWMAN) return;
+        if (!event.getEntity().hasMetadata("Pet")) return;
+        event.setCancelled(true);
+    }
 }
Original file line number	Diff line number	Diff line change
`@@ -288,6 +288,11 @@ public void onDisable() {`
`288`	`288`	`}`
`289`	`289`
`290`	`290`	`if (playerManager != null) {`
	`291`	`+ // make sure pets are properly removed on server shutdown`
	`292`	`+ for (UltraPlayer player : playerManager.getUltraPlayers()) {`
	`293`	`+ player.clear();`
	`294`	`+ }`
	`295`	`+`
`291`	`296`	`playerManager.dispose();`
`292`	`297`	`}`
`293`	`298`