[CI-SKIP] [Auto] Rebuild Patches

A recent commit has been made that caused patches to be out of order, rebuilding
2024-11-26 04:25:26 +01:00 · 2020-11-19 14:11:59 -05:00 · 2020-11-19 14:11:59 -05:00 · 7263cbca77
commit 7263cbca77
parent 1c63aff6d9
23 changed files with 3 additions and 3 deletions
--- a/Spigot-API-Patches/0230-Villager-resetOffers.patch
+++ b/Spigot-API-Patches/0230-Villager-resetOffers.patch
--- a/Spigot-API-Patches/0231-Player-elytra-boost-API.patch
+++ b/Spigot-API-Patches/0231-Player-elytra-boost-API.patch
--- a/Spigot-API-Patches/0232-Add-getOfflinePlayerIfCached-String.patch
+++ b/Spigot-API-Patches/0232-Add-getOfflinePlayerIfCached-String.patch
--- a/Spigot-API-Patches/0233-Add-ignore-discounts-API.patch
+++ b/Spigot-API-Patches/0233-Add-ignore-discounts-API.patch
--- a/Spigot-API-Patches/0234-Item-no-age-no-player-pickup.patch
+++ b/Spigot-API-Patches/0234-Item-no-age-no-player-pickup.patch
--- a/Spigot-API-Patches/0235-Beacon-API-custom-effect-ranges.patch
+++ b/Spigot-API-Patches/0235-Beacon-API-custom-effect-ranges.patch
--- a/Spigot-API-Patches/0236-Add-API-for-quit-reason.patch
+++ b/Spigot-API-Patches/0236-Add-API-for-quit-reason.patch
--- a/Spigot-Server-Patches/0584-Villager-resetOffers.patch
+++ b/Spigot-Server-Patches/0584-Villager-resetOffers.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Villager#resetOffers


 diff --git a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
-index 68fd780bc76ecf3c463f38c137fd8d4f036cdcbd..a50be19c5aac8d380565cebd85deffe32a439abb 100644
+index 74ca39067e7538eac5d70031564d0508846204a5..1fddf7c77488a5e53fc48d0db0a7b8acc71e2f42 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
@@ -85,6 +85,13 @@ public abstract class EntityVillagerAbstract extends EntityAgeable implements NP
--- a/Spigot-Server-Patches/0585-Improve-inlinig-for-some-hot-IBlockData-methods.patch
+++ b/Spigot-Server-Patches/0585-Improve-inlinig-for-some-hot-IBlockData-methods.patch
--- a/Spigot-Server-Patches/0586-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/Spigot-Server-Patches/0586-Retain-block-place-order-when-capturing-blockstates.patch
@ -10,7 +10,7 @@ In general, look at making this logic more robust (i.e properly handling
 cases where a captured entry is overriden) - but for now this will do.

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 18cddbcb8447c0c09f9aeb8aab40bdf4ea762b3e..d64d94b8c329ddce27151afc012ecfe26b5ee707 100644
+index cbfbdd4c7d91afb779aaf6aa79f9c681078b9b27..822b587cc92bb25ec8618fd9d86ce2c9233a69b6 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -75,7 +75,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
--- a/Spigot-Server-Patches/0587-Reduce-blockpos-allocation-from-pathfinding.patch
+++ b/Spigot-Server-Patches/0587-Reduce-blockpos-allocation-from-pathfinding.patch
--- a/Spigot-Server-Patches/0588-Fix-item-locations-dropped-from-campfires.patch
+++ b/Spigot-Server-Patches/0588-Fix-item-locations-dropped-from-campfires.patch
--- a/Spigot-Server-Patches/0589-Player-elytra-boost-API.patch
+++ b/Spigot-Server-Patches/0589-Player-elytra-boost-API.patch
--- a/Spigot-Server-Patches/0590-Fixed-TileEntityBell-memory-leak.patch
+++ b/Spigot-Server-Patches/0590-Fixed-TileEntityBell-memory-leak.patch
--- a/Spigot-Server-Patches/0591-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
+++ b/Spigot-Server-Patches/0591-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
--- a/Spigot-Server-Patches/0592-Add-getOfflinePlayerIfCached-String.patch
+++ b/Spigot-Server-Patches/0592-Add-getOfflinePlayerIfCached-String.patch
--- a/Spigot-Server-Patches/0593-Add-ignore-discounts-API.patch
+++ b/Spigot-Server-Patches/0593-Add-ignore-discounts-API.patch
--- a/Spigot-Server-Patches/0594-Toggle-for-removing-existing-dragon.patch
+++ b/Spigot-Server-Patches/0594-Toggle-for-removing-existing-dragon.patch
--- a/Spigot-Server-Patches/0595-Fix-client-lag-on-advancement-loading.patch
+++ b/Spigot-Server-Patches/0595-Fix-client-lag-on-advancement-loading.patch
--- a/Spigot-Server-Patches/0596-Item-no-age-no-player-pickup.patch
+++ b/Spigot-Server-Patches/0596-Item-no-age-no-player-pickup.patch
--- a/Spigot-Server-Patches/0597-Beacon-API-custom-effect-ranges.patch
+++ b/Spigot-Server-Patches/0597-Beacon-API-custom-effect-ranges.patch
--- a/Spigot-Server-Patches/0598-Add-API-for-quit-reason.patch
+++ b/Spigot-Server-Patches/0598-Add-API-for-quit-reason.patch
--- a/Spigot-Server-Patches/0599-Seed-based-feature-search.patch
+++ b/Spigot-Server-Patches/0599-Seed-based-feature-search.patch
@ -81,7 +81,7 @@ index c3bd58069d8dbdf36f70f1dafd7c24000f31708b..a62c87bceab2c9700a7b3925f208b0ff
                             StructureStart<?> structurestart = structuremanager.a(SectionPosition.a(ichunkaccess.getPos(), 0), this, ichunkaccess);
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d64d94b8c329ddce27151afc012ecfe26b5ee707..f260da1fd253ebd233d741809acf8a020779744b 100644
+index 822b587cc92bb25ec8618fd9d86ce2c9233a69b6..9ed21f434c5fb019b74dfe9ee0b802ccc5c07fd8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1451,8 +1451,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {