38 lines
2.0 KiB
Diff
38 lines
2.0 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Denery <dorofeevij@gmail.com>
|
||
|
|
Date: Mon, 31 Oct 2022 14:20:52 +0300
|
||
|
|
Subject: [PATCH] Fix EntityCombustEvent cancellation cant fully prevent
|
||
|
|
entities from being set on fire
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
index f2908cf61ff28bef44fcf46b15cf585e942fd7ce..6fa47becd0f83ac4273ef3a10c314aa27b08184b 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
@@ -3136,6 +3136,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
|
||
|
|
pluginManager.callEvent(entityCombustEvent);
|
||
|
|
if (!entityCombustEvent.isCancelled()) {
|
||
|
|
this.setSecondsOnFire(entityCombustEvent.getDuration(), false);
|
||
|
|
+ // Paper start - fix EntityCombustEvent cancellation.
|
||
|
|
+ } else {
|
||
|
|
+ this.setRemainingFireTicks(this.remainingFireTicks - 1);
|
||
|
|
+ // Paper end
|
||
|
|
}
|
||
|
|
// CraftBukkit end
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/BaseFireBlock.java b/src/main/java/net/minecraft/world/level/block/BaseFireBlock.java
|
||
|
|
index a76c452dc5c2069a3071aec31bfb3e977867161e..2ca656b1323f38eac419563a8306a9d86eaca29f 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/level/block/BaseFireBlock.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/level/block/BaseFireBlock.java
|
||
|
|
@@ -131,6 +131,10 @@ public abstract class BaseFireBlock extends Block {
|
||
|
|
|
||
|
|
if (!event.isCancelled()) {
|
||
|
|
entity.setSecondsOnFire(event.getDuration(), false);
|
||
|
|
+ // Paper start - fix EntityCombustEvent cancellation.
|
||
|
|
+ } else {
|
||
|
|
+ entity.setRemainingFireTicks(entity.getRemainingFireTicks() - 1);
|
||
|
|
+ // Paper end
|
||
|
|
}
|
||
|
|
// CraftBukkit end
|
||
|
|
}
|