diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-02-26 22:41:06 +0000 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-03-04 09:48:58 +0000 |
| commit | d8a9c7be4227b2243968b63ab7cc7a00098c93ad (patch) | |
| tree | 554a08a5f23ffa5dd66a28247d6358515b1ffb7a /nms-patches/EntityDamageSourceIndirect.patch | |
| parent | 33d5de312e9fcc8aec3fc53136658cb6920562aa (diff) | |
| download | craftbukkit-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/EntityDamageSourceIndirect.patch')
| -rw-r--r-- | nms-patches/EntityDamageSourceIndirect.patch | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/nms-patches/EntityDamageSourceIndirect.patch b/nms-patches/EntityDamageSourceIndirect.patch index 1991e18c..352f4974 100644 --- a/nms-patches/EntityDamageSourceIndirect.patch +++ b/nms-patches/EntityDamageSourceIndirect.patch @@ -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 } |