Update to Minecraft 1.17.1 (#6097)
This commit is contained in:
parent
a831634d44
commit
56fd1a2f84
266 changed files with 1415 additions and 1491 deletions
|
@ -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 32507c52d90393101ef5140de0d82518e5cbfbcc..53951f2c4dc77e9723d0a6314781d9ee0aa8ce54 100644
|
||||
index 330d72b8851e3a9fb9988117f908c561ee9c65f8..f635e60e55ae43c0f2acf7e82ca6014e757da186 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
@@ -3548,15 +3548,18 @@ public abstract class LivingEntity extends Entity {
|
||||
@@ -3551,15 +3551,18 @@ public abstract class LivingEntity extends Entity {
|
||||
this.entityData.set(LivingEntity.DATA_LIVING_ENTITY_FLAGS, (byte) j);
|
||||
}
|
||||
|
||||
|
@ -31,7 +31,7 @@ index 32507c52d90393101ef5140de0d82518e5cbfbcc..53951f2c4dc77e9723d0a6314781d9ee
|
|||
}
|
||||
|
||||
}
|
||||
@@ -3629,6 +3632,7 @@ public abstract class LivingEntity extends Entity {
|
||||
@@ -3632,6 +3635,7 @@ public abstract class LivingEntity extends Entity {
|
||||
this.releaseUsingItem();
|
||||
} else {
|
||||
if (!this.useItem.isEmpty() && this.isUsingItem()) {
|
||||
|
@ -39,7 +39,7 @@ index 32507c52d90393101ef5140de0d82518e5cbfbcc..53951f2c4dc77e9723d0a6314781d9ee
|
|||
this.triggerItemUseEffects(this.useItem, 16);
|
||||
// CraftBukkit start - fire PlayerItemConsumeEvent
|
||||
ItemStack itemstack;
|
||||
@@ -3663,8 +3667,8 @@ public abstract class LivingEntity extends Entity {
|
||||
@@ -3666,8 +3670,8 @@ public abstract class LivingEntity extends Entity {
|
||||
}
|
||||
|
||||
this.stopUsingItem();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue