spigot-mirror/bukkit
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/bukkit.git synced 2025-08-20 05:14:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SPIGOT-3641: Remove ambiguous entity effects & restore behaviour of DEATH

Browse source
This commit is contained in:
md_5 2017-11-08 09:05:16 +11:00
parent a865e5935e
commit 11f70ddb47
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/org/bukkit/EntityEffect.java
View file

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