Commits

md_5 authored 6a8ea76458d
Fix bad merge in penultimate commit
No tags

src/main/java/org/bukkit/Sound.java

Modified
1048 1048 ENTITY_GENERIC_BURN("entity.generic.burn"),
1049 1049 ENTITY_GENERIC_DEATH("entity.generic.death"),
1050 1050 ENTITY_GENERIC_DRINK("entity.generic.drink"),
1051 1051 ENTITY_GENERIC_EAT("entity.generic.eat"),
1052 1052 ENTITY_GENERIC_EXPLODE("entity.generic.explode"),
1053 1053 ENTITY_GENERIC_EXTINGUISH_FIRE("entity.generic.extinguish_fire"),
1054 1054 ENTITY_GENERIC_HURT("entity.generic.hurt"),
1055 1055 ENTITY_GENERIC_SMALL_FALL("entity.generic.small_fall"),
1056 1056 ENTITY_GENERIC_SPLASH("entity.generic.splash"),
1057 1057 ENTITY_GENERIC_SWIM("entity.generic.swim"),
1058 - @MinecraftExperimental(Requires.UPDATE_1_21)
1059 - ENTITY_GENERIC_WIND_BURST("entity.generic.wind_burst"),
1060 1058 ENTITY_GHAST_AMBIENT("entity.ghast.ambient"),
1061 1059 ENTITY_GHAST_DEATH("entity.ghast.death"),
1062 1060 ENTITY_GHAST_HURT("entity.ghast.hurt"),
1063 1061 ENTITY_GHAST_SCREAM("entity.ghast.scream"),
1064 1062 ENTITY_GHAST_SHOOT("entity.ghast.shoot"),
1065 1063 ENTITY_GHAST_WARN("entity.ghast.warn"),
1066 1064 ENTITY_GLOW_ITEM_FRAME_ADD_ITEM("entity.glow_item_frame.add_item"),
1067 1065 ENTITY_GLOW_ITEM_FRAME_BREAK("entity.glow_item_frame.break"),
1068 1066 ENTITY_GLOW_ITEM_FRAME_PLACE("entity.glow_item_frame.place"),
1069 1067 ENTITY_GLOW_ITEM_FRAME_REMOVE_ITEM("entity.glow_item_frame.remove_item"),

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut