core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
Jake Potrebic 2021-01-22 21:23:36 -08:00 committed by Mariell
parent 18ccc062d3
commit b3a6da3a75
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Spigot-Server-Patches/0112-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
View File

@ -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 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 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
+++ b/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 { @@ -118,4 +118,14 @@ public class CraftFishHook extends CraftProjectile implements FishHook {
Validate.isTrue(chance >= 0 && chance <= 1, "The bite chance must be between 0 and 1."); public HookState getState() {
this.biteChance = chance; return HookState.values()[getHandle().hookState.ordinal()];
} }
+ +
+ // Paper start + // Paper start
@ -22,5 +22,4 @@ index bee31ee654b3b38ab88c9cb680deb69decff57ba..2e05fd8f52cd9f7afab5432c70e12bb3
+ } + }
+ } + }
+ // Paper end + // Paper end
+
} }

2
work/Bukkit

@ -1 +1 @@
Subproject commit b94b766f2285a5b55720a8aa72605e2e64b0330a Subproject commit e70a125f4f4fe1c22d8d225dfa606155e7348ac9

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit b5eb2f57cedffe7ff3d0fc540fecc7d006729721 Subproject commit 0bad58f1e28412140342f422bced8d8403837843