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,11 +1,20 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/EntityIronGolem.java 2014-11-28 17:43:43.109707435 +0000
+++ src/main/java/net/minecraft/server/EntityIronGolem.java 2014-11-28 17:38:17.000000000 +0000
@@ -57,7 +57,7 @@
--- /home/matt/mc-dev-private//net/minecraft/server/EntityIronGolem.java 2015-02-26 22:40:22.579608139 +0000
+++ src/main/java/net/minecraft/server/EntityIronGolem.java 2015-02-26 22:40:22.583608139 +0000
@@ -59,7 +59,7 @@
protected void s(Entity entity) {
if (entity instanceof IMonster && this.bb().nextInt(20) == 0) {
if (entity instanceof IMonster && !(entity instanceof EntityCreeper) && this.bc().nextInt(20) == 0) {
- this.setGoalTarget((EntityLiving) entity);
+ this.setGoalTarget((EntityLiving) entity, org.bukkit.event.entity.EntityTargetLivingEntityEvent.TargetReason.COLLISION, true); // CraftBukkit - set reason
}
super.s(entity);
@@ -220,7 +220,7 @@
}
public boolean apply(Object object) {
- return this.a((EntityLiving) object);
+ return this.a((T) object); // CraftBukkit - fix decompiler error
}
};
}