Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-22 02:25:28 +01:00
Code Issues Projects Releases Wiki Activity

you saw nothing

Browse Source
This commit is contained in:
Noah van der Aa 2024-10-22 18:32:41 +02:00
parent 2ef589c820
commit d0028b77c7
No known key found for this signature in database
GPG Key ID: 547D90BC6FF753CF
3 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
patches/api/0428-Experimental-annotations-change.patch
View File

@ -44,10 +44,10 @@ index 615eb24ffdd8f6d55ccd4f21760b809c1098bc68..f4ccb19107464e92744fbf66d55bf81f
WHITE_BUNDLE(12072, 1),
ORANGE_BUNDLE(18288, 1),
diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java
index cf17af024b1953b6f21f18885411ea6a0baa1d4c..544d5bf9fafe91e81314c75114a8a3516808db1d 100644
index cf17af024b1953b6f21f18885411ea6a0baa1d4c..2f951b0aa7e383a89e3e4244ffcae4e1b3a108e7 100644
--- a/src/main/java/org/bukkit/Sound.java
+++ b/src/main/java/org/bukkit/Sound.java
@@ -1530,9 +1530,18 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
@@ -1530,9 +1530,17 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
ITEM_BUCKET_FILL_LAVA("item.bucket.fill_lava"),
ITEM_BUCKET_FILL_POWDER_SNOW("item.bucket.fill_powder_snow"),
ITEM_BUCKET_FILL_TADPOLE("item.bucket.fill_tadpole"),
@ -57,12 +57,11 @@ index cf17af024b1953b6f21f18885411ea6a0baa1d4c..544d5bf9fafe91e81314c75114a8a351
+ @MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
ITEM_BUNDLE_INSERT("item.bundle.insert"),
+<<<<<<< HEAD
ITEM_BUNDLE_INSERT_FAIL("item.bundle.insert_fail"),
+=======
+ @MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+>>>>>>> Experimental annotations change
ITEM_BUNDLE_INSERT_FAIL("item.bundle.insert_fail"),
+ @MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
ITEM_BUNDLE_REMOVE_ONE("item.bundle.remove_one"),
ITEM_CHORUS_FRUIT_TELEPORT("item.chorus_fruit.teleport"),
ITEM_CROP_PLANT("item.crop.plant"),

4
patches/api/0430-Improve-Registry.patch
View File

@ -146,10 +146,10 @@ index 6112db5d1153d045f2271038bada6b46d1a6a051..67cf3fcad21a8977d6fad172cc776b62
}
}
diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java
index 544d5bf9fafe91e81314c75114a8a3516808db1d..a52c8a0bd030265567b7c1aa80b04eced37fcbbf 100644
index 2f951b0aa7e383a89e3e4244ffcae4e1b3a108e7..c866613ee1fb47daf89179dd30d74489c90be96d 100644
--- a/src/main/java/org/bukkit/Sound.java
+++ b/src/main/java/org/bukkit/Sound.java
@@ -1664,6 +1664,13 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
@@ -1663,6 +1663,13 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
this.key = NamespacedKey.minecraft(key);
}

28
patches/api/0457-Fix-SpawnerEntry-Equipment-API.patch
View File

@ -4,30 +4,11 @@ Date: Fri, 26 Apr 2024 17:00:00 -0700
Subject: [PATCH] Fix SpawnerEntry$Equipment API
diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java
index a52c8a0bd030265567b7c1aa80b04eced37fcbbf..c866613ee1fb47daf89179dd30d74489c90be96d 100644
--- a/src/main/java/org/bukkit/Sound.java
+++ b/src/main/java/org/bukkit/Sound.java
@@ -1536,12 +1536,11 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
@MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation
@org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
ITEM_BUNDLE_INSERT("item.bundle.insert"),
-<<<<<<< HEAD
+ @MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
ITEM_BUNDLE_INSERT_FAIL("item.bundle.insert_fail"),
-=======
@MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation
@org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
->>>>>>> Experimental annotations change
ITEM_BUNDLE_REMOVE_ONE("item.bundle.remove_one"),
ITEM_CHORUS_FRUIT_TELEPORT("item.chorus_fruit.teleport"),
ITEM_CROP_PLANT("item.crop.plant"),
diff --git a/src/main/java/org/bukkit/block/spawner/SpawnerEntry.java b/src/main/java/org/bukkit/block/spawner/SpawnerEntry.java
index fc1c0435dfea121923eb1fe0182880752f321143..4f00ebb78f7549aed0a250f494222b97b830d0f3 100644
index fc1c0435dfea121923eb1fe0182880752f321143..5cb482d42b0babd5a40598dc7fcf79c7d8c63655 100644
--- a/src/main/java/org/bukkit/block/spawner/SpawnerEntry.java
+++ b/src/main/java/org/bukkit/block/spawner/SpawnerEntry.java
@@ -120,27 +120,33 @@ public class SpawnerEntry {
@@ -120,27 +120,29 @@ public class SpawnerEntry {
private final Map<EquipmentSlot, Float> dropChances;
public Equipment(@NotNull LootTable equipmentLootTable, @NotNull Map<EquipmentSlot, Float> dropChances) {
@ -40,11 +21,8 @@ index fc1c0435dfea121923eb1fe0182880752f321143..4f00ebb78f7549aed0a250f494222b97
- * Set the loot table for the entity.
+ * Set the loot table for the spawned entity's equipment slots.
* <br>
+<<<<<<< HEAD
* To remove a loot table use null.
+=======
- * To remove a loot table use null.
+ * To remove a loot table use {@link LootTables#EMPTY}.
+>>>>>>> Fix SpawnerEntry$Equipment API
*
* @param table this {@link org.bukkit.entity.Mob} will have.
*/