mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-15 16:15:25 +02:00
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 52504f71a34fe8700c68533ff82d98fe23f8edc9..e758f3dce618c7b021ea1828c1b2fc3807455f4a 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
|
@@ -3382,6 +3382,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
|
|
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 02cbb25b8b1fdaf6e2b771067ca132245eab13dc..116dc2ac4c0176244eb8fc22a471d2b9ede72822 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/BaseFireBlock.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/BaseFireBlock.java
|
|
@@ -134,6 +134,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
|
|
}
|