diff options
| author | Jake Potrebic <[email protected]> | 2024-05-26 14:41:30 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-05-26 23:41:30 +0200 |
| commit | b0e3ca43b8a2ccd9978ad42aa6f9f58b4d8f46f5 (patch) | |
| tree | d474f8cda7d850b456de91bfac89d60496b8e1f1 | |
| parent | 841ab4134df90a166a22396d1dc5841bcc38e35f (diff) | |
| download | Paper-b0e3ca43b8a2ccd9978ad42aa6f9f58b4d8f46f5.tar.gz Paper-b0e3ca43b8a2ccd9978ad42aa6f9f58b4d8f46f5.zip | |
Prevent NPE if hooked entity was cleared (#10712)
| -rw-r--r-- | patches/server/1049-Prevent-NPE-if-hooked-entity-was-cleared.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/patches/server/1049-Prevent-NPE-if-hooked-entity-was-cleared.patch b/patches/server/1049-Prevent-NPE-if-hooked-entity-was-cleared.patch new file mode 100644 index 0000000000..f1cbb0fcf3 --- /dev/null +++ b/patches/server/1049-Prevent-NPE-if-hooked-entity-was-cleared.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic <[email protected]> +Date: Sun, 12 May 2024 21:57:23 -0700 +Subject: [PATCH] Prevent NPE if hooked entity was cleared + + +diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java +index 35299affb699d745804a3b60cb78b9323f3e068e..882de08963c72614a3d26cd917916e42b7136042 100644 +--- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java ++++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java +@@ -498,11 +498,13 @@ public class FishingHook extends Projectile { + if (playerFishEvent.isCancelled()) { + return 0; + } ++ if (this.hookedIn != null) { // Paper - re-check to see if there is a hooked entity + // CraftBukkit end + this.pullEntity(this.hookedIn); + CriteriaTriggers.FISHING_ROD_HOOKED.trigger((ServerPlayer) entityhuman, usedItem, this, Collections.emptyList()); + this.level().broadcastEntityEvent(this, (byte) 31); + i = this.hookedIn instanceof ItemEntity ? 3 : 5; ++ } // Paper - re-check to see if there is a hooked entity + } else if (this.nibble > 0) { + LootParams lootparams = (new LootParams.Builder((ServerLevel) this.level())).withParameter(LootContextParams.ORIGIN, this.position()).withParameter(LootContextParams.TOOL, usedItem).withParameter(LootContextParams.THIS_ENTITY, this).withLuck((float) this.luck + entityhuman.getLuck()).create(LootContextParamSets.FISHING); + LootTable loottable = this.level().getServer().reloadableRegistries().getLootTable(BuiltInLootTables.FISHING); |