diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java index 80af2a9..9cc33fc 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -144,7 +144,7 @@ } this.setCanSpawnAnimals(globalWConf.mobSpawn.spawnAnimals); - this.setCanSpawnNPCs(globalWConf.mobSpawn.spawnNPCs); + this.setCanSpawnNPCs(globalWConf.mobSpawn.allowNPCs); this.setAllowPvp(globalWConf.settings.pvp); this.setAllowFlight(settings.settings.player.allowFlight); this.func_155759_m(settings.settings.other.resourcePack); diff --git a/src/main/java/net/minecraft/world/WorldServer.java b/src/main/java/net/minecraft/world/WorldServer.java index bbcee39..06fdea1 100644 --- a/src/main/java/net/minecraft/world/WorldServer.java +++ b/src/main/java/net/minecraft/world/WorldServer.java @@ -530,12 +530,12 @@ public void updateEntityWithOptionalForce(Entity p_72866_1_, boolean p_72866_2_) { - if (!getConfig().mobSpawn.spawnAnimals && (p_72866_1_ instanceof EntityAnimal || p_72866_1_ instanceof EntityWaterMob)) + if (!getConfig().mobSpawn.allowAnimals && (p_72866_1_ instanceof EntityAnimal || p_72866_1_ instanceof EntityWaterMob)) { p_72866_1_.setDead(); } - if (!getConfig().mobSpawn.spawnNPCs && p_72866_1_ instanceof INpc) + if (!getConfig().mobSpawn.allowNPCs && p_72866_1_ instanceof INpc) { p_72866_1_.setDead(); } diff --git a/src/main/java/org/ultramine/server/WorldsConfig.java b/src/main/java/org/ultramine/server/WorldsConfig.java index cf0b829..96699d0 100644 --- a/src/main/java/org/ultramine/server/WorldsConfig.java +++ b/src/main/java/org/ultramine/server/WorldsConfig.java @@ -27,9 +27,10 @@ public static class MobSpawn { + public boolean allowAnimals = true; public boolean spawnAnimals = true; public boolean spawnMonsters = true; - public boolean spawnNPCs = true; + public boolean allowNPCs = true; } public static class Settings