TakeV/Paper
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #115 from Dmck2b/FixSpawnerNerfer

Browse source 
Fix nerf-spawner-mobs not being fully functional
This commit is contained in:
thinkofdeath 2014-02-02 09:07:32 -08:00
parent bff5ac5d37 0dbe0ab691
commit 8806f91b69
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
CraftBukkit-Patches/0080-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
View file

@ -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 <git@md-5.net>
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 {
@ -46,6 +46,19 @@ index bb6b3d5..1eb8818 100644
+ {
+ entity.fromMobSpawner = true;
+ }
+ // Spigot End
}
// 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
@ -67,5 +80,5 @@ index e7cb99d..018ec18 100644
+ }
}
--
1.8.4.msysgit.0
1.8.3.2