Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2025-02-11 09:11:21 +01:00
Code Issues Projects Releases Wiki Activity

Fix spider jockeys spawning skeletons even if natural spawning disabled

Browse Source
This commit is contained in:
Esophose 2019-08-15 11:06:46 -06:00
parent 662c248656
commit d4a9e5ab84
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
FabledSkyBlock/Core/src/main/java/me/goodandevil/skyblock/listeners/Entity.java
View File

@ -662,7 +662,7 @@ public class Entity implements Listener {
return; return;
} }
if (event.getSpawnReason() != SpawnReason.NATURAL) if (!(event.getSpawnReason() == SpawnReason.NATURAL || event.getSpawnReason() == SpawnReason.JOCKEY || event.getSpawnReason() == SpawnReason.MOUNT))
return; return;
LivingEntity livingEntity = event.getEntity(); LivingEntity livingEntity = event.getEntity();
@ -672,8 +672,16 @@ public class Entity implements Listener {
if (skyblock.getWorldManager().isIslandWorld(livingEntity.getWorld())) { if (skyblock.getWorldManager().isIslandWorld(livingEntity.getWorld())) {
if (!skyblock.getIslandManager().hasSetting(livingEntity.getLocation(), IslandRole.Owner, "NaturalMobSpawning")) { 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();
livingEntity.remove();
});
} else {
livingEntity.remove(); livingEntity.remove();
} }
} }
} }
} }
}