aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0298-Prevent-consuming-the-wrong-itemstack.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0298-Prevent-consuming-the-wrong-itemstack.patch')
-rw-r--r--patches/server/0298-Prevent-consuming-the-wrong-itemstack.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/server/0298-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0298-Prevent-consuming-the-wrong-itemstack.patch
index de0a5f77d5..cb2edff807 100644
--- a/patches/server/0298-Prevent-consuming-the-wrong-itemstack.patch
+++ b/patches/server/0298-Prevent-consuming-the-wrong-itemstack.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent consuming the wrong itemstack
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1ac5e457257748261088f582ed26b94e0e18eced..94492da51fe2a6343ab3c41d26ca2a195e14bc62 100644
+index e047911c7faa3cdcd3df8899857fcadf3eec3d89..f13fb8d408e02e3c561e8f2b9c823c13033b4f94 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3827,9 +3827,14 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3855,9 +3855,14 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
public void startUsingItem(InteractionHand hand) {
@@ -24,7 +24,7 @@ index 1ac5e457257748261088f582ed26b94e0e18eced..94492da51fe2a6343ab3c41d26ca2a19
this.useItem = itemstack;
this.useItemRemaining = itemstack.getUseDuration(this);
if (!this.level().isClientSide) {
-@@ -3914,6 +3919,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3942,6 +3947,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.releaseUsingItem();
} else {
if (!this.useItem.isEmpty() && this.isUsingItem()) {
@@ -32,7 +32,7 @@ index 1ac5e457257748261088f582ed26b94e0e18eced..94492da51fe2a6343ab3c41d26ca2a19
this.triggerItemUseEffects(this.useItem, 16);
// CraftBukkit start - fire PlayerItemConsumeEvent
ItemStack itemstack;
-@@ -3948,8 +3954,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3976,8 +3982,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
this.stopUsingItem();