Updated Upstream (Bukkit/CraftBukkit/Spigot)

2021-12-31 19:05:42 -08:00 · 2021-12-31 19:05:42 -08:00 · 3a43821c38
commit 3a43821c38
parent 8b1734123e
859 changed files with 561 additions and 656 deletions
--- a/patches/api/0129-SkeletonHorse-Additions.patch
+++ b/patches/api/0129-SkeletonHorse-Additions.patch
@ -73,20 +73,25 @@ index 0000000000000000000000000000000000000000..9ce2948dfaa56d0adf53fe9b6117a90d
 +}
 +
 diff --git a/src/main/java/org/bukkit/entity/SkeletonHorse.java b/src/main/java/org/bukkit/entity/SkeletonHorse.java
-index b2c6b6a8689f6bd6ce784bbe6f571f756dd700c1..ba9983463263f77db3d3487bc12f01db4508a32b 100644
+index a34ad28fc43bde224c39253e8479bf7bb7e8df1c..38539d5b77e06865aa65b8db0c1a3b6eaa914d03 100644
 --- a/src/main/java/org/bukkit/entity/SkeletonHorse.java
 +++ b/src/main/java/org/bukkit/entity/SkeletonHorse.java
-@@ -3,4 +3,12 @@ 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();
+@@ -43,4 +43,18 @@ 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
-+}
+ }