From 11f70ddb4786ada16e597a86bd43af50ccaefdb7 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 8 Nov 2017 09:05:16 +1100
Subject: SPIGOT-3641: Remove ambiguous entity effects & restore behaviour of
 DEATH

---
 src/main/java/org/bukkit/EntityEffect.java | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/bukkit/EntityEffect.java b/src/main/java/org/bukkit/EntityEffect.java
index 561da3da..de419d56 100644
--- a/src/main/java/org/bukkit/EntityEffect.java
+++ b/src/main/java/org/bukkit/EntityEffect.java
@@ -41,11 +41,9 @@ public enum EntityEffect {
      * <p>
      * <b>This will cause client-glitches!</b>
      */
-    DEATH(3, LivingEntity.class),
-    /**
-     * Iron golem attacking.
-     */
-    GOLEM_ATTACK(4, IronGolem.class),
+    DEATH(3, Entity.class),
+    // PAIL - SPIGOT-3641 duplicate
+    // GOLEM_ATTACK(4, IronGolem.class),
     // 5 - unused
     /**
      * The smoke when taming a wolf fails.
@@ -60,10 +58,8 @@ public enum EntityEffect {
      */
     WOLF_SHAKE(8, Wolf.class),
     // 9 - unused
-    /**
-     * When an entity eats a LONG_GRASS block.
-     */
-    SHEEP_EAT(10, LivingEntity.class),
+    // PAIL - SPIGOT-3641 duplicate
+    // SHEEP_EAT(10, LivingEntity.class),
     /**
      * When an Iron Golem gives a rose.
      */
-- 
cgit v1.2.3