aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0899-Don-t-fire-sync-events-during-worldgen.patch
diff options
context:
space:
mode:
authorBjarne Koll <[email protected]>2024-10-31 12:44:02 +0100
committerGitHub <[email protected]>2024-10-31 12:44:02 +0100
commitdfedf79a2fecd80cafabcd82bb2e6dd80e558fc3 (patch)
tree5986a5b10f31ce04b6625b9e53f7e776faabbb09 /patches/server/0899-Don-t-fire-sync-events-during-worldgen.patch
parent40a960db45f45f381328a60695e933615475aea8 (diff)
downloadPaper-dfedf79a2fecd80cafabcd82bb2e6dd80e558fc3.tar.gz
Paper-dfedf79a2fecd80cafabcd82bb2e6dd80e558fc3.zip
Correctly cancel consumption of consumable
See: #11534
Diffstat (limited to 'patches/server/0899-Don-t-fire-sync-events-during-worldgen.patch')
-rw-r--r--patches/server/0899-Don-t-fire-sync-events-during-worldgen.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/patches/server/0899-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0899-Don-t-fire-sync-events-during-worldgen.patch
index 24339297b7..6a0d1b6e72 100644
--- a/patches/server/0899-Don-t-fire-sync-events-during-worldgen.patch
+++ b/patches/server/0899-Don-t-fire-sync-events-during-worldgen.patch
@@ -68,7 +68,7 @@ index 64dc0bd1900575e40ac72a98c6df371223bd244c..c2693d530be00af16b2aa4ca4afd1d13
}, () -> {
EntityType.LOGGER.warn("Skipping Entity with id {}", nbt.getString("id"));
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 09bd6ba5907d42bed08872f18d40d8c743d392ff..251abe382f951c3ddac8112a0ffe1dc906b88e4c 100644
+index 375280dd829eb2f6b98a95228250a3d87a7872cf..e8749957c39abcd922b734a87df95b815012737a 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1159,6 +1159,11 @@ public abstract class LivingEntity extends Entity implements Attackable {