Prepare for updating server patches

2021-11-23 00:57:41 -08:00
parent cb95469f99
commit ed6d43ddb0
1192 changed files with 248 additions and 309 deletions
--- a/patches/unapplied/server/Remove-FishingHook-reference-on-Craft-Entity-removal.patch
+++ b/patches/unapplied/server/Remove-FishingHook-reference-on-Craft-Entity-removal.patch
@@ -0,0 +1,26 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Thu, 16 Jun 2016 00:17:23 -0400
+Subject: [PATCH] Remove FishingHook reference on Craft Entity removal
+
+TODO 1.17 isn't this supposed to be applied to when the fish hook is removed _in general_? Not just in Bukkit api calls?
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
+@@ -0,0 +0,0 @@ public class CraftFishHook extends CraftProjectile implements FishHook {
+     public HookState getState() {
+         return HookState.values()[this.getHandle().currentState.ordinal()];
+     }
+
+    // Paper start
+    @Override
+    public void remove() {
+        super.remove();
+        if (getHandle().getPlayerOwner() != null) {
+            getHandle().getPlayerOwner().fishing = null;
+        }
+    }
+    // Paper end
+ }