From 70374c7a7c3f1bfd591991f7c6662ea09b5a891b Mon Sep 17 00:00:00 2001 From: Esophose Date: Thu, 15 Aug 2019 11:21:20 -0600 Subject: [PATCH] 1.10- support for natural spawning disable --- .../java/me/goodandevil/skyblock/listeners/Entity.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/FabledSkyBlock/Core/src/main/java/me/goodandevil/skyblock/listeners/Entity.java b/FabledSkyBlock/Core/src/main/java/me/goodandevil/skyblock/listeners/Entity.java index ae5ff9ed..f76e4767 100644 --- a/FabledSkyBlock/Core/src/main/java/me/goodandevil/skyblock/listeners/Entity.java +++ b/FabledSkyBlock/Core/src/main/java/me/goodandevil/skyblock/listeners/Entity.java @@ -674,8 +674,13 @@ public class Entity implements Listener { if (!skyblock.getIslandManager().hasSetting(livingEntity.getLocation(), IslandRole.Owner, "NaturalMobSpawning")) { if (event.getSpawnReason() == SpawnReason.JOCKEY || event.getSpawnReason() == SpawnReason.MOUNT) { Bukkit.getScheduler().scheduleSyncDelayedTask(skyblock, () -> { - for (org.bukkit.entity.Entity passenger : livingEntity.getPassengers()) - passenger.remove(); + if (NMSUtil.getVersionNumber() > 10) { // getPassengers() was added in 1.11 + for (org.bukkit.entity.Entity passenger : livingEntity.getPassengers()) + passenger.remove(); + } else { + if (livingEntity.getPassenger() != null) + livingEntity.getPassenger().remove(); + } livingEntity.remove(); }); } else {