mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-25 00:30:25 +01:00
Remove FishingHook reference on Craft Entity removal
This caused some bugs chickeneer reported to me, with fishing.
This commit is contained in:
parent
501695c26a
commit
bd4ececc82
1 changed files with 30 additions and 0 deletions
|
@ -0,0 +1,30 @@
|
||||||
|
From 3766c64b653c0ddc3b3688acf16029ded14bbcff 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/CraftFish.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
|
||||||
|
index ecfc316..3f909c1 100644
|
||||||
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
|
||||||
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
|
||||||
|
@@ -64,6 +64,16 @@ public class CraftFish extends AbstractProjectile implements Fish {
|
||||||
|
this.biteChance = chance;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Paper start
|
||||||
|
+ @Override
|
||||||
|
+ public void remove() {
|
||||||
|
+ super.remove();
|
||||||
|
+ if (getHandle().owner != null) {
|
||||||
|
+ getHandle().owner.hookedFish = null;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ // Paper end
|
||||||
|
+
|
||||||
|
@Deprecated
|
||||||
|
public LivingEntity _INVALID_getShooter() {
|
||||||
|
return (LivingEntity) getShooter();
|
||||||
|
--
|
||||||
|
2.9.3
|
||||||
|
|
Loading…
Reference in a new issue