2023-06-09 02:24:02 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
|
|
|
|
Date: Thu, 8 Jun 2023 20:23:13 -0400
|
|
|
|
Subject: [PATCH] Fix spigot sound playing for BlockItem ItemStacks
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
|
2024-04-25 05:14:51 +02:00
|
|
|
index 61db36b5a79cdd237ea75e73dfa1fd9ad48c9c41..989e7bc98e492ac2a27f0d7a32e6467d7176f277 100644
|
2023-06-09 02:24:02 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
|
2024-04-25 05:14:51 +02:00
|
|
|
@@ -567,7 +567,11 @@ public final class ItemStack implements DataComponentHolder {
|
2023-06-09 02:24:02 +02:00
|
|
|
|
|
|
|
// SPIGOT-1288 - play sound stripped from ItemBlock
|
|
|
|
if (this.item instanceof BlockItem) {
|
2023-06-16 12:28:31 +02:00
|
|
|
- SoundType soundeffecttype = ((BlockItem) this.item).getBlock().defaultBlockState().getSoundType(); // TODO: not strictly correct, however currently only affects decorated pots
|
2024-01-15 12:38:39 +01:00
|
|
|
+ // Paper start - Fix spigot sound playing for BlockItem ItemStacks
|
2023-07-04 10:22:56 +02:00
|
|
|
+ BlockPos position = new net.minecraft.world.item.context.BlockPlaceContext(context).getClickedPos();
|
2023-06-10 08:13:42 +02:00
|
|
|
+ net.minecraft.world.level.block.state.BlockState blockData = world.getBlockState(position);
|
2023-06-09 02:24:02 +02:00
|
|
|
+ SoundType soundeffecttype = blockData.getSoundType();
|
2024-01-15 12:38:39 +01:00
|
|
|
+ // Paper end - Fix spigot sound playing for BlockItem ItemStacks
|
2023-06-09 02:24:02 +02:00
|
|
|
world.playSound(entityhuman, blockposition, soundeffecttype.getPlaceSound(), SoundSource.BLOCKS, (soundeffecttype.getVolume() + 1.0F) / 2.0F, soundeffecttype.getPitch() * 0.8F);
|
|
|
|
}
|
|
|
|
|