From 0dbe0ab691613567797201cb7419cb645490dcec Mon Sep 17 00:00:00 2001 From: Dmck2b Date: Sun, 2 Feb 2014 17:03:20 +0000 Subject: [PATCH] Fix nerf-spawner-mobs --- ...d-Option-to-Nerf-Mobs-from-Spawner-s.patch | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/CraftBukkit-Patches/0080-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch b/CraftBukkit-Patches/0080-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch index 530c7fff5c..ef75865406 100644 --- a/CraftBukkit-Patches/0080-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch +++ b/CraftBukkit-Patches/0080-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch @@ -1,6 +1,6 @@ -From b05fe466fbccec76278a85a15ea7ac9866e12f3b Mon Sep 17 00:00:00 2001 +From 2af65921e4e70431afb681c5f12d33b771c31e5e Mon Sep 17 00:00:00 2001 From: md_5 -Date: Sun, 22 Dec 2013 20:58:02 +1100 +Date: Sun, 2 Feb 2014 16:55:46 +0000 Subject: [PATCH] Add Option to Nerf Mobs from Spawner's @@ -34,7 +34,7 @@ index 885a0ef..639354b 100644 this.bq.a(); this.world.methodProfiler.b(); diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index bb6b3d5..1eb8818 100644 +index bb6b3d5..20d9094 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -136,6 +136,12 @@ public abstract class MobSpawnerAbstract { @@ -50,6 +50,19 @@ index bb6b3d5..1eb8818 100644 } // CraftBukkit end } +@@ -181,6 +187,12 @@ public abstract class MobSpawnerAbstract { + SpawnerSpawnEvent event = CraftEventFactory.callSpawnerSpawnEvent(entity, this.b(), this.c(), this.d()); + if (!event.isCancelled()) { + this.a().addEntity(entity, CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit ++ // Spigot Start ++ if ( entity.world.spigotConfig.nerfSpawnerMobs ) ++ { ++ entity.fromMobSpawner = true; ++ } ++ // Spigot End + } + // CraftBukkit end + } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java index e7cb99d..018ec18 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -67,5 +80,5 @@ index e7cb99d..018ec18 100644 + } } -- -1.8.4.msysgit.0 +1.8.3.2