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

Fix NPE when EntityResurrectEvent is uncancelled (#11636)

Browse source
This commit is contained in:
Lulu13022002 2024-11-19 12:21:31 +01:00 committed by GitHub
parent d0dcd7d251
commit 85bfdc09bc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
patches/server/1067-Fix-NPE-when-EntityResurrectEvent-is-uncancelled.patch Normal file
View file

@ -0,0 +1,23 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
Date: Mon, 18 Nov 2024 20:27:58 +0100
Subject: [PATCH] Fix NPE when EntityResurrectEvent is uncancelled
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 51f913a495e7fda7e0e72439c6d7cc9607bd4af8..f36a075dbee2b96d01899e02460b1d8443e91749 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1711,6 +1711,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
if (!itemstack1.isEmpty() && itemstack != null) { // Paper - only reduce item if actual totem was found
itemstack1.shrink(1);
}
+ // Paper start - fix NPE when pre-cancelled EntityResurrectEvent is uncancelled
+ // restore the previous behavior in that case by defaulting to vanillas totem of undying efect
+ if (deathprotection == null) {
+ deathprotection = DeathProtection.TOTEM_OF_UNDYING;
+ }
+ // Paper end - fix NPE when pre-cancelled EntityResurrectEvent is uncancelled
if (itemstack != null && this instanceof ServerPlayer) {
// CraftBukkit end
ServerPlayer entityplayer = (ServerPlayer) this;