diff options
| author | md_5 <git@md-5.net> | 2017-11-08 09:05:16 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2017-11-08 09:05:16 +1100 |
| commit | 11f70ddb4786ada16e597a86bd43af50ccaefdb7 (patch) | |
| tree | 0b6dc646778359dc9f715fd5ee8188332c7e54ba | |
| parent | a865e5935e2ca5af9aa22012b33cfd557d78efb5 (diff) | |
| download | bukkit-11f70ddb4786ada16e597a86bd43af50ccaefdb7.tar bukkit-11f70ddb4786ada16e597a86bd43af50ccaefdb7.tar.gz bukkit-11f70ddb4786ada16e597a86bd43af50ccaefdb7.tar.lz bukkit-11f70ddb4786ada16e597a86bd43af50ccaefdb7.tar.xz bukkit-11f70ddb4786ada16e597a86bd43af50ccaefdb7.zip | |
SPIGOT-3641: Remove ambiguous entity effects & restore behaviour of DEATH
| -rw-r--r-- | src/main/java/org/bukkit/EntityEffect.java | 14 |
1 files 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. */ |