Update to Minecraft 1.8.3

By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-02-26 22:41:06 +00:00
parent d789ce91d4
commit 85be409b13
347 changed files with 5027 additions and 5465 deletions

View File

@@ -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) {