Updated Upstream (Bukkit/CraftBukkit/Spigot)

2021-12-31 19:05:42 -08:00
parent a657f18f1f
commit a36a4e2018
22 changed files with 100 additions and 195 deletions
--- a/patches/api/SkeletonHorse-Additions.patch
+++ b/patches/api/SkeletonHorse-Additions.patch
@@ -76,17 +76,22 @@ diff --git a/src/main/java/org/bukkit/entity/SkeletonHorse.java b/src/main/java/
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/entity/SkeletonHorse.java
 +++ b/src/main/java/org/bukkit/entity/SkeletonHorse.java
-@@ -0,0 +0,0 @@ package org.bukkit.entity;
- /**
-  * Represents a SkeletonHorse - variant of {@link AbstractHorse}.
-  */
-public interface SkeletonHorse extends AbstractHorse { }
-+public interface SkeletonHorse extends AbstractHorse {
-+    // Paper start
-+    int getTrapTime();
+@@ -0,0 +0,0 @@ public interface SkeletonHorse extends AbstractHorse {
+      * @param trapTime new trap time
+      */
+     void setTrapTime(int trapTime);
 +
+    // Paper start
+    /**
+     * @deprecated use {@link #isTrapped()}
+     */
+    @Deprecated
 +    boolean isTrap();
 +
+    /**
+     * @deprecated use {@link #setTrapped(boolean)}
+     */
+    @Deprecated
 +    void setTrap(boolean trap);
 +    // Paper end
-+}
+ }