Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-28 21:47:55 +01:00
Code Issues Projects Releases Wiki Activity

Don't use event to get block position (#9295)

Browse Source
This commit is contained in:
Owen 2023-06-10 02:13:42 -04:00 committed by GitHub
parent dc30ee591d
commit 2ffb704efa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0972-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
View File

@ -5,7 +5,7 @@ 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 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index 103ad5f373a59fadb4783892579f3e681a8fd596..b367ec1feaccbd67e9e28c0d0515e163f37135fe 100644 index 103ad5f373a59fadb4783892579f3e681a8fd596..adb7220be617d6d9f2cdd7fbe4fa2dd24cc7d142 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java --- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -513,7 +513,11 @@ public final class ItemStack { @@ -513,7 +513,11 @@ public final class ItemStack {
@ -14,7 +14,7 @@ index 103ad5f373a59fadb4783892579f3e681a8fd596..b367ec1feaccbd67e9e28c0d0515e163
if (this.item instanceof BlockItem) { if (this.item instanceof BlockItem) {
- SoundType soundeffecttype = ((BlockItem) this.item).getBlock().getSoundType(null); - SoundType soundeffecttype = ((BlockItem) this.item).getBlock().getSoundType(null);
+ // Paper start + // Paper start
+ BlockPos position = ((CraftBlock) placeEvent.getBlock()).getPosition(); + BlockPos position = new net.minecraft.world.item.context.BlockPlaceContext(itemactioncontext).getClickedPos();
+ net.minecraft.world.level.block.state.BlockState blockData = world.getBlockState(position); + net.minecraft.world.level.block.state.BlockState blockData = world.getBlockState(position);
+ SoundType soundeffecttype = blockData.getSoundType(); + SoundType soundeffecttype = blockData.getSoundType();
+ // Paper end + // Paper end