mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 23:38:25 +01:00
637562df58
Upstream has released updates that appear 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: e70a125f #571: Expand the FishHook API CraftBukkit Changes: 0bad58f1 #783: Expand the FishHook API 3636fb51 SPIGOT-6318: Fix smoke effect directions
25 lines
1,016 B
Diff
25 lines
1,016 B
Diff
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
|
|
|
|
|
|
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()[getHandle().hookState.ordinal()];
|
|
}
|
|
+
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public void remove() {
|
|
+ super.remove();
|
|
+ if (getHandle().getOwner() != null) {
|
|
+ getHandle().getOwner().hookedFish = null;
|
|
+ }
|
|
+ }
|
|
+ // Paper end
|
|
}
|