Updated Upstream (Bukkit/CraftBukkit)
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
This commit is contained in:
@@ -5,12 +5,12 @@ 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 bee31ee654b3b38ab88c9cb680deb69decff57ba..2e05fd8f52cd9f7afab5432c70e12bb30c48a027 100644
|
||||
index 42b306f1a341672996843a5e3dfa57ef32be48e9..385fa768cda07a61079476a7344d492f890e59e9 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
|
||||
@@ -82,4 +82,15 @@ public class CraftFishHook extends CraftProjectile implements FishHook {
|
||||
Validate.isTrue(chance >= 0 && chance <= 1, "The bite chance must be between 0 and 1.");
|
||||
this.biteChance = chance;
|
||||
@@ -118,4 +118,14 @@ public class CraftFishHook extends CraftProjectile implements FishHook {
|
||||
public HookState getState() {
|
||||
return HookState.values()[getHandle().hookState.ordinal()];
|
||||
}
|
||||
+
|
||||
+ // Paper start
|
||||
@@ -22,5 +22,4 @@ index bee31ee654b3b38ab88c9cb680deb69decff57ba..2e05fd8f52cd9f7afab5432c70e12bb3
|
||||
+ }
|
||||
+ }
|
||||
+ // Paper end
|
||||
+
|
||||
}
|
||||
|
||||
Submodule work/Bukkit updated: b94b766f22...e70a125f4f
Submodule work/CraftBukkit updated: b5eb2f57ce...0bad58f1e2
Reference in New Issue
Block a user