From 1bc24337d1b48f369273b23ba29db0c9e6a8a8c2 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 24 Aug 2018 20:56:25 +1000
Subject: [PATCH] SPIGOT-4304: Turtle helmet overrides water breathing potion

---
 nms-patches/EntityLiving.patch | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/nms-patches/EntityLiving.patch b/nms-patches/EntityLiving.patch
index ca77592fb8..1a7b6da427 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 {