Rebase

PaperMC · May 12, 2024 · 498fae1 · 498fae1
1 parent e96f23a
commit 498fae1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/patches/api/0346-More-Projectile-API.patch b/patches/api/0346-More-Projectile-API.patch
@@ -184,7 +184,7 @@ index 0d31aa0b22cf1e849572294e2cfe38b48c9210af..217d348ad0bbef720b25d3b507a55ca8
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/FishHook.java b/src/main/java/org/bukkit/entity/FishHook.java
-index 94e1a30ea1bc26821065a6d89c1f5669bd1d08ae..5dad46c9762ce0f35b84c01fa29de3392afb7a80 100644
+index 94e1a30ea1bc26821065a6d89c1f5669bd1d08ae..fe32fa569afd62300f7fdc29eefaba291f265674 100644
 --- a/src/main/java/org/bukkit/entity/FishHook.java
 +++ b/src/main/java/org/bukkit/entity/FishHook.java
 @@ -322,4 +322,50 @@ public interface FishHook extends Projectile {
@@ -231,7 +231,7 @@ index 94e1a30ea1bc26821065a6d89c1f5669bd1d08ae..5dad46c9762ce0f35b84c01fa29de339
 +    /**
 +     * Completely resets this fishing hook's fishing state, re-randomizing the time needed until a fish is lured and
 +     * bites the hook.
-+     * </p>
++     * <p>
 +     * This method takes all properties of the fishing hook into account when resetting said values, such as a lure
 +     * enchantment.
 +     */

diff --git a/...480-Add-missing-fishing-event-state.patch → ...479-Add-missing-fishing-event-state.patch b/...480-Add-missing-fishing-event-state.patch → ...479-Add-missing-fishing-event-state.patch
diff --git a/...048-Add-missing-fishing-event-state.patch → ...049-Add-missing-fishing-event-state.patch b/...048-Add-missing-fishing-event-state.patch → ...049-Add-missing-fishing-event-state.patch