mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Move log message for named entity deaths into correct location (#6105)

Browse source
This commit is contained in:
Jason 2021-07-07 03:04:34 -07:00 • committed by GitHub
parent f8d6cbdfe5
commit 5059ada8d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 43 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

8
patches/server/0343-Prevent-consuming-the-wrong-itemstack.patch
View file

@ -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 330d72b8851e3a9fb9988117f908c561ee9c65f8..f635e60e55ae43c0f2acf7e82ca6014e757da186 100644
index 84a2b846022a198a93ca924882d503b889290363..1f46e8eaa41c37bcd065ae064521c3c0772d7832 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3551,15 +3551,18 @@ public abstract class LivingEntity extends Entity {
@@ -3554,15 +3554,18 @@ public abstract class LivingEntity extends Entity {
this.entityData.set(LivingEntity.DATA_LIVING_ENTITY_FLAGS, (byte) j);
}
@ -31,7 +31,7 @@ index 330d72b8851e3a9fb9988117f908c561ee9c65f8..f635e60e55ae43c0f2acf7e82ca6014e
}
}
@@ -3632,6 +3635,7 @@ public abstract class LivingEntity extends Entity {
@@ -3635,6 +3638,7 @@ public abstract class LivingEntity extends Entity {
this.releaseUsingItem();
} else {
if (!this.useItem.isEmpty() && this.isUsingItem()) {
@ -39,7 +39,7 @@ index 330d72b8851e3a9fb9988117f908c561ee9c65f8..f635e60e55ae43c0f2acf7e82ca6014e
this.triggerItemUseEffects(this.useItem, 16);
// CraftBukkit start - fire PlayerItemConsumeEvent
ItemStack itemstack;
@@ -3666,8 +3670,8 @@ public abstract class LivingEntity extends Entity {
@@ -3669,8 +3673,8 @@ public abstract class LivingEntity extends Entity {
}
this.stopUsingItem();