diff options
| author | md_5 <git@md-5.net> | 2018-08-24 20:56:25 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2018-08-24 20:56:58 +1000 |
| commit | 1bc24337d1b48f369273b23ba29db0c9e6a8a8c2 (patch) | |
| tree | 49c8f1486712fc118c4c5682b7c102e7fbda51e7 | |
| parent | 3418f8d7a1597cd2aabad7e43ba39ab5151d3c66 (diff) | |
| download | craftbukkit-1bc24337d1b48f369273b23ba29db0c9e6a8a8c2.tar craftbukkit-1bc24337d1b48f369273b23ba29db0c9e6a8a8c2.tar.gz craftbukkit-1bc24337d1b48f369273b23ba29db0c9e6a8a8c2.tar.lz craftbukkit-1bc24337d1b48f369273b23ba29db0c9e6a8a8c2.tar.xz craftbukkit-1bc24337d1b48f369273b23ba29db0c9e6a8a8c2.zip | |
SPIGOT-4304: Turtle helmet overrides water breathing potion
| -rw-r--r-- | nms-patches/EntityLiving.patch | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nms-patches/EntityLiving.patch b/nms-patches/EntityLiving.patch index ca77592f..1a7b6da4 100644 --- a/nms-patches/EntityLiving.patch +++ b/nms-patches/EntityLiving.patch @@ -270,11 +270,10 @@ this.a(mobeffect); return true; - } else if (mobeffect1.a(mobeffect)) { -- this.a(mobeffect1, true); + // CraftBukkit start + } else if (event.isOverride()) { -+ this.effects.put(mobeffect.getMobEffect(), mobeffect); -+ this.a(mobeffect, true); ++ mobeffect1.a(mobeffect); + this.a(mobeffect1, true); + // CraftBukkit end return true; } else { |