Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Readd missed diff in EntityEnderCrystal

Browse Source
This commit is contained in:
Thinkofdeath 2014-12-05 23:42:08 +00:00
parent cc2b09de09
commit adc129ab3d
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nms-patches/EntityEnderCrystal.patch
View File

@ -1,5 +1,5 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/EntityEnderCrystal.java 2014-11-28 17:43:43.081707435 +0000 --- ../work/decompile-8eb82bde//net/minecraft/server/EntityEnderCrystal.java 2014-12-05 23:41:59.577572184 +0000
+++ src/main/java/net/minecraft/server/EntityEnderCrystal.java 2014-11-28 17:38:19.000000000 +0000 +++ src/main/java/net/minecraft/server/EntityEnderCrystal.java 2014-12-05 23:41:54.069572306 +0000
@@ -1,5 +1,10 @@ @@ -1,5 +1,10 @@
package net.minecraft.server; package net.minecraft.server;
@ -24,7 +24,17 @@
} }
} }
@@ -54,7 +63,15 @@ @@ -50,11 +59,25 @@
return false;
} else {
if (!this.dead && !this.world.isStatic) {
+ // CraftBukkit start - All non-living entities need this
+ if (CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f)) {
+ return false;
+ }
+ // CraftBukkit end
+
this.b = 0;
if (this.b <= 0) { if (this.b <= 0) {
this.die(); this.die();
if (!this.world.isStatic) { if (!this.world.isStatic) {