From 5b123cd1d59b9f50ee32732c1b97897294e338c1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 11 Nov 2020 12:46:51 -0500 Subject: [PATCH] [CI-SKIP] [Auto] Rebuild Patches A recent commit has been made that caused patches to be out of order, rebuilding --- ...r-pickup.patch => 0233-Item-no-age-no-player-pickup.patch} | 2 +- ...anges.patch => 0234-Beacon-API-custom-effect-ranges.patch} | 0 ...n.patch => 0595-Toggle-for-removing-existing-dragon.patch} | 0 ...patch => 0596-Fix-client-lag-on-advancement-loading.patch} | 4 ++-- ...r-pickup.patch => 0597-Item-no-age-no-player-pickup.patch} | 0 ...anges.patch => 0598-Beacon-API-custom-effect-ranges.patch} | 0 6 files changed, 3 insertions(+), 3 deletions(-) rename Spigot-API-Patches/{0232-Item-no-age-no-player-pickup.patch => 0233-Item-no-age-no-player-pickup.patch} (93%) rename Spigot-API-Patches/{0233-Beacon-API-custom-effect-ranges.patch => 0234-Beacon-API-custom-effect-ranges.patch} (100%) rename Spigot-Server-Patches/{0594-Toggle-for-removing-existing-dragon.patch => 0595-Toggle-for-removing-existing-dragon.patch} (100%) rename Spigot-Server-Patches/{0595-Fix-client-lag-on-advancement-loading.patch => 0596-Fix-client-lag-on-advancement-loading.patch} (93%) rename Spigot-Server-Patches/{0596-Item-no-age-no-player-pickup.patch => 0597-Item-no-age-no-player-pickup.patch} (100%) rename Spigot-Server-Patches/{0597-Beacon-API-custom-effect-ranges.patch => 0598-Beacon-API-custom-effect-ranges.patch} (100%) diff --git a/Spigot-API-Patches/0232-Item-no-age-no-player-pickup.patch b/Spigot-API-Patches/0233-Item-no-age-no-player-pickup.patch similarity index 93% rename from Spigot-API-Patches/0232-Item-no-age-no-player-pickup.patch rename to Spigot-API-Patches/0233-Item-no-age-no-player-pickup.patch index bc3ca103d..142a8b520 100644 --- a/Spigot-API-Patches/0232-Item-no-age-no-player-pickup.patch +++ b/Spigot-API-Patches/0233-Item-no-age-no-player-pickup.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Item no age & no player pickup diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java -index c404a5b8efea7c780db5ddae19456753808abb3d..5acbe1504fcdb93540acde0dcb00a9a6362dfc1e 100644 +index c404a5b8efea7c780db5ddae19456753808abb3d..0ee072645ecf1bf5feb74de6960947ef76db366e 100644 --- a/src/main/java/org/bukkit/entity/Item.java +++ b/src/main/java/org/bukkit/entity/Item.java @@ -90,5 +90,34 @@ public interface Item extends Entity { diff --git a/Spigot-API-Patches/0233-Beacon-API-custom-effect-ranges.patch b/Spigot-API-Patches/0234-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from Spigot-API-Patches/0233-Beacon-API-custom-effect-ranges.patch rename to Spigot-API-Patches/0234-Beacon-API-custom-effect-ranges.patch diff --git a/Spigot-Server-Patches/0594-Toggle-for-removing-existing-dragon.patch b/Spigot-Server-Patches/0595-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from Spigot-Server-Patches/0594-Toggle-for-removing-existing-dragon.patch rename to Spigot-Server-Patches/0595-Toggle-for-removing-existing-dragon.patch diff --git a/Spigot-Server-Patches/0595-Fix-client-lag-on-advancement-loading.patch b/Spigot-Server-Patches/0596-Fix-client-lag-on-advancement-loading.patch similarity index 93% rename from Spigot-Server-Patches/0595-Fix-client-lag-on-advancement-loading.patch rename to Spigot-Server-Patches/0596-Fix-client-lag-on-advancement-loading.patch index 777ccdde8..a2f530575 100644 --- a/Spigot-Server-Patches/0595-Fix-client-lag-on-advancement-loading.patch +++ b/Spigot-Server-Patches/0596-Fix-client-lag-on-advancement-loading.patch @@ -15,7 +15,7 @@ manually reload the advancement data for all players, which normally takes place as a part of the datapack reloading. diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java -index 17789407b9e86896a963a305a13357286aa5f319..ddbf8237d598f32e6e5361ca92ace268dfbec906 100644 +index 17789407b9e86896a963a305a13357286aa5f319..c680319e4040be2b60795b22a5e65d6444cc67ed 100644 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java @@ -78,6 +78,7 @@ public class AdvancementDataPlayer { @@ -35,7 +35,7 @@ index 17789407b9e86896a963a305a13357286aa5f319..ddbf8237d598f32e6e5361ca92ace268 if (this.m || !this.i.isEmpty() || !this.j.isEmpty()) { Map map = Maps.newHashMap(); diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 3ebaa9463e365831de37d8fa3cc191693f5b856f..9957c65d418f39e74956d1182b8fbf539f404eb6 100644 +index ed926fc6ebbabd50a73d216a9e018a9427f5b128..0f7f1503d07bdff7ce7644dfe21e444adb52c7db 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -282,7 +282,13 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/Spigot-Server-Patches/0596-Item-no-age-no-player-pickup.patch b/Spigot-Server-Patches/0597-Item-no-age-no-player-pickup.patch similarity index 100% rename from Spigot-Server-Patches/0596-Item-no-age-no-player-pickup.patch rename to Spigot-Server-Patches/0597-Item-no-age-no-player-pickup.patch diff --git a/Spigot-Server-Patches/0597-Beacon-API-custom-effect-ranges.patch b/Spigot-Server-Patches/0598-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from Spigot-Server-Patches/0597-Beacon-API-custom-effect-ranges.patch rename to Spigot-Server-Patches/0598-Beacon-API-custom-effect-ranges.patch