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,14 +1,13 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/EntityDamageSourceIndirect.java 2014-11-28 17:43:43.073707436 +0000
+++ src/main/java/net/minecraft/server/EntityDamageSourceIndirect.java 2014-11-28 17:38:18.000000000 +0000
@@ -24,5 +24,11 @@
String s1 = s + ".item";
--- /home/matt/mc-dev-private//net/minecraft/server/EntityDamageSourceIndirect.java 2015-02-26 22:40:22.503608140 +0000
+++ src/main/java/net/minecraft/server/EntityDamageSourceIndirect.java 2015-02-26 22:40:22.503608140 +0000
@@ -25,4 +25,10 @@
return itemstack != null && itemstack.hasName() && LocaleI18n.c(s1) ? new ChatMessage(s1, new Object[] { entityliving.getScoreboardDisplayName(), ichatbasecomponent, itemstack.C()}) : new ChatMessage(s, new Object[] { entityliving.getScoreboardDisplayName(), ichatbasecomponent});
+ }
+
}
+
+ // CraftBukkit start
+ public Entity getProximateDamageSource() {
+ return super.getEntity();
}
+ }
+ // CraftBukkit end
}