aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0780-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff options
context:
space:
mode:
authorJake Potrebic <[email protected]>2024-05-17 14:37:16 -0700
committerGitHub <[email protected]>2024-05-17 14:37:16 -0700
commit5a9afbee65c40eea131bd3174d68ed3df6db3d9e (patch)
tree59f8ca699568dea89179a027805914adb8488aa3 /patches/server/0780-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
parentd8d59e0cdeda3f7e9da337b6d489f306fc5e76c9 (diff)
downloadPaper-5a9afbee65c40eea131bd3174d68ed3df6db3d9e.tar.gz
Paper-5a9afbee65c40eea131bd3174d68ed3df6db3d9e.zip
Fixes issues in the suppress dismount cancellation patch (#10735)
Diffstat (limited to 'patches/server/0780-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch')
-rw-r--r--patches/server/0780-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0780-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0780-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index 038fdcd4fa..8c45bd592c 100644
--- a/patches/server/0780-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0780-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix EntityCombustEvent cancellation cant fully prevent
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8d80018d7bd1cdce2dafa4d0be5499f1d86c75fe..b49efb6f5f106396894831f28841d5a14d5a8c00 100644
+index 0fae685f32cf370ae0023969d20ecd907a3be442..0d1b6e05e2a8bc7cae3936e94033d9f936e61645 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3127,6 +3127,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3133,6 +3133,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
pluginManager.callEvent(entityCombustEvent);
if (!entityCombustEvent.isCancelled()) {
this.igniteForSeconds(entityCombustEvent.getDuration(), false);