Merge branch '1.21.4' into 1.21.5

FrozenBlock · Jan 31, 2025 · ae74fa1 · ae74fa1
2 parents d54e9ec + f108a86
commit ae74fa1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/main/java/net/frozenblock/wilderwild/item/MobBottleItem.java b/src/main/java/net/frozenblock/wilderwild/item/MobBottleItem.java
@@ -80,7 +80,17 @@ public InteractionResult use(@NotNull Level level, @NotNull Player player, @NotN
 
 					if (!player.getAbilities().instabuild) player.setItemInHand(interactionHand, ItemUtils.createFilledResult(stack, player, new ItemStack(Items.GLASS_BOTTLE)));
 					player.awardStat(Stats.ITEM_USED.get(stack.getItem()));
-					level.playSound(player, player.getX(), player.getEyeY(), player.getZ(), this.releaseSound, SoundSource.NEUTRAL, 0.75F, level.getRandom().nextFloat() * 0.2F + 0.9F);
+					server.playSound(
+						null,
+						player.getX(),
+						player.getEyeY(),
+						player.getZ(),
+						this.releaseSound,
+						SoundSource.NEUTRAL,
+						0.75F,
+						level.getRandom().nextFloat() * 0.2F + 0.9F
+					);
+
 					if (stack.has(DataComponents.CUSTOM_NAME)) {
 						entity.setCustomName(stack.getHoverName());
 					}

diff --git a/src/main/java/net/frozenblock/wilderwild/registry/WWSounds.java b/src/main/java/net/frozenblock/wilderwild/registry/WWSounds.java
@@ -230,7 +230,7 @@ public final class WWSounds {
 	public static final SoundEvent BLOCK_OSTRICH_EGG_CRACK = register("block.ostrich_egg.crack");
 	public static final SoundEvent BLOCK_OSTRICH_EGG_HATCH = register("block.ostrich_egg.hatch");
 	public static final SoundEvent BLOCK_PENGUIN_EGG_CRACK = register("block.penguin_egg.crack");
-	public static final SoundEvent BLOCK_PENGUIN_EGG_HATCH = register("block.ostrich_eggpenguin_egg.hatch");
+	public static final SoundEvent BLOCK_PENGUIN_EGG_HATCH = register("block.penguin_egg.hatch");
 	public static final SoundEvent BLOCK_GEYSER_PLACE = register("block.geyser.place");
 	public static final SoundEvent BLOCK_GEYSER_HIT = register("block.geyser.hit");
 	public static final SoundEvent BLOCK_GEYSER_BREAK = register("block.geyser.break");