Paper/Spigot-Server-Patches/0121-Remove-FishingHook-reference-on-Craft-Entity-removal.patch

From b6a854c8e2853cf5329ae7a0e67a05e7cf6be01e 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


diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
index 1ed9a4e32e..9eb9801376 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
@@ -66,4 +66,15 @@ public class CraftFishHook extends AbstractProjectile implements FishHook {
         Validate.isTrue(chance >= 0 && chance <= 1, "The bite chance must be between 0 and 1.");
         this.biteChance = chance;
     }
+
+    // Paper start
+    @Override
+    public void remove() {
+        super.remove();
+        if (getHandle().owner != null) {
+            getHandle().owner.hookedFish = null;
+        }
+    }
+    // Paper end
+    
 }
-- 
2.21.0
Update upstream & fix some chunk related issues (#2177) * Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes: 4090d01f SPIGOT-5047: Correct slot types for 1.14 inventories e8c08362 SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks. d445af3b SPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33 2019-06-14 04:27:40 +02:00			`From b6a854c8e2853cf5329ae7a0e67a05e7cf6be01e Mon Sep 17 00:00:00 2001`
Remove FishingHook reference on Craft Entity removal This caused some bugs chickeneer reported to me, with fishing. 2016-09-22 05:45:05 +02:00			`From: Aikar <aikar@aikar.co>`
			`Date: Thu, 16 Jun 2016 00:17:23 -0400`
			`Subject: [PATCH] Remove FishingHook reference on Craft Entity removal`


NOT FINISHED! even more 1.13-pre patches! 2018-07-16 22:08:09 +02:00			`diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java`
Updated Upstream (CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 17543ecf SPIGOT-5035: Error Using Virtual Merchant GUI 0fc6922b SPIGOT-5028: Villager#setVillagerExperience() doesn't work bdbdbe44 SPIGOT-5024: Fox error - Unknown target reason 2019-06-06 17:36:57 +02:00			`index 1ed9a4e32e..9eb9801376 100644`
NOT FINISHED! even more 1.13-pre patches! 2018-07-16 22:08:09 +02:00			`--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java`
			`+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java`
Update Upstream 2019-05-06 04:58:04 +02:00			`@@ -66,4 +66,15 @@ public class CraftFishHook extends AbstractProjectile implements FishHook {`
Update patches that slipped through last 2018-01-05 08:30:03 +01:00			`Validate.isTrue(chance >= 0 && chance <= 1, "The bite chance must be between 0 and 1.");`
Remove FishingHook reference on Craft Entity removal This caused some bugs chickeneer reported to me, with fishing. 2016-09-22 05:45:05 +02:00			`this.biteChance = chance;`
			`}`
Update patches that slipped through last 2018-01-05 08:30:03 +01:00			`+`
Remove FishingHook reference on Craft Entity removal This caused some bugs chickeneer reported to me, with fishing. 2016-09-22 05:45:05 +02:00			`+ // Paper start`
			`+ @Override`
			`+ public void remove() {`
			`+ super.remove();`
			`+ if (getHandle().owner != null) {`
			`+ getHandle().owner.hookedFish = null;`
			`+ }`
			`+ }`
			`+ // Paper end`
NOT FINISHED! even more 1.13-pre patches! 2018-07-16 22:08:09 +02:00			`+`
Update patches that slipped through last 2018-01-05 08:30:03 +01:00			`}`
Remove FishingHook reference on Craft Entity removal This caused some bugs chickeneer reported to me, with fishing. 2016-09-22 05:45:05 +02:00			`--`
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: da08d022 SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN 0cef14e4 Remove draft API from selectEntities CraftBukkit Changes: a46fdbc6 Remove outdated build delay. 3697519b SPIGOT-4708: Fix ExactChoice recipes neglecting material 9ead7009 SPIGOT-4677: Add minecraft.admin.command_feedback permission c3749a23 Remove the Damage tag from items when it is 0. f74c7b95 SPIGOT-4706: Can't interact with active item 494eef45 Mention requirement of JIRA ticket for bug fixes 51d62dec SPIGOT-4702: Exception when middle clicking certain slots be557e69 SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN 2019-04-22 23:36:14 +02:00			`2.21.0`
Remove FishingHook reference on Craft Entity removal This caused some bugs chickeneer reported to me, with fishing. 2016-09-22 05:45:05 +02:00