Skip to content

Commit c8e49cc

Browse files
authored
Add get/set wait time for fish hooks. (#5595)
1 parent 1ce3555 commit c8e49cc

File tree

3 files changed

+48
-0
lines changed

3 files changed

+48
-0
lines changed

build-data/paper.at

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,3 +324,6 @@ protected net.minecraft.world.entity.projectile.Projectile hitCancelled
324324

325325
# Expose firework item directly + manually setting flight ticks
326326
public net.minecraft.world.entity.projectile.FireworkRocketEntity life
327+
328+
# More Projectile API
329+
public net.minecraft.world.entity.projectile.FishingHook timeUntilLured

patches/api/0373-More-Projectile-API.patch

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,31 @@ index d616d5941b3c7b85e350e845901da798601b9a3c..b7a6e3b1ac327c4e03f9d73952c1ce4d
7070
+ void setTicksToDetonate(int ticks);
7171
+ // Paper stop
7272
}
73+
diff --git a/src/main/java/org/bukkit/entity/FishHook.java b/src/main/java/org/bukkit/entity/FishHook.java
74+
index d1b37530319f6d37ee37f62080289c1e45848bc8..e94c7e279356c510f60508b26277d4891a4258fa 100644
75+
--- a/src/main/java/org/bukkit/entity/FishHook.java
76+
+++ b/src/main/java/org/bukkit/entity/FishHook.java
77+
@@ -162,4 +162,20 @@ public interface FishHook extends Projectile {
78+
*/
79+
BOBBING;
80+
}
81+
+
82+
+ // Paper start - More FishHook API
83+
+ /**
84+
+ * Get the number of ticks the hook needs to wait for a fish to bite.
85+
+ *
86+
+ * @return Number of ticks
87+
+ */
88+
+ int getWaitTime();
89+
+
90+
+ /**
91+
+ * Sets the number of ticks the hook needs to wait for a fish to bite.
92+
+ *
93+
+ * @param ticks Number of ticks
94+
+ */
95+
+ void setWaitTime(int ticks);
96+
+ // Paper end
97+
}
7398
diff --git a/src/main/java/org/bukkit/entity/ThrownPotion.java b/src/main/java/org/bukkit/entity/ThrownPotion.java
7499
index 10a3c297bd87ad3ab4555054858f47a479e76e1a..1afda5d6d948b7e8589e69d3cd2c045763b5e784 100644
75100
--- a/src/main/java/org/bukkit/entity/ThrownPotion.java

patches/server/0875-More-Projectile-API.patch

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,26 @@ index be86114eac3975b82ca74d4d6ed3f0402a642e8a..93fd9e87de3078f50431b5d80540d433
111111
+ }
112112
+ // Paper end - Expose firework item directly + manually setting flight
113113
}
114+
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
115+
index 6bfa984781a483d048ef4318761203c701d8a632..5e0c2c5094e1578162d1a50d50701fbd25e6d961 100644
116+
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
117+
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
118+
@@ -119,4 +119,15 @@ public class CraftFishHook extends CraftProjectile implements FishHook {
119+
public HookState getState() {
120+
return HookState.values()[this.getHandle().currentState.ordinal()];
121+
}
122+
+ // Paper start - More FishHook API
123+
+ @Override
124+
+ public int getWaitTime() {
125+
+ return this.getHandle().timeUntilLured;
126+
+ }
127+
+
128+
+ @Override
129+
+ public void setWaitTime(int ticks) {
130+
+ this.getHandle().timeUntilLured = ticks;
131+
+ }
132+
+ // Paper end
133+
}
114134
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
115135
index b08739dd1ffd041f0885af6c1f57dca9027763b6..2edaae449f936b210a48c52ab8d921544c8a0005 100644
116136
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java

0 commit comments

Comments
 (0)