Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

now it will be hell

Browse Source
This commit is contained in:
Ben Kerllenevich
2022-06-08 13:25:16 -04:00
parent ed5b0fda9e
commit 856416cca4
9 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
patches/server/0200-Tool-actionable-options.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Tool actionable options
diff --git a/src/main/java/net/minecraft/world/item/AxeItem.java b/src/main/java/net/minecraft/world/item/AxeItem.java
index 03a6a99dcc0c8fcc32776dd49cf6092b899bf6ed..e32f9b614324000797f5d9944013af4fe28ce891 100644
index 03a6a99dcc0c8fcc32776dd49cf6092b899bf6ed..33b162108bb088827101e9972b89390fb67feca8 100644
--- a/src/main/java/net/minecraft/world/item/AxeItem.java
+++ b/src/main/java/net/minecraft/world/item/AxeItem.java
@@ -33,22 +33,22 @@ public class AxeItem extends DiggerItem {
@@ -40,11 +40,12 @@ index 03a6a99dcc0c8fcc32776dd49cf6092b899bf6ed..e32f9b614324000797f5d9944013af4f
level.levelEvent(player, 3004, blockPos, 0);
optional4 = optional3;
}
@@ -58,7 +58,15 @@ public class AxeItem extends DiggerItem {
@@ -58,15 +58,23 @@ public class AxeItem extends DiggerItem {
CriteriaTriggers.ITEM_USED_ON_BLOCK.trigger((ServerPlayer)player, blockPos, itemStack);
}
- level.setBlock(blockPos, optional4.get(), 11);
- level.gameEvent(GameEvent.BLOCK_CHANGE, blockPos, GameEvent.Context.of(player, optional4.get()));
+ // Purpur start
+ org.purpurmc.purpur.tool.Actionable actionable = optional4.get();
+ level.setBlock(blockPos, actionable.into().withPropertiesOf(blockState), 11);
@@ -53,11 +54,11 @@ index 03a6a99dcc0c8fcc32776dd49cf6092b899bf6ed..e32f9b614324000797f5d9944013af4f
+ Block.popResourceFromFace(level, blockPos, context.getClickedFace(), new ItemStack(drop));
+ }
+ });
+ level.gameEvent(GameEvent.BLOCK_CHANGE, blockPos, GameEvent.Context.of(player, actionable.into().withPropertiesOf(blockState)));
+ // Purpur end
level.gameEvent(GameEvent.BLOCK_CHANGE, blockPos, GameEvent.Context.of(player, optional4.get()));
if (player != null) {
itemStack.hurtAndBreak(1, player, (p) -> {
@@ -66,7 +74,7 @@ public class AxeItem extends DiggerItem {
p.broadcastBreakEvent(context.getHand());
});
}