mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-26 19:07:40 +01:00
24 lines
1.5 KiB
Diff
24 lines
1.5 KiB
Diff
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 cd0cd411ac2278eabfffc331321ce478730daffb..bef31f70ed9bc9f4bea62dda2339b7a281485dce 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
@@ -1714,6 +1714,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;
|