OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 15:30:19 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-4304: Turtle helmet overrides water breathing potion

Browse source
This commit is contained in:
md_5 2018-08-24 20:56:25 +10:00
parent 3418f8d7a1
commit 1bc24337d1
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
nms-patches/EntityLiving.patch
View file

@ -270,11 +270,10 @@
this.a(mobeffect); this.a(mobeffect);
return true; return true;
- } else if (mobeffect1.a(mobeffect)) { - } else if (mobeffect1.a(mobeffect)) {
- this.a(mobeffect1, true);
+ // CraftBukkit start + // CraftBukkit start
+ } else if (event.isOverride()) { + } else if (event.isOverride()) {
+ this.effects.put(mobeffect.getMobEffect(), mobeffect); + mobeffect1.a(mobeffect);
+ this.a(mobeffect, true); this.a(mobeffect1, true);
+ // CraftBukkit end + // CraftBukkit end
return true; return true;
} else { } else {