summaryrefslogtreecommitdiffstats
path: root/nms-patches/EntityCreature.patch
diff options
context:
space:
mode:
authorThinkofdeath <thinkofdeath@spigotmc.org>2015-02-26 22:41:06 +0000
committerThinkofdeath <thinkofdeath@spigotmc.org>2015-03-04 09:48:58 +0000
commitd8a9c7be4227b2243968b63ab7cc7a00098c93ad (patch)
tree554a08a5f23ffa5dd66a28247d6358515b1ffb7a /nms-patches/EntityCreature.patch
parent33d5de312e9fcc8aec3fc53136658cb6920562aa (diff)
downloadcraftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar
craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.gz
craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.lz
craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.xz
craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.zip
Update to Minecraft 1.8.3
Diffstat (limited to 'nms-patches/EntityCreature.patch')
-rw-r--r--nms-patches/EntityCreature.patch16
1 files changed, 7 insertions, 9 deletions
diff --git a/nms-patches/EntityCreature.patch b/nms-patches/EntityCreature.patch
index d448534f..9ff5dc8f 100644
--- a/nms-patches/EntityCreature.patch
+++ b/nms-patches/EntityCreature.patch
@@ -1,19 +1,17 @@
---- ../work/decompile-8eb82bde//net/minecraft/server/EntityCreature.java 2014-11-28 17:43:43.069707436 +0000
-+++ src/main/java/net/minecraft/server/EntityCreature.java 2014-11-28 17:38:19.000000000 +0000
-@@ -2,6 +2,12 @@
+--- /home/matt/mc-dev-private//net/minecraft/server/EntityCreature.java 2015-02-26 22:40:22.495608140 +0000
++++ src/main/java/net/minecraft/server/EntityCreature.java 2015-02-26 22:40:22.495608140 +0000
+@@ -2,6 +2,10 @@
import java.util.UUID;
+// CraftBukkit start
-+import org.bukkit.craftbukkit.entity.CraftEntity;
-+import org.bukkit.event.entity.EntityTargetEvent;
+import org.bukkit.event.entity.EntityUnleashEvent;
+// CraftBukkit end
+
public abstract class EntityCreature extends EntityInsentient {
- public static final UUID bi = UUID.fromString("E199AD21-BA8A-4C53-8D13-6182D5C69D3A");
-@@ -69,6 +75,7 @@
+ public static final UUID bk = UUID.fromString("E199AD21-BA8A-4C53-8D13-6182D5C69D3A");
+@@ -69,6 +73,7 @@
if (this instanceof EntityTameableAnimal && ((EntityTameableAnimal) this).isSitting()) {
if (f > 10.0F) {
@@ -21,11 +19,11 @@
this.unleash(true, true);
}
-@@ -100,6 +107,7 @@
+@@ -100,6 +105,7 @@
}
if (f > 10.0F) {
+ this.world.getServer().getPluginManager().callEvent(new EntityUnleashEvent(this.getBukkitEntity(), EntityUnleashEvent.UnleashReason.DISTANCE)); // CraftBukkit
this.unleash(true, true);
}
- } else if (!this.cb() && this.bk) {
+ } else if (!this.cc() && this.bm) {