OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-27 15:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity

Correctly die when cancelling EntityResurrectEvent (#11785)

Browse source 
The existing logic in LivingEntity#checkTotemDeathProtection completes
by checking whether the death protection component is null or not.
In cases where the event was cancelled, the component needs to be nulled
out to prevent the method from returning true, causing the player to
properly die.
This commit is contained in:
Bjarne Koll 2024-12-23 19:38:10 +01:00 committed by GitHub
parent c76809973b
commit 17d76ae42b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
paper-server/patches/features/0003-Entity-Activation-Range-2.0.patch
View file

@ -533,10 +533,10 @@ index e7889c9c7b155db46730f5e168bb7fd3d1732a8c..334859c5ff7023c730513301cc11c983
movement = this.maybeBackOffFromEdge(movement, type); movement = this.maybeBackOffFromEdge(movement, type);
Vec3 vec3 = this.collide(movement); Vec3 vec3 = this.collide(movement);
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
index a71a153a91de5a564b946091d8d3ccbb330e4b89..195e1151f7b2a32d6c4eb67edd1952e38f58b266 100644 index ff513e8c87bf42be756e46f4dbfec8dda2b8cb60..239c443ddc9bacc08a39a8ef2ab17016a2480549 100644
--- a/net/minecraft/world/entity/LivingEntity.java --- a/net/minecraft/world/entity/LivingEntity.java
+++ b/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java
@@ -3094,6 +3094,14 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -3096,6 +3096,14 @@ public abstract class LivingEntity extends Entity implements Attackable {
return false; return false;
} }

14
paper-server/patches/sources/net/minecraft/world/entity/LivingEntity.java.patch
View file

@ -654,7 +654,7 @@
} }
private boolean checkTotemDeathProtection(DamageSource damageSource) { private boolean checkTotemDeathProtection(DamageSource damageSource) {
@@ -1274,18 +_,37 @@ @@ -1274,18 +_,39 @@
ItemStack itemStack = null; ItemStack itemStack = null;
DeathProtection deathProtection = null; DeathProtection deathProtection = null;
@ -673,12 +673,14 @@
+ } + }
+ } + }
+ +
+ org.bukkit.inventory.EquipmentSlot handSlot = (hand != null) ? org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand) : null; + final org.bukkit.inventory.EquipmentSlot handSlot = (hand != null) ? org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand) : null;
+ EntityResurrectEvent event = new EntityResurrectEvent((org.bukkit.entity.LivingEntity) this.getBukkitEntity(), handSlot); + final EntityResurrectEvent event = new EntityResurrectEvent((org.bukkit.entity.LivingEntity) this.getBukkitEntity(), handSlot);
+ event.setCancelled(itemStack == null); + event.setCancelled(itemStack == null);
+ this.level().getCraftServer().getPluginManager().callEvent(event); + this.level().getCraftServer().getPluginManager().callEvent(event);
+ + if (event.isCancelled()) {
+ if (!event.isCancelled()) { + // Set death protection to null as the event was cancelled. Prevent any attempt at ressurection.
+ deathProtection = null;
+ } else {
+ if (!itemInHand.isEmpty() && itemStack != null) { // Paper - only reduce item if actual totem was found + if (!itemInHand.isEmpty() && itemStack != null) { // Paper - only reduce item if actual totem was found
itemInHand.shrink(1); itemInHand.shrink(1);
- break; - break;
@ -694,7 +696,7 @@
+ deathProtection = DeathProtection.TOTEM_OF_UNDYING; + deathProtection = DeathProtection.TOTEM_OF_UNDYING;
+ } + }
+ // Paper end - fix NPE when pre-cancelled EntityResurrectEvent is uncancelled + // Paper end - fix NPE when pre-cancelled EntityResurrectEvent is uncancelled
+ if (itemStack != null && this instanceof ServerPlayer serverPlayer) { + if (itemStack != null && this instanceof final ServerPlayer serverPlayer) {
+ // CraftBukkit end + // CraftBukkit end
serverPlayer.awardStat(Stats.ITEM_USED.get(itemStack.getItem())); serverPlayer.awardStat(Stats.ITEM_USED.get(itemStack.getItem()));
CriteriaTriggers.USED_TOTEM.trigger(serverPlayer, itemStack); CriteriaTriggers.USED_TOTEM.trigger(serverPlayer, itemStack);