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

Fix merge

Browse source
This commit is contained in:
DerFrZocker 2023-09-23 16:47:30 +02:00
parent ada679e73f
commit b28b8afa0b
No known key found for this signature in database
GPG key ID: 713F71FFFE1DDF91
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/org/bukkit/Sound.java
View file

@ -1273,6 +1273,12 @@ public abstract class Sound extends OldEnum<Sound> implements Keyed {
public static final Sound ENTITY_SPIDER_STEP = getSound("entity.spider.step");
public static final Sound ENTITY_SPLASH_POTION_BREAK = getSound("entity.splash_potion.break");
public static final Sound ENTITY_SPLASH_POTION_THROW = getSound("entity.splash_potion.throw");
public static final Sound BLOCK_SPONGE_BREAK = getSound("block.sponge.break");
public static final Sound BLOCK_SPONGE_FALL = getSound("block.sponge.fall");
public static final Sound BLOCK_SPONGE_HIT = getSound("block.sponge.hit");
public static final Sound BLOCK_SPONGE_PLACE = getSound("block.sponge.place");
public static final Sound BLOCK_SPONGE_STEP = getSound("block.sponge.step");
public static final Sound BLOCK_SPONGE_ABSORB = getSound("block.sponge.absorb");
public static final Sound ITEM_SPYGLASS_USE = getSound("item.spyglass.use");
public static final Sound ITEM_SPYGLASS_STOP_USING = getSound("item.spyglass.stop_using");
public static final Sound ENTITY_SQUID_AMBIENT = getSound("entity.squid.ambient");
@ -1417,6 +1423,11 @@ public abstract class Sound extends OldEnum<Sound> implements Keyed {
public static final Sound BLOCK_WET_GRASS_HIT = getSound("block.wet_grass.hit");
public static final Sound BLOCK_WET_GRASS_PLACE = getSound("block.wet_grass.place");
public static final Sound BLOCK_WET_GRASS_STEP = getSound("block.wet_grass.step");
public static final Sound BLOCK_WET_SPONGE_BREAK = getSound("block.wet_sponge.break");
public static final Sound BLOCK_WET_SPONGE_FALL = getSound("block.wet_sponge.fall");
public static final Sound BLOCK_WET_SPONGE_HIT = getSound("block.wet_sponge.hit");
public static final Sound BLOCK_WET_SPONGE_PLACE = getSound("block.wet_sponge.place");
public static final Sound BLOCK_WET_SPONGE_STEP = getSound("block.wet_sponge.step");
public static final Sound ENTITY_WITCH_AMBIENT = getSound("entity.witch.ambient");
public static final Sound ENTITY_WITCH_CELEBRATE = getSound("entity.witch.celebrate");
public static final Sound ENTITY_WITCH_DEATH = getSound("entity.witch.death");

2
src/main/java/org/bukkit/attribute/Attribute.java
View file

@ -60,7 +60,7 @@ public abstract class Attribute extends OldEnum<Attribute> implements Keyed {
/**
* Maximum absorption of an Entity.
*/
MAX_ABSORPTION("generic.max_absorption"),
public static final Attribute GENERIC_MAX_ABSORPTION = getAttribute("generic.max_absorption");
/**
* Strength with which a horse will jump.
*/