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,6 +1,6 @@
--- ../work/decompile-8eb82bde/net/minecraft/server/EntityAnimal.java 2014-12-10 18:34:37.064492562 +0000
+++ src/main/java/net/minecraft/server/EntityAnimal.java 2014-12-10 18:31:55.772494313 +0000
@@ -38,14 +38,19 @@
--- /home/matt/mc-dev-private//net/minecraft/server/EntityAnimal.java 2015-02-26 22:40:22.471608141 +0000
+++ src/main/java/net/minecraft/server/EntityAnimal.java 2015-02-26 22:40:22.471608141 +0000
@@ -38,6 +38,9 @@
}
@@ -10,10 +10,7 @@
public boolean damageEntity(DamageSource damagesource, float f) {
if (this.isInvulnerable(damagesource)) {
return false;
} else {
- this.bk = 0;
+ //CraftBukkit - moved into EntityLiving.d(DamageSource, float)
+ //this.bk = 0;
@@ -46,6 +49,7 @@
return super.damageEntity(damagesource, f);
}
}