diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch index 8a6dfe76a..fc76a189b 100644 --- a/Spigot-Server-Patches/0001-POM-Changes.patch +++ b/Spigot-Server-Patches/0001-POM-Changes.patch @@ -196,7 +196,7 @@ index 1374fe3d7007977cf7513a7a91b4509dfc881e65..e954b100ea0c038c2e2aaba2a0937a6a diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 8a8234199e36da33cb94fdf030f9fc75dc0add44..9c98589c2db92720b4ae054ee74ef7ab0dac891a 100644 +index 52529e9318561d1873fd110fc2a2c775645ce1d7..8b2c7b6da2c6793e1cb1498f26693fb23dd3fa3e 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -186,7 +186,7 @@ public class Main { @@ -207,7 +207,7 @@ index 8a8234199e36da33cb94fdf030f9fc75dc0add44..9c98589c2db92720b4ae054ee74ef7ab + Date buildDate = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").parse(Main.class.getPackage().getImplementationVendor()); // Paper Calendar deadline = Calendar.getInstance(); - deadline.add(Calendar.DAY_OF_YEAR, -7); + deadline.add(Calendar.DAY_OF_YEAR, -21); diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java index 93046379d0cefd5d3236fc59e698809acdc18f80..674096cab190d62622f9947853b056f57d43a2a5 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java diff --git a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch index 944bcced3..26b27d3bf 100644 --- a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch +++ b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch @@ -45,11 +45,11 @@ index 90551257c299aaf694eb4f4063d5b1b3eee94876..ac177cd391e220af7584463e35f1f11e private final String bukkitVersion = Versioning.getBukkitVersion(); private final Logger logger = Logger.getLogger("Minecraft"); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index f187c7d127c356861c30141efeafcef0057878ec..061a3bc88fcce6877bc976d3b7989dea22b0a120 100644 +index 112a6d3ebe2f0b57f4e3c09d4ec342123af5f550..2dfba120cd81eb6b217decccb7bb218bb3f6a82e 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -200,12 +200,25 @@ public class Main { - deadline.add(Calendar.DAY_OF_YEAR, -7); + deadline.add(Calendar.DAY_OF_YEAR, -21); if (buildDate.before(deadline.getTime())) { System.err.println("*** Error, this build is outdated ***"); - System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/go/outdated-spigot ***"); diff --git a/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch b/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch index ee7c21942..9e2aa51d8 100644 --- a/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch +++ b/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Use UserCache for player heads diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -index a6e95a90977603068cbbaabfb02b640f15085965..4fb27cc7ed062696239f75b6f85ddb0a31866568 100644 +index e950b1957133fef20c464284807df262a7684238..c57634317b661e05ddd085d04f7338045445069f 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -@@ -157,7 +157,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { +@@ -165,7 +165,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { if (name == null) { setProfile(null); } else { diff --git a/Spigot-Server-Patches/0152-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0152-Basic-PlayerProfile-API.patch index 272c00208..06c8593bf 100644 --- a/Spigot-Server-Patches/0152-Basic-PlayerProfile-API.patch +++ b/Spigot-Server-Patches/0152-Basic-PlayerProfile-API.patch @@ -547,10 +547,10 @@ index 3e3f2a3d3b5ab32f498b4dd65f35f4c26470790f..6137bb510eec7d8c2ff2908b1255e56d // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -index 4fb27cc7ed062696239f75b6f85ddb0a31866568..c31011ff91f4ea8368e3afbc5ec07eff84e93fe2 100644 +index c57634317b661e05ddd085d04f7338045445069f..da9ad92f6c999d87b790852cb3129f9b04f624a9 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -@@ -71,6 +71,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { +@@ -79,6 +79,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { } private void setProfile(GameProfile profile) { diff --git a/Spigot-Server-Patches/0161-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0161-Fix-this-stupid-bullshit.patch index 0cada4294..f3bd462d0 100644 --- a/Spigot-Server-Patches/0161-Fix-this-stupid-bullshit.patch +++ b/Spigot-Server-Patches/0161-Fix-this-stupid-bullshit.patch @@ -9,12 +9,12 @@ modified in order to prevent merge conflicts when Spigot changes/disables the wa and to provide some level of hint without being disruptive. diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index eae93b314fed9f7ddf1c0b87228a2f3bc9f73a78..ac60ed4396b67838ded7c775ca1115eba40d318b 100644 +index de16a5f8b88d671c42db786ffcf60f4dce181029..ba949818493369c02d06d33d77a992c8ee8f457f 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -218,10 +218,12 @@ public class Main { Calendar deadline = Calendar.getInstance(); - deadline.add(Calendar.DAY_OF_YEAR, -7); + deadline.add(Calendar.DAY_OF_YEAR, -21); if (buildDate.before(deadline.getTime())) { - System.err.println("*** Error, this build is outdated ***"); + // Paper start - This is some stupid bullshit diff --git a/Spigot-Server-Patches/0188-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-Server-Patches/0188-Add-setPlayerProfile-API-for-Skulls.patch index 02559230e..87c51cc8b 100644 --- a/Spigot-Server-Patches/0188-Add-setPlayerProfile-API-for-Skulls.patch +++ b/Spigot-Server-Patches/0188-Add-setPlayerProfile-API-for-Skulls.patch @@ -48,19 +48,19 @@ index 20588598386a4f479e6a58b294149bed789c63ce..ecc32c2fb1e8e1ac03074102b982adb4 public BlockFace getRotation() { BlockData blockData = getBlockData(); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -index c31011ff91f4ea8368e3afbc5ec07eff84e93fe2..21e7a661739da84e6ec7a20c81cefcb0440484a2 100644 +index da9ad92f6c999d87b790852cb3129f9b04f624a9..ca40a5e33f851d560086533382340dd59f783f54 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -@@ -3,6 +3,8 @@ package org.bukkit.craftbukkit.inventory; - import com.google.common.collect.ImmutableMap.Builder; +@@ -4,6 +4,8 @@ import com.google.common.collect.ImmutableMap.Builder; import com.mojang.authlib.GameProfile; import java.util.Map; + import java.util.UUID; +import com.destroystokyo.paper.profile.CraftPlayerProfile; +import com.destroystokyo.paper.profile.PlayerProfile; import net.minecraft.server.GameProfileSerializer; import net.minecraft.server.NBTBase; import net.minecraft.server.NBTTagCompound; -@@ -16,6 +18,7 @@ import org.bukkit.craftbukkit.inventory.CraftMetaItem.SerializableMeta; +@@ -17,6 +19,7 @@ import org.bukkit.craftbukkit.inventory.CraftMetaItem.SerializableMeta; import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.inventory.meta.SkullMeta; @@ -68,7 +68,7 @@ index c31011ff91f4ea8368e3afbc5ec07eff84e93fe2..21e7a661739da84e6ec7a20c81cefcb0 @DelegateDeserialization(SerializableMeta.class) class CraftMetaSkull extends CraftMetaItem implements SkullMeta { -@@ -140,6 +143,19 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { +@@ -148,6 +151,19 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { return hasOwner() ? profile.getName() : null; } diff --git a/Spigot-Server-Patches/0195-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch b/Spigot-Server-Patches/0195-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch deleted file mode 100644 index 2745dde43..000000000 --- a/Spigot-Server-Patches/0195-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Shane Freeder -Date: Sat, 10 Mar 2018 13:03:49 +0000 -Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened - by plugins - - -diff --git a/src/main/java/net/minecraft/server/InventoryEnderChest.java b/src/main/java/net/minecraft/server/InventoryEnderChest.java -index ce74a5ff2905042e54615439b8e5369d6a921a27..bf8c5436b6cc9f661e7b607fa4696e7ae55b3a13 100644 ---- a/src/main/java/net/minecraft/server/InventoryEnderChest.java -+++ b/src/main/java/net/minecraft/server/InventoryEnderChest.java -@@ -5,7 +5,7 @@ import org.bukkit.inventory.InventoryHolder; - - public class InventoryEnderChest extends InventorySubcontainer { - -- private TileEntityEnderChest a; -+ private TileEntityEnderChest a; public TileEntityEnderChest getTileEntity() { return a; } // Paper - OBFHELPER - // CraftBukkit start - private final EntityHuman owner; - -@@ -15,6 +15,7 @@ public class InventoryEnderChest extends InventorySubcontainer { - - @Override - public Location getLocation() { -+ if (getTileEntity() == null) return null; // Paper - return null if there is no TE bound (opened by plugin) - return new Location(this.a.getWorld().getWorld(), this.a.getPosition().getX(), this.a.getPosition().getY(), this.a.getPosition().getZ()); - } - diff --git a/Spigot-Server-Patches/0196-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/Spigot-Server-Patches/0195-Prevent-Frosted-Ice-from-loading-holding-chunks.patch similarity index 100% rename from Spigot-Server-Patches/0196-Prevent-Frosted-Ice-from-loading-holding-chunks.patch rename to Spigot-Server-Patches/0195-Prevent-Frosted-Ice-from-loading-holding-chunks.patch diff --git a/Spigot-Server-Patches/0197-Disable-Explicit-Network-Manager-Flushing.patch b/Spigot-Server-Patches/0196-Disable-Explicit-Network-Manager-Flushing.patch similarity index 100% rename from Spigot-Server-Patches/0197-Disable-Explicit-Network-Manager-Flushing.patch rename to Spigot-Server-Patches/0196-Disable-Explicit-Network-Manager-Flushing.patch diff --git a/Spigot-Server-Patches/0198-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0197-Implement-extended-PaperServerListPingEvent.patch similarity index 100% rename from Spigot-Server-Patches/0198-Implement-extended-PaperServerListPingEvent.patch rename to Spigot-Server-Patches/0197-Implement-extended-PaperServerListPingEvent.patch diff --git a/Spigot-Server-Patches/0199-Improved-Async-Task-Scheduler.patch b/Spigot-Server-Patches/0198-Improved-Async-Task-Scheduler.patch similarity index 100% rename from Spigot-Server-Patches/0199-Improved-Async-Task-Scheduler.patch rename to Spigot-Server-Patches/0198-Improved-Async-Task-Scheduler.patch diff --git a/Spigot-Server-Patches/0200-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-Server-Patches/0199-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch similarity index 100% rename from Spigot-Server-Patches/0200-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch rename to Spigot-Server-Patches/0199-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch diff --git a/Spigot-Server-Patches/0201-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0200-Player.setPlayerProfile-API.patch similarity index 100% rename from Spigot-Server-Patches/0201-Player.setPlayerProfile-API.patch rename to Spigot-Server-Patches/0200-Player.setPlayerProfile-API.patch diff --git a/Spigot-Server-Patches/0202-Fix-Dragon-Server-Crashes.patch b/Spigot-Server-Patches/0201-Fix-Dragon-Server-Crashes.patch similarity index 100% rename from Spigot-Server-Patches/0202-Fix-Dragon-Server-Crashes.patch rename to Spigot-Server-Patches/0201-Fix-Dragon-Server-Crashes.patch diff --git a/Spigot-Server-Patches/0203-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0202-getPlayerUniqueId-API.patch similarity index 100% rename from Spigot-Server-Patches/0203-getPlayerUniqueId-API.patch rename to Spigot-Server-Patches/0202-getPlayerUniqueId-API.patch diff --git a/Spigot-Server-Patches/0204-Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/0203-Make-player-data-saving-configurable.patch similarity index 100% rename from Spigot-Server-Patches/0204-Make-player-data-saving-configurable.patch rename to Spigot-Server-Patches/0203-Make-player-data-saving-configurable.patch diff --git a/Spigot-Server-Patches/0205-Make-legacy-ping-handler-more-reliable.patch b/Spigot-Server-Patches/0204-Make-legacy-ping-handler-more-reliable.patch similarity index 100% rename from Spigot-Server-Patches/0205-Make-legacy-ping-handler-more-reliable.patch rename to Spigot-Server-Patches/0204-Make-legacy-ping-handler-more-reliable.patch diff --git a/Spigot-Server-Patches/0206-Call-PaperServerListPingEvent-for-legacy-pings.patch b/Spigot-Server-Patches/0205-Call-PaperServerListPingEvent-for-legacy-pings.patch similarity index 100% rename from Spigot-Server-Patches/0206-Call-PaperServerListPingEvent-for-legacy-pings.patch rename to Spigot-Server-Patches/0205-Call-PaperServerListPingEvent-for-legacy-pings.patch diff --git a/Spigot-Server-Patches/0207-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0206-Flag-to-disable-the-channel-limit.patch similarity index 100% rename from Spigot-Server-Patches/0207-Flag-to-disable-the-channel-limit.patch rename to Spigot-Server-Patches/0206-Flag-to-disable-the-channel-limit.patch diff --git a/Spigot-Server-Patches/0208-Add-method-to-open-already-placed-sign.patch b/Spigot-Server-Patches/0207-Add-method-to-open-already-placed-sign.patch similarity index 100% rename from Spigot-Server-Patches/0208-Add-method-to-open-already-placed-sign.patch rename to Spigot-Server-Patches/0207-Add-method-to-open-already-placed-sign.patch diff --git a/Spigot-Server-Patches/0209-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0208-Configurable-sprint-interruption-on-attack.patch similarity index 100% rename from Spigot-Server-Patches/0209-Configurable-sprint-interruption-on-attack.patch rename to Spigot-Server-Patches/0208-Configurable-sprint-interruption-on-attack.patch diff --git a/Spigot-Server-Patches/0210-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0209-Fix-exploit-that-allowed-colored-signs-to-be-created.patch similarity index 100% rename from Spigot-Server-Patches/0210-Fix-exploit-that-allowed-colored-signs-to-be-created.patch rename to Spigot-Server-Patches/0209-Fix-exploit-that-allowed-colored-signs-to-be-created.patch diff --git a/Spigot-Server-Patches/0211-EndermanEscapeEvent.patch b/Spigot-Server-Patches/0210-EndermanEscapeEvent.patch similarity index 100% rename from Spigot-Server-Patches/0211-EndermanEscapeEvent.patch rename to Spigot-Server-Patches/0210-EndermanEscapeEvent.patch diff --git a/Spigot-Server-Patches/0212-Enderman.teleportRandomly.patch b/Spigot-Server-Patches/0211-Enderman.teleportRandomly.patch similarity index 100% rename from Spigot-Server-Patches/0212-Enderman.teleportRandomly.patch rename to Spigot-Server-Patches/0211-Enderman.teleportRandomly.patch diff --git a/Spigot-Server-Patches/0213-Block-Enderpearl-Travel-Exploit.patch b/Spigot-Server-Patches/0212-Block-Enderpearl-Travel-Exploit.patch similarity index 100% rename from Spigot-Server-Patches/0213-Block-Enderpearl-Travel-Exploit.patch rename to Spigot-Server-Patches/0212-Block-Enderpearl-Travel-Exploit.patch diff --git a/Spigot-Server-Patches/0214-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0213-Expand-World.spawnParticle-API-and-add-Builder.patch similarity index 100% rename from Spigot-Server-Patches/0214-Expand-World.spawnParticle-API-and-add-Builder.patch rename to Spigot-Server-Patches/0213-Expand-World.spawnParticle-API-and-add-Builder.patch diff --git a/Spigot-Server-Patches/0215-EndermanAttackPlayerEvent.patch b/Spigot-Server-Patches/0214-EndermanAttackPlayerEvent.patch similarity index 100% rename from Spigot-Server-Patches/0215-EndermanAttackPlayerEvent.patch rename to Spigot-Server-Patches/0214-EndermanAttackPlayerEvent.patch diff --git a/Spigot-Server-Patches/0216-WitchConsumePotionEvent.patch b/Spigot-Server-Patches/0215-WitchConsumePotionEvent.patch similarity index 100% rename from Spigot-Server-Patches/0216-WitchConsumePotionEvent.patch rename to Spigot-Server-Patches/0215-WitchConsumePotionEvent.patch diff --git a/Spigot-Server-Patches/0217-WitchThrowPotionEvent.patch b/Spigot-Server-Patches/0216-WitchThrowPotionEvent.patch similarity index 100% rename from Spigot-Server-Patches/0217-WitchThrowPotionEvent.patch rename to Spigot-Server-Patches/0216-WitchThrowPotionEvent.patch diff --git a/Spigot-Server-Patches/0218-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0217-Allow-spawning-Item-entities-with-World.spawnEntity.patch similarity index 100% rename from Spigot-Server-Patches/0218-Allow-spawning-Item-entities-with-World.spawnEntity.patch rename to Spigot-Server-Patches/0217-Allow-spawning-Item-entities-with-World.spawnEntity.patch diff --git a/Spigot-Server-Patches/0219-WitchReadyPotionEvent.patch b/Spigot-Server-Patches/0218-WitchReadyPotionEvent.patch similarity index 100% rename from Spigot-Server-Patches/0219-WitchReadyPotionEvent.patch rename to Spigot-Server-Patches/0218-WitchReadyPotionEvent.patch diff --git a/Spigot-Server-Patches/0220-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0219-ItemStack-getMaxItemUseDuration.patch similarity index 100% rename from Spigot-Server-Patches/0220-ItemStack-getMaxItemUseDuration.patch rename to Spigot-Server-Patches/0219-ItemStack-getMaxItemUseDuration.patch diff --git a/Spigot-Server-Patches/0221-Implement-EntityTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0220-Implement-EntityTeleportEndGatewayEvent.patch similarity index 100% rename from Spigot-Server-Patches/0221-Implement-EntityTeleportEndGatewayEvent.patch rename to Spigot-Server-Patches/0220-Implement-EntityTeleportEndGatewayEvent.patch diff --git a/Spigot-Server-Patches/0222-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/Spigot-Server-Patches/0221-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch similarity index 100% rename from Spigot-Server-Patches/0222-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch rename to Spigot-Server-Patches/0221-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch diff --git a/Spigot-Server-Patches/0223-Fix-CraftEntity-hashCode.patch b/Spigot-Server-Patches/0222-Fix-CraftEntity-hashCode.patch similarity index 100% rename from Spigot-Server-Patches/0223-Fix-CraftEntity-hashCode.patch rename to Spigot-Server-Patches/0222-Fix-CraftEntity-hashCode.patch diff --git a/Spigot-Server-Patches/0224-Configurable-Alternative-LootPool-Luck-Formula.patch b/Spigot-Server-Patches/0223-Configurable-Alternative-LootPool-Luck-Formula.patch similarity index 100% rename from Spigot-Server-Patches/0224-Configurable-Alternative-LootPool-Luck-Formula.patch rename to Spigot-Server-Patches/0223-Configurable-Alternative-LootPool-Luck-Formula.patch diff --git a/Spigot-Server-Patches/0225-Print-Error-details-when-failing-to-save-player-data.patch b/Spigot-Server-Patches/0224-Print-Error-details-when-failing-to-save-player-data.patch similarity index 100% rename from Spigot-Server-Patches/0225-Print-Error-details-when-failing-to-save-player-data.patch rename to Spigot-Server-Patches/0224-Print-Error-details-when-failing-to-save-player-data.patch diff --git a/Spigot-Server-Patches/0226-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0225-Make-shield-blocking-delay-configurable.patch similarity index 100% rename from Spigot-Server-Patches/0226-Make-shield-blocking-delay-configurable.patch rename to Spigot-Server-Patches/0225-Make-shield-blocking-delay-configurable.patch diff --git a/Spigot-Server-Patches/0227-Improve-EntityShootBowEvent.patch b/Spigot-Server-Patches/0226-Improve-EntityShootBowEvent.patch similarity index 100% rename from Spigot-Server-Patches/0227-Improve-EntityShootBowEvent.patch rename to Spigot-Server-Patches/0226-Improve-EntityShootBowEvent.patch diff --git a/Spigot-Server-Patches/0228-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0227-PlayerReadyArrowEvent.patch similarity index 100% rename from Spigot-Server-Patches/0228-PlayerReadyArrowEvent.patch rename to Spigot-Server-Patches/0227-PlayerReadyArrowEvent.patch diff --git a/Spigot-Server-Patches/0229-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0228-Implement-EntityKnockbackByEntityEvent.patch similarity index 100% rename from Spigot-Server-Patches/0229-Implement-EntityKnockbackByEntityEvent.patch rename to Spigot-Server-Patches/0228-Implement-EntityKnockbackByEntityEvent.patch diff --git a/Spigot-Server-Patches/0230-Expand-Explosions-API.patch b/Spigot-Server-Patches/0229-Expand-Explosions-API.patch similarity index 100% rename from Spigot-Server-Patches/0230-Expand-Explosions-API.patch rename to Spigot-Server-Patches/0229-Expand-Explosions-API.patch diff --git a/Spigot-Server-Patches/0231-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0230-LivingEntity-Hand-Raised-Item-Use-API.patch similarity index 100% rename from Spigot-Server-Patches/0231-LivingEntity-Hand-Raised-Item-Use-API.patch rename to Spigot-Server-Patches/0230-LivingEntity-Hand-Raised-Item-Use-API.patch diff --git a/Spigot-Server-Patches/0232-RangedEntity-API.patch b/Spigot-Server-Patches/0231-RangedEntity-API.patch similarity index 100% rename from Spigot-Server-Patches/0232-RangedEntity-API.patch rename to Spigot-Server-Patches/0231-RangedEntity-API.patch diff --git a/Spigot-Server-Patches/0233-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0232-Add-config-to-disable-ender-dragon-legacy-check.patch similarity index 100% rename from Spigot-Server-Patches/0233-Add-config-to-disable-ender-dragon-legacy-check.patch rename to Spigot-Server-Patches/0232-Add-config-to-disable-ender-dragon-legacy-check.patch diff --git a/Spigot-Server-Patches/0234-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0233-Implement-World.getEntity-UUID-API.patch similarity index 100% rename from Spigot-Server-Patches/0234-Implement-World.getEntity-UUID-API.patch rename to Spigot-Server-Patches/0233-Implement-World.getEntity-UUID-API.patch diff --git a/Spigot-Server-Patches/0235-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0234-InventoryCloseEvent-Reason-API.patch similarity index 100% rename from Spigot-Server-Patches/0235-InventoryCloseEvent-Reason-API.patch rename to Spigot-Server-Patches/0234-InventoryCloseEvent-Reason-API.patch diff --git a/Spigot-Server-Patches/0236-Vex-getSummoner-API.patch b/Spigot-Server-Patches/0235-Vex-getSummoner-API.patch similarity index 100% rename from Spigot-Server-Patches/0236-Vex-getSummoner-API.patch rename to Spigot-Server-Patches/0235-Vex-getSummoner-API.patch diff --git a/Spigot-Server-Patches/0237-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0236-Refresh-player-inventory-when-cancelling-PlayerInter.patch similarity index 100% rename from Spigot-Server-Patches/0237-Refresh-player-inventory-when-cancelling-PlayerInter.patch rename to Spigot-Server-Patches/0236-Refresh-player-inventory-when-cancelling-PlayerInter.patch diff --git a/Spigot-Server-Patches/0238-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0237-Don-t-change-the-Entity-Random-seed-for-squids.patch similarity index 100% rename from Spigot-Server-Patches/0238-Don-t-change-the-Entity-Random-seed-for-squids.patch rename to Spigot-Server-Patches/0237-Don-t-change-the-Entity-Random-seed-for-squids.patch diff --git a/Spigot-Server-Patches/0239-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0238-Re-add-vanilla-entity-warnings-for-duplicates.patch similarity index 100% rename from Spigot-Server-Patches/0239-Re-add-vanilla-entity-warnings-for-duplicates.patch rename to Spigot-Server-Patches/0238-Re-add-vanilla-entity-warnings-for-duplicates.patch diff --git a/Spigot-Server-Patches/0240-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/Spigot-Server-Patches/0239-Avoid-item-merge-if-stack-size-above-max-stack-size.patch similarity index 100% rename from Spigot-Server-Patches/0240-Avoid-item-merge-if-stack-size-above-max-stack-size.patch rename to Spigot-Server-Patches/0239-Avoid-item-merge-if-stack-size-above-max-stack-size.patch diff --git a/Spigot-Server-Patches/0241-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0240-Use-asynchronous-Log4j-2-loggers.patch similarity index 100% rename from Spigot-Server-Patches/0241-Use-asynchronous-Log4j-2-loggers.patch rename to Spigot-Server-Patches/0240-Use-asynchronous-Log4j-2-loggers.patch diff --git a/Spigot-Server-Patches/0242-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0241-add-more-information-to-Entity.toString.patch similarity index 100% rename from Spigot-Server-Patches/0242-add-more-information-to-Entity.toString.patch rename to Spigot-Server-Patches/0241-add-more-information-to-Entity.toString.patch diff --git a/Spigot-Server-Patches/0243-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0242-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch similarity index 97% rename from Spigot-Server-Patches/0243-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch rename to Spigot-Server-Patches/0242-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch index 825ca6b52..2ef9fb9a9 100644 --- a/Spigot-Server-Patches/0243-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch +++ b/Spigot-Server-Patches/0242-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues Add -Ddebug.entities=true to your JVM flags to gain more information diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 98ecbd1089aeb6d0dc92801d59d01b6e20a4a7c3..f33bc0b6c6d033d692bdd9c9cfb7d2197e9ca40c 100644 +index dd9588cfdb9ea6f50c08af829a533319680c7e59..d0e077084b84e44336878410aa9a44fed7408670 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -76,6 +76,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -40,7 +40,7 @@ index 8862bbd73b627e37709d46e6aeeee70c89cbd821..4bbcd00950405a4bf3ce391b557049a3 protected void g() { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 1b15ccd6c05d1ed965c03cd50f7488e26741c2ed..651791f27b796b081a52b8d8735a51e2f940e5df 100644 +index dc00ad1607dc6b05f8cb13470046d72f17aa115b..6ebf3884a289d0be081d43d012ac10796740cc1e 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -68,6 +68,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0244-EnderDragon-Events.patch b/Spigot-Server-Patches/0243-EnderDragon-Events.patch similarity index 100% rename from Spigot-Server-Patches/0244-EnderDragon-Events.patch rename to Spigot-Server-Patches/0243-EnderDragon-Events.patch diff --git a/Spigot-Server-Patches/0245-PlayerElytraBoostEvent.patch b/Spigot-Server-Patches/0244-PlayerElytraBoostEvent.patch similarity index 100% rename from Spigot-Server-Patches/0245-PlayerElytraBoostEvent.patch rename to Spigot-Server-Patches/0244-PlayerElytraBoostEvent.patch diff --git a/Spigot-Server-Patches/0246-Improve-BlockPosition-inlining.patch b/Spigot-Server-Patches/0245-Improve-BlockPosition-inlining.patch similarity index 100% rename from Spigot-Server-Patches/0246-Improve-BlockPosition-inlining.patch rename to Spigot-Server-Patches/0245-Improve-BlockPosition-inlining.patch diff --git a/Spigot-Server-Patches/0247-Optimize-RegistryID.c.patch b/Spigot-Server-Patches/0246-Optimize-RegistryID.c.patch similarity index 100% rename from Spigot-Server-Patches/0247-Optimize-RegistryID.c.patch rename to Spigot-Server-Patches/0246-Optimize-RegistryID.c.patch diff --git a/Spigot-Server-Patches/0248-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0247-Option-to-prevent-armor-stands-from-doing-entity-loo.patch similarity index 100% rename from Spigot-Server-Patches/0248-Option-to-prevent-armor-stands-from-doing-entity-loo.patch rename to Spigot-Server-Patches/0247-Option-to-prevent-armor-stands-from-doing-entity-loo.patch diff --git a/Spigot-Server-Patches/0249-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0248-Vanished-players-don-t-have-rights.patch similarity index 98% rename from Spigot-Server-Patches/0249-Vanished-players-don-t-have-rights.patch rename to Spigot-Server-Patches/0248-Vanished-players-don-t-have-rights.patch index 36b69792b..c7bb24e8c 100644 --- a/Spigot-Server-Patches/0249-Vanished-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/0248-Vanished-players-don-t-have-rights.patch @@ -17,7 +17,7 @@ index 2d3e498d5c40e573aad88fd0fce7943e930956ba..8ba7718b61ad9f6c8537b44265818ecb return this.getBlock().c(this.p(), iblockaccess, blockposition, voxelshapecollision); } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index f33bc0b6c6d033d692bdd9c9cfb7d2197e9ca40c..6644115d6654a35cfb21b6c128430a3136a2281f 100644 +index d0e077084b84e44336878410aa9a44fed7408670..76ffbcec75fb1e22190179cf1f6ef7e417268ded 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -98,7 +98,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -96,7 +96,7 @@ index ed0f9c5d29c4f88b7beee4b0ecdd7a56de2d7a9e..881cea7c466f29ff4a89db28d104e850 if (operatorboolean.apply(false, false)) { throw (IllegalArgumentException) SystemUtils.c((Throwable) (new IllegalArgumentException())); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 2f08328dabeb8e5c3734d4005d7086ec133f6f9d..ee1e0459e5ae8b59c07f9a89c6eaf240e8cd244f 100644 +index 909e01e458d729f277797bf1dca564f927318460..4b28cb07e24a2deb18e2c7e97f25fee1d32e0d25 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -178,6 +178,46 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0250-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0249-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch similarity index 100% rename from Spigot-Server-Patches/0250-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch rename to Spigot-Server-Patches/0249-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch diff --git a/Spigot-Server-Patches/0251-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0250-Add-some-Debug-to-Chunk-Entity-slices.patch similarity index 97% rename from Spigot-Server-Patches/0251-Add-some-Debug-to-Chunk-Entity-slices.patch rename to Spigot-Server-Patches/0250-Add-some-Debug-to-Chunk-Entity-slices.patch index 8ac6ab855..4f797af4b 100644 --- a/Spigot-Server-Patches/0251-Add-some-Debug-to-Chunk-Entity-slices.patch +++ b/Spigot-Server-Patches/0250-Add-some-Debug-to-Chunk-Entity-slices.patch @@ -58,7 +58,7 @@ index bc249e399befa84cdf07cc58cd0072bb9cb5cced..3b3cae92513a85ba842d403c68f5a1fb return; } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 6644115d6654a35cfb21b6c128430a3136a2281f..91deb3a39cc9a28d96bcac8fe3f4bb68e1fb2003 100644 +index 76ffbcec75fb1e22190179cf1f6ef7e417268ded..ef375f3987c26d70ba3f88e53f458bdccb6fc1ae 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -71,6 +71,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0252-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0251-SkeletonHorse-Additions.patch similarity index 100% rename from Spigot-Server-Patches/0252-SkeletonHorse-Additions.patch rename to Spigot-Server-Patches/0251-SkeletonHorse-Additions.patch diff --git a/Spigot-Server-Patches/0253-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0252-Prevent-Saving-Bad-entities-to-chunks.patch similarity index 100% rename from Spigot-Server-Patches/0253-Prevent-Saving-Bad-entities-to-chunks.patch rename to Spigot-Server-Patches/0252-Prevent-Saving-Bad-entities-to-chunks.patch diff --git a/Spigot-Server-Patches/0254-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0253-Don-t-call-getItemMeta-on-hasItemMeta.patch similarity index 100% rename from Spigot-Server-Patches/0254-Don-t-call-getItemMeta-on-hasItemMeta.patch rename to Spigot-Server-Patches/0253-Don-t-call-getItemMeta-on-hasItemMeta.patch diff --git a/Spigot-Server-Patches/0255-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0254-Ignore-Dead-Entities-in-entityList-iteration.patch similarity index 100% rename from Spigot-Server-Patches/0255-Ignore-Dead-Entities-in-entityList-iteration.patch rename to Spigot-Server-Patches/0254-Ignore-Dead-Entities-in-entityList-iteration.patch diff --git a/Spigot-Server-Patches/0256-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0255-Implement-Expanded-ArmorStand-API.patch similarity index 100% rename from Spigot-Server-Patches/0256-Implement-Expanded-ArmorStand-API.patch rename to Spigot-Server-Patches/0255-Implement-Expanded-ArmorStand-API.patch diff --git a/Spigot-Server-Patches/0257-AnvilDamageEvent.patch b/Spigot-Server-Patches/0256-AnvilDamageEvent.patch similarity index 100% rename from Spigot-Server-Patches/0257-AnvilDamageEvent.patch rename to Spigot-Server-Patches/0256-AnvilDamageEvent.patch diff --git a/Spigot-Server-Patches/0258-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0257-Add-TNTPrimeEvent.patch similarity index 100% rename from Spigot-Server-Patches/0258-Add-TNTPrimeEvent.patch rename to Spigot-Server-Patches/0257-Add-TNTPrimeEvent.patch diff --git a/Spigot-Server-Patches/0259-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0258-Break-up-and-make-tab-spam-limits-configurable.patch similarity index 100% rename from Spigot-Server-Patches/0259-Break-up-and-make-tab-spam-limits-configurable.patch rename to Spigot-Server-Patches/0258-Break-up-and-make-tab-spam-limits-configurable.patch diff --git a/Spigot-Server-Patches/0260-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0259-Add-hand-to-bucket-events.patch similarity index 99% rename from Spigot-Server-Patches/0260-Add-hand-to-bucket-events.patch rename to Spigot-Server-Patches/0259-Add-hand-to-bucket-events.patch index d93bdb068..f8f7f5765 100644 --- a/Spigot-Server-Patches/0260-Add-hand-to-bucket-events.patch +++ b/Spigot-Server-Patches/0259-Add-hand-to-bucket-events.patch @@ -73,7 +73,7 @@ index 48958308a89cbe39e1b4dddcdd8d1d0b5ece6339..120bf8436fd82294c339add2e7bff1cd int i = blockposition.getX(); int j = blockposition.getY(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index ee1e0459e5ae8b59c07f9a89c6eaf240e8cd244f..5ae5caf23e9614bb506c8aa0d511e73c54abf903 100644 +index 4b28cb07e24a2deb18e2c7e97f25fee1d32e0d25..42307f0ed23c413f86edf3ac2783f258560ac969 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -218,6 +218,17 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0261-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0260-MC-135506-Experience-should-save-as-Integers.patch similarity index 100% rename from Spigot-Server-Patches/0261-MC-135506-Experience-should-save-as-Integers.patch rename to Spigot-Server-Patches/0260-MC-135506-Experience-should-save-as-Integers.patch diff --git a/Spigot-Server-Patches/0262-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0261-Fix-client-rendering-skulls-from-same-user.patch similarity index 100% rename from Spigot-Server-Patches/0262-Fix-client-rendering-skulls-from-same-user.patch rename to Spigot-Server-Patches/0261-Fix-client-rendering-skulls-from-same-user.patch diff --git a/Spigot-Server-Patches/0263-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0262-Add-Early-Warning-Feature-to-WatchDog.patch similarity index 100% rename from Spigot-Server-Patches/0263-Add-Early-Warning-Feature-to-WatchDog.patch rename to Spigot-Server-Patches/0262-Add-Early-Warning-Feature-to-WatchDog.patch diff --git a/Spigot-Server-Patches/0264-Make-EnderDragon-implement-Mob.patch b/Spigot-Server-Patches/0263-Make-EnderDragon-implement-Mob.patch similarity index 100% rename from Spigot-Server-Patches/0264-Make-EnderDragon-implement-Mob.patch rename to Spigot-Server-Patches/0263-Make-EnderDragon-implement-Mob.patch diff --git a/Spigot-Server-Patches/0265-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0264-Use-ConcurrentHashMap-in-JsonList.patch similarity index 100% rename from Spigot-Server-Patches/0265-Use-ConcurrentHashMap-in-JsonList.patch rename to Spigot-Server-Patches/0264-Use-ConcurrentHashMap-in-JsonList.patch diff --git a/Spigot-Server-Patches/0266-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0265-Use-a-Queue-for-Queueing-Commands.patch similarity index 100% rename from Spigot-Server-Patches/0266-Use-a-Queue-for-Queueing-Commands.patch rename to Spigot-Server-Patches/0265-Use-a-Queue-for-Queueing-Commands.patch diff --git a/Spigot-Server-Patches/0267-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0266-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch similarity index 100% rename from Spigot-Server-Patches/0267-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch rename to Spigot-Server-Patches/0266-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch diff --git a/Spigot-Server-Patches/0268-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0267-Allow-disabling-armour-stand-ticking.patch similarity index 100% rename from Spigot-Server-Patches/0268-Allow-disabling-armour-stand-ticking.patch rename to Spigot-Server-Patches/0267-Allow-disabling-armour-stand-ticking.patch diff --git a/Spigot-Server-Patches/0269-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0268-Optimize-BlockPosition-helper-methods.patch similarity index 100% rename from Spigot-Server-Patches/0269-Optimize-BlockPosition-helper-methods.patch rename to Spigot-Server-Patches/0268-Optimize-BlockPosition-helper-methods.patch diff --git a/Spigot-Server-Patches/0270-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0269-Restore-vanlla-default-mob-spawn-range.patch similarity index 100% rename from Spigot-Server-Patches/0270-Restore-vanlla-default-mob-spawn-range.patch rename to Spigot-Server-Patches/0269-Restore-vanlla-default-mob-spawn-range.patch diff --git a/Spigot-Server-Patches/0271-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0270-Slime-Pathfinder-Events.patch similarity index 100% rename from Spigot-Server-Patches/0271-Slime-Pathfinder-Events.patch rename to Spigot-Server-Patches/0270-Slime-Pathfinder-Events.patch diff --git a/Spigot-Server-Patches/0272-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0271-Configurable-speed-for-water-flowing-over-lava.patch similarity index 100% rename from Spigot-Server-Patches/0272-Configurable-speed-for-water-flowing-over-lava.patch rename to Spigot-Server-Patches/0271-Configurable-speed-for-water-flowing-over-lava.patch diff --git a/Spigot-Server-Patches/0273-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0272-Optimize-CraftBlockData-Creation.patch similarity index 100% rename from Spigot-Server-Patches/0273-Optimize-CraftBlockData-Creation.patch rename to Spigot-Server-Patches/0272-Optimize-CraftBlockData-Creation.patch diff --git a/Spigot-Server-Patches/0274-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0273-Optimize-RegistryMaterials.patch similarity index 100% rename from Spigot-Server-Patches/0274-Optimize-RegistryMaterials.patch rename to Spigot-Server-Patches/0273-Optimize-RegistryMaterials.patch diff --git a/Spigot-Server-Patches/0275-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0274-Add-PhantomPreSpawnEvent.patch similarity index 100% rename from Spigot-Server-Patches/0275-Add-PhantomPreSpawnEvent.patch rename to Spigot-Server-Patches/0274-Add-PhantomPreSpawnEvent.patch diff --git a/Spigot-Server-Patches/0276-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0275-Add-More-Creeper-API.patch similarity index 100% rename from Spigot-Server-Patches/0276-Add-More-Creeper-API.patch rename to Spigot-Server-Patches/0275-Add-More-Creeper-API.patch diff --git a/Spigot-Server-Patches/0277-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0276-Inventory-removeItemAnySlot.patch similarity index 100% rename from Spigot-Server-Patches/0277-Inventory-removeItemAnySlot.patch rename to Spigot-Server-Patches/0276-Inventory-removeItemAnySlot.patch diff --git a/Spigot-Server-Patches/0278-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0277-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch similarity index 100% rename from Spigot-Server-Patches/0278-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch rename to Spigot-Server-Patches/0277-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch diff --git a/Spigot-Server-Patches/0279-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0278-Add-ray-tracing-methods-to-LivingEntity.patch similarity index 97% rename from Spigot-Server-Patches/0279-Add-ray-tracing-methods-to-LivingEntity.patch rename to Spigot-Server-Patches/0278-Add-ray-tracing-methods-to-LivingEntity.patch index 856ae8b2b..f26e73420 100644 --- a/Spigot-Server-Patches/0279-Add-ray-tracing-methods-to-LivingEntity.patch +++ b/Spigot-Server-Patches/0278-Add-ray-tracing-methods-to-LivingEntity.patch @@ -33,7 +33,7 @@ index 3a6e5cb459fb9866cf2e377b803501152ab7ce69..f193c2778d0f04973546256d64869239 public int getShieldBlockingDelay() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index fb77846b236a7279e91ec4d9aab3eef3fe67cd4c..94be9707abefeddcc495d8c0cbc9ed9737d6a56a 100644 +index a91070c3674dc47e0019e642f0f76a3cf76b7387..3ec331f51bb305a82d2a12423c28d1f2e8ab8365 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -201,6 +201,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/Spigot-Server-Patches/0280-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0279-Expose-attack-cooldown-methods-for-Player.patch similarity index 100% rename from Spigot-Server-Patches/0280-Expose-attack-cooldown-methods-for-Player.patch rename to Spigot-Server-Patches/0279-Expose-attack-cooldown-methods-for-Player.patch diff --git a/Spigot-Server-Patches/0281-Improve-death-events.patch b/Spigot-Server-Patches/0280-Improve-death-events.patch similarity index 100% rename from Spigot-Server-Patches/0281-Improve-death-events.patch rename to Spigot-Server-Patches/0280-Improve-death-events.patch diff --git a/Spigot-Server-Patches/0282-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0281-Allow-chests-to-be-placed-with-NBT-data.patch similarity index 100% rename from Spigot-Server-Patches/0282-Allow-chests-to-be-placed-with-NBT-data.patch rename to Spigot-Server-Patches/0281-Allow-chests-to-be-placed-with-NBT-data.patch diff --git a/Spigot-Server-Patches/0283-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0282-Mob-Pathfinding-API.patch similarity index 100% rename from Spigot-Server-Patches/0283-Mob-Pathfinding-API.patch rename to Spigot-Server-Patches/0282-Mob-Pathfinding-API.patch diff --git a/Spigot-Server-Patches/0284-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0283-Prevent-chunk-loading-from-Fluid-Flowing.patch similarity index 100% rename from Spigot-Server-Patches/0284-Prevent-chunk-loading-from-Fluid-Flowing.patch rename to Spigot-Server-Patches/0283-Prevent-chunk-loading-from-Fluid-Flowing.patch diff --git a/Spigot-Server-Patches/0285-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0284-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch similarity index 100% rename from Spigot-Server-Patches/0285-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch rename to Spigot-Server-Patches/0284-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch diff --git a/Spigot-Server-Patches/0286-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0285-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch similarity index 100% rename from Spigot-Server-Patches/0286-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch rename to Spigot-Server-Patches/0285-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch diff --git a/Spigot-Server-Patches/0287-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0286-Prevent-mob-spawning-from-loading-generating-chunks.patch similarity index 100% rename from Spigot-Server-Patches/0287-Prevent-mob-spawning-from-loading-generating-chunks.patch rename to Spigot-Server-Patches/0286-Prevent-mob-spawning-from-loading-generating-chunks.patch diff --git a/Spigot-Server-Patches/0288-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0287-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from Spigot-Server-Patches/0288-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to Spigot-Server-Patches/0287-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/Spigot-Server-Patches/0289-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0288-Implement-furnace-cook-speed-multiplier-API.patch similarity index 100% rename from Spigot-Server-Patches/0289-Implement-furnace-cook-speed-multiplier-API.patch rename to Spigot-Server-Patches/0288-Implement-furnace-cook-speed-multiplier-API.patch diff --git a/Spigot-Server-Patches/0290-PreSpawnerSpawnEvent.patch b/Spigot-Server-Patches/0289-PreSpawnerSpawnEvent.patch similarity index 100% rename from Spigot-Server-Patches/0290-PreSpawnerSpawnEvent.patch rename to Spigot-Server-Patches/0289-PreSpawnerSpawnEvent.patch diff --git a/Spigot-Server-Patches/0291-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0290-Catch-JsonParseException-in-Entity-and-TE-names.patch similarity index 100% rename from Spigot-Server-Patches/0291-Catch-JsonParseException-in-Entity-and-TE-names.patch rename to Spigot-Server-Patches/0290-Catch-JsonParseException-in-Entity-and-TE-names.patch diff --git a/Spigot-Server-Patches/0292-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0291-Honor-EntityAgeable.ageLock.patch similarity index 100% rename from Spigot-Server-Patches/0292-Honor-EntityAgeable.ageLock.patch rename to Spigot-Server-Patches/0291-Honor-EntityAgeable.ageLock.patch diff --git a/Spigot-Server-Patches/0293-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0292-Configurable-connection-throttle-kick-message.patch similarity index 100% rename from Spigot-Server-Patches/0293-Configurable-connection-throttle-kick-message.patch rename to Spigot-Server-Patches/0292-Configurable-connection-throttle-kick-message.patch diff --git a/Spigot-Server-Patches/0294-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0293-Hook-into-CB-plugin-rewrites.patch similarity index 100% rename from Spigot-Server-Patches/0294-Hook-into-CB-plugin-rewrites.patch rename to Spigot-Server-Patches/0293-Hook-into-CB-plugin-rewrites.patch diff --git a/Spigot-Server-Patches/0295-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0294-Allow-setting-the-vex-s-summoner.patch similarity index 100% rename from Spigot-Server-Patches/0295-Allow-setting-the-vex-s-summoner.patch rename to Spigot-Server-Patches/0294-Allow-setting-the-vex-s-summoner.patch diff --git a/Spigot-Server-Patches/0296-Add-sun-related-API.patch b/Spigot-Server-Patches/0295-Add-sun-related-API.patch similarity index 100% rename from Spigot-Server-Patches/0296-Add-sun-related-API.patch rename to Spigot-Server-Patches/0295-Add-sun-related-API.patch diff --git a/Spigot-Server-Patches/0297-Turtle-API.patch b/Spigot-Server-Patches/0296-Turtle-API.patch similarity index 100% rename from Spigot-Server-Patches/0297-Turtle-API.patch rename to Spigot-Server-Patches/0296-Turtle-API.patch diff --git a/Spigot-Server-Patches/0298-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0297-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch similarity index 100% rename from Spigot-Server-Patches/0298-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch rename to Spigot-Server-Patches/0297-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch diff --git a/Spigot-Server-Patches/0299-Call-player-spectator-target-events-and-improve-impl.patch b/Spigot-Server-Patches/0298-Call-player-spectator-target-events-and-improve-impl.patch similarity index 100% rename from Spigot-Server-Patches/0299-Call-player-spectator-target-events-and-improve-impl.patch rename to Spigot-Server-Patches/0298-Call-player-spectator-target-events-and-improve-impl.patch diff --git a/Spigot-Server-Patches/0300-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0299-Add-Velocity-IP-Forwarding-Support.patch similarity index 100% rename from Spigot-Server-Patches/0300-Add-Velocity-IP-Forwarding-Support.patch rename to Spigot-Server-Patches/0299-Add-Velocity-IP-Forwarding-Support.patch diff --git a/Spigot-Server-Patches/0301-Add-more-Witch-API.patch b/Spigot-Server-Patches/0300-Add-more-Witch-API.patch similarity index 100% rename from Spigot-Server-Patches/0301-Add-more-Witch-API.patch rename to Spigot-Server-Patches/0300-Add-more-Witch-API.patch diff --git a/Spigot-Server-Patches/0302-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0301-Check-Drowned-for-Villager-Aggression-Config.patch similarity index 100% rename from Spigot-Server-Patches/0302-Check-Drowned-for-Villager-Aggression-Config.patch rename to Spigot-Server-Patches/0301-Check-Drowned-for-Villager-Aggression-Config.patch diff --git a/Spigot-Server-Patches/0303-Here-s-Johnny.patch b/Spigot-Server-Patches/0302-Here-s-Johnny.patch similarity index 100% rename from Spigot-Server-Patches/0303-Here-s-Johnny.patch rename to Spigot-Server-Patches/0302-Here-s-Johnny.patch diff --git a/Spigot-Server-Patches/0304-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0303-Add-option-to-prevent-players-from-moving-into-unloa.patch similarity index 100% rename from Spigot-Server-Patches/0304-Add-option-to-prevent-players-from-moving-into-unloa.patch rename to Spigot-Server-Patches/0303-Add-option-to-prevent-players-from-moving-into-unloa.patch diff --git a/Spigot-Server-Patches/0305-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0304-Reset-players-airTicks-on-respawn.patch similarity index 100% rename from Spigot-Server-Patches/0305-Reset-players-airTicks-on-respawn.patch rename to Spigot-Server-Patches/0304-Reset-players-airTicks-on-respawn.patch diff --git a/Spigot-Server-Patches/0306-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0305-Don-t-sleep-after-profile-lookups-if-not-needed.patch similarity index 100% rename from Spigot-Server-Patches/0306-Don-t-sleep-after-profile-lookups-if-not-needed.patch rename to Spigot-Server-Patches/0305-Don-t-sleep-after-profile-lookups-if-not-needed.patch diff --git a/Spigot-Server-Patches/0307-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/Spigot-Server-Patches/0306-Improve-Server-Thread-Pool-and-Thread-Priorities.patch similarity index 100% rename from Spigot-Server-Patches/0307-Improve-Server-Thread-Pool-and-Thread-Priorities.patch rename to Spigot-Server-Patches/0306-Improve-Server-Thread-Pool-and-Thread-Priorities.patch diff --git a/Spigot-Server-Patches/0308-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0307-Optimize-World-Time-Updates.patch similarity index 100% rename from Spigot-Server-Patches/0308-Optimize-World-Time-Updates.patch rename to Spigot-Server-Patches/0307-Optimize-World-Time-Updates.patch diff --git a/Spigot-Server-Patches/0309-Restore-custom-InventoryHolder-support.patch b/Spigot-Server-Patches/0308-Restore-custom-InventoryHolder-support.patch similarity index 100% rename from Spigot-Server-Patches/0309-Restore-custom-InventoryHolder-support.patch rename to Spigot-Server-Patches/0308-Restore-custom-InventoryHolder-support.patch diff --git a/Spigot-Server-Patches/0310-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0309-Use-Vanilla-Minecart-Speeds.patch similarity index 100% rename from Spigot-Server-Patches/0310-Use-Vanilla-Minecart-Speeds.patch rename to Spigot-Server-Patches/0309-Use-Vanilla-Minecart-Speeds.patch diff --git a/Spigot-Server-Patches/0311-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0310-Fix-SpongeAbsortEvent-handling.patch similarity index 100% rename from Spigot-Server-Patches/0311-Fix-SpongeAbsortEvent-handling.patch rename to Spigot-Server-Patches/0310-Fix-SpongeAbsortEvent-handling.patch diff --git a/Spigot-Server-Patches/0312-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0311-Don-t-allow-digging-into-unloaded-chunks.patch similarity index 100% rename from Spigot-Server-Patches/0312-Don-t-allow-digging-into-unloaded-chunks.patch rename to Spigot-Server-Patches/0311-Don-t-allow-digging-into-unloaded-chunks.patch diff --git a/Spigot-Server-Patches/0313-Book-Size-Limits.patch b/Spigot-Server-Patches/0312-Book-Size-Limits.patch similarity index 100% rename from Spigot-Server-Patches/0313-Book-Size-Limits.patch rename to Spigot-Server-Patches/0312-Book-Size-Limits.patch diff --git a/Spigot-Server-Patches/0314-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0313-Make-the-default-permission-message-configurable.patch similarity index 100% rename from Spigot-Server-Patches/0314-Make-the-default-permission-message-configurable.patch rename to Spigot-Server-Patches/0313-Make-the-default-permission-message-configurable.patch diff --git a/Spigot-Server-Patches/0315-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0314-Prevent-rayTrace-from-loading-chunks.patch similarity index 100% rename from Spigot-Server-Patches/0315-Prevent-rayTrace-from-loading-chunks.patch rename to Spigot-Server-Patches/0314-Prevent-rayTrace-from-loading-chunks.patch diff --git a/Spigot-Server-Patches/0316-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0315-Handle-Large-Packets-disconnecting-client.patch similarity index 100% rename from Spigot-Server-Patches/0316-Handle-Large-Packets-disconnecting-client.patch rename to Spigot-Server-Patches/0315-Handle-Large-Packets-disconnecting-client.patch diff --git a/Spigot-Server-Patches/0317-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0316-force-entity-dismount-during-teleportation.patch similarity index 100% rename from Spigot-Server-Patches/0317-force-entity-dismount-during-teleportation.patch rename to Spigot-Server-Patches/0316-force-entity-dismount-during-teleportation.patch diff --git a/Spigot-Server-Patches/0318-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0317-Add-more-Zombie-API.patch similarity index 100% rename from Spigot-Server-Patches/0318-Add-more-Zombie-API.patch rename to Spigot-Server-Patches/0317-Add-more-Zombie-API.patch diff --git a/Spigot-Server-Patches/0319-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0318-Add-PlayerConnectionCloseEvent.patch similarity index 100% rename from Spigot-Server-Patches/0319-Add-PlayerConnectionCloseEvent.patch rename to Spigot-Server-Patches/0318-Add-PlayerConnectionCloseEvent.patch diff --git a/Spigot-Server-Patches/0320-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0319-Prevent-Enderman-from-loading-chunks.patch similarity index 100% rename from Spigot-Server-Patches/0320-Prevent-Enderman-from-loading-chunks.patch rename to Spigot-Server-Patches/0319-Prevent-Enderman-from-loading-chunks.patch diff --git a/Spigot-Server-Patches/0321-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0320-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 100% rename from Spigot-Server-Patches/0321-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to Spigot-Server-Patches/0320-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch diff --git a/Spigot-Server-Patches/0322-Fix-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0321-Fix-PlayerEditBookEvent.patch similarity index 100% rename from Spigot-Server-Patches/0322-Fix-PlayerEditBookEvent.patch rename to Spigot-Server-Patches/0321-Fix-PlayerEditBookEvent.patch diff --git a/Spigot-Server-Patches/0323-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0322-Workaround-for-vehicle-tracking-issue-on-disconnect.patch similarity index 100% rename from Spigot-Server-Patches/0323-Workaround-for-vehicle-tracking-issue-on-disconnect.patch rename to Spigot-Server-Patches/0322-Workaround-for-vehicle-tracking-issue-on-disconnect.patch diff --git a/Spigot-Server-Patches/0324-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/Spigot-Server-Patches/0323-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch similarity index 100% rename from Spigot-Server-Patches/0324-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch rename to Spigot-Server-Patches/0323-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch diff --git a/Spigot-Server-Patches/0325-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0324-Block-Entity-remove-from-being-called-on-Players.patch similarity index 100% rename from Spigot-Server-Patches/0325-Block-Entity-remove-from-being-called-on-Players.patch rename to Spigot-Server-Patches/0324-Block-Entity-remove-from-being-called-on-Players.patch diff --git a/Spigot-Server-Patches/0326-BlockDestroyEvent.patch b/Spigot-Server-Patches/0325-BlockDestroyEvent.patch similarity index 100% rename from Spigot-Server-Patches/0326-BlockDestroyEvent.patch rename to Spigot-Server-Patches/0325-BlockDestroyEvent.patch diff --git a/Spigot-Server-Patches/0327-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/Spigot-Server-Patches/0326-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch similarity index 100% rename from Spigot-Server-Patches/0327-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch rename to Spigot-Server-Patches/0326-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch diff --git a/Spigot-Server-Patches/0328-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0327-Fix-sign-edit-memory-leak.patch similarity index 100% rename from Spigot-Server-Patches/0328-Fix-sign-edit-memory-leak.patch rename to Spigot-Server-Patches/0327-Fix-sign-edit-memory-leak.patch diff --git a/Spigot-Server-Patches/0329-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0328-Limit-Client-Sign-length-more.patch similarity index 100% rename from Spigot-Server-Patches/0329-Limit-Client-Sign-length-more.patch rename to Spigot-Server-Patches/0328-Limit-Client-Sign-length-more.patch diff --git a/Spigot-Server-Patches/0330-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/Spigot-Server-Patches/0329-Don-t-check-ConvertSigns-boolean-every-sign-save.patch similarity index 100% rename from Spigot-Server-Patches/0330-Don-t-check-ConvertSigns-boolean-every-sign-save.patch rename to Spigot-Server-Patches/0329-Don-t-check-ConvertSigns-boolean-every-sign-save.patch diff --git a/Spigot-Server-Patches/0331-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/Spigot-Server-Patches/0330-Optimize-Network-Manager-and-add-advanced-packet-sup.patch similarity index 100% rename from Spigot-Server-Patches/0331-Optimize-Network-Manager-and-add-advanced-packet-sup.patch rename to Spigot-Server-Patches/0330-Optimize-Network-Manager-and-add-advanced-packet-sup.patch diff --git a/Spigot-Server-Patches/0332-Handle-Oversized-Tile-Entities-in-chunks.patch b/Spigot-Server-Patches/0331-Handle-Oversized-Tile-Entities-in-chunks.patch similarity index 100% rename from Spigot-Server-Patches/0332-Handle-Oversized-Tile-Entities-in-chunks.patch rename to Spigot-Server-Patches/0331-Handle-Oversized-Tile-Entities-in-chunks.patch diff --git a/Spigot-Server-Patches/0333-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0332-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch similarity index 100% rename from Spigot-Server-Patches/0333-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch rename to Spigot-Server-Patches/0332-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch diff --git a/Spigot-Server-Patches/0334-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0333-Set-Zombie-last-tick-at-start-of-drowning-process.patch similarity index 100% rename from Spigot-Server-Patches/0334-Set-Zombie-last-tick-at-start-of-drowning-process.patch rename to Spigot-Server-Patches/0333-Set-Zombie-last-tick-at-start-of-drowning-process.patch diff --git a/Spigot-Server-Patches/0335-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0334-Allow-Saving-of-Oversized-Chunks.patch similarity index 100% rename from Spigot-Server-Patches/0335-Allow-Saving-of-Oversized-Chunks.patch rename to Spigot-Server-Patches/0334-Allow-Saving-of-Oversized-Chunks.patch diff --git a/Spigot-Server-Patches/0336-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0335-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch similarity index 100% rename from Spigot-Server-Patches/0336-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch rename to Spigot-Server-Patches/0335-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch diff --git a/Spigot-Server-Patches/0337-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0336-Add-LivingEntity-getTargetEntity.patch similarity index 100% rename from Spigot-Server-Patches/0337-Add-LivingEntity-getTargetEntity.patch rename to Spigot-Server-Patches/0336-Add-LivingEntity-getTargetEntity.patch diff --git a/Spigot-Server-Patches/0338-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/Spigot-Server-Patches/0337-Use-proper-max-length-when-serialising-BungeeCord-te.patch similarity index 100% rename from Spigot-Server-Patches/0338-Use-proper-max-length-when-serialising-BungeeCord-te.patch rename to Spigot-Server-Patches/0337-Use-proper-max-length-when-serialising-BungeeCord-te.patch diff --git a/Spigot-Server-Patches/0339-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0338-Entity-getEntitySpawnReason.patch similarity index 100% rename from Spigot-Server-Patches/0339-Entity-getEntitySpawnReason.patch rename to Spigot-Server-Patches/0338-Entity-getEntitySpawnReason.patch diff --git a/Spigot-Server-Patches/0340-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0339-Update-entity-Metadata-for-all-tracked-players.patch similarity index 100% rename from Spigot-Server-Patches/0340-Update-entity-Metadata-for-all-tracked-players.patch rename to Spigot-Server-Patches/0339-Update-entity-Metadata-for-all-tracked-players.patch diff --git a/Spigot-Server-Patches/0341-Implement-PlayerPostRespawnEvent.patch b/Spigot-Server-Patches/0340-Implement-PlayerPostRespawnEvent.patch similarity index 100% rename from Spigot-Server-Patches/0341-Implement-PlayerPostRespawnEvent.patch rename to Spigot-Server-Patches/0340-Implement-PlayerPostRespawnEvent.patch diff --git a/Spigot-Server-Patches/0342-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/Spigot-Server-Patches/0341-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch similarity index 100% rename from Spigot-Server-Patches/0342-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch rename to Spigot-Server-Patches/0341-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch diff --git a/Spigot-Server-Patches/0343-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0342-Implement-getters-and-setters-for-EntityItem-owner-a.patch similarity index 100% rename from Spigot-Server-Patches/0343-Implement-getters-and-setters-for-EntityItem-owner-a.patch rename to Spigot-Server-Patches/0342-Implement-getters-and-setters-for-EntityItem-owner-a.patch diff --git a/Spigot-Server-Patches/0344-Server-Tick-Events.patch b/Spigot-Server-Patches/0343-Server-Tick-Events.patch similarity index 100% rename from Spigot-Server-Patches/0344-Server-Tick-Events.patch rename to Spigot-Server-Patches/0343-Server-Tick-Events.patch diff --git a/Spigot-Server-Patches/0345-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-Server-Patches/0344-PlayerDeathEvent-getItemsToKeep.patch similarity index 100% rename from Spigot-Server-Patches/0345-PlayerDeathEvent-getItemsToKeep.patch rename to Spigot-Server-Patches/0344-PlayerDeathEvent-getItemsToKeep.patch diff --git a/Spigot-Server-Patches/0346-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0345-Optimize-Captured-TileEntity-Lookup.patch similarity index 100% rename from Spigot-Server-Patches/0346-Optimize-Captured-TileEntity-Lookup.patch rename to Spigot-Server-Patches/0345-Optimize-Captured-TileEntity-Lookup.patch diff --git a/Spigot-Server-Patches/0347-Add-Heightmap-API.patch b/Spigot-Server-Patches/0346-Add-Heightmap-API.patch similarity index 100% rename from Spigot-Server-Patches/0347-Add-Heightmap-API.patch rename to Spigot-Server-Patches/0346-Add-Heightmap-API.patch diff --git a/Spigot-Server-Patches/0348-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0347-Mob-Spawner-API-Enhancements.patch similarity index 100% rename from Spigot-Server-Patches/0348-Mob-Spawner-API-Enhancements.patch rename to Spigot-Server-Patches/0347-Mob-Spawner-API-Enhancements.patch diff --git a/Spigot-Server-Patches/0349-Per-Player-View-Distance-API-placeholders.patch b/Spigot-Server-Patches/0348-Per-Player-View-Distance-API-placeholders.patch similarity index 100% rename from Spigot-Server-Patches/0349-Per-Player-View-Distance-API-placeholders.patch rename to Spigot-Server-Patches/0348-Per-Player-View-Distance-API-placeholders.patch diff --git a/Spigot-Server-Patches/0350-Fix-CB-call-to-changed-postToMainThread-method.patch b/Spigot-Server-Patches/0349-Fix-CB-call-to-changed-postToMainThread-method.patch similarity index 100% rename from Spigot-Server-Patches/0350-Fix-CB-call-to-changed-postToMainThread-method.patch rename to Spigot-Server-Patches/0349-Fix-CB-call-to-changed-postToMainThread-method.patch diff --git a/Spigot-Server-Patches/0351-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/Spigot-Server-Patches/0350-Fix-sounds-when-item-frames-are-modified-MC-123450.patch similarity index 100% rename from Spigot-Server-Patches/0351-Fix-sounds-when-item-frames-are-modified-MC-123450.patch rename to Spigot-Server-Patches/0350-Fix-sounds-when-item-frames-are-modified-MC-123450.patch diff --git a/Spigot-Server-Patches/0352-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/Spigot-Server-Patches/0351-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch similarity index 100% rename from Spigot-Server-Patches/0352-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch rename to Spigot-Server-Patches/0351-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch diff --git a/Spigot-Server-Patches/0353-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch b/Spigot-Server-Patches/0352-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch similarity index 100% rename from Spigot-Server-Patches/0353-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch rename to Spigot-Server-Patches/0352-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch diff --git a/Spigot-Server-Patches/0354-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0353-Duplicate-UUID-Resolve-Option.patch similarity index 100% rename from Spigot-Server-Patches/0354-Duplicate-UUID-Resolve-Option.patch rename to Spigot-Server-Patches/0353-Duplicate-UUID-Resolve-Option.patch diff --git a/Spigot-Server-Patches/0355-improve-CraftWorld-isChunkLoaded.patch b/Spigot-Server-Patches/0354-improve-CraftWorld-isChunkLoaded.patch similarity index 100% rename from Spigot-Server-Patches/0355-improve-CraftWorld-isChunkLoaded.patch rename to Spigot-Server-Patches/0354-improve-CraftWorld-isChunkLoaded.patch diff --git a/Spigot-Server-Patches/0356-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0355-Configurable-Keep-Spawn-Loaded-range-per-world.patch similarity index 100% rename from Spigot-Server-Patches/0356-Configurable-Keep-Spawn-Loaded-range-per-world.patch rename to Spigot-Server-Patches/0355-Configurable-Keep-Spawn-Loaded-range-per-world.patch diff --git a/Spigot-Server-Patches/0357-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch b/Spigot-Server-Patches/0356-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch similarity index 100% rename from Spigot-Server-Patches/0357-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch rename to Spigot-Server-Patches/0356-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch diff --git a/Spigot-Server-Patches/0358-ChunkMapDistance-CME.patch b/Spigot-Server-Patches/0357-ChunkMapDistance-CME.patch similarity index 97% rename from Spigot-Server-Patches/0358-ChunkMapDistance-CME.patch rename to Spigot-Server-Patches/0357-ChunkMapDistance-CME.patch index 83cd7c1ed..e55b1440c 100644 --- a/Spigot-Server-Patches/0358-ChunkMapDistance-CME.patch +++ b/Spigot-Server-Patches/0357-ChunkMapDistance-CME.patch @@ -70,7 +70,7 @@ index cf68c9105084d1823b5fc76b3f472a0f8ecd9568..d15bf949671c9a533573278d57337628 long j = it_unimi_dsi_fastutil_longs_long2bytemap_entry.getLongKey(); diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 49686f1f39417f8c7d6e0a58fb428fa34335fb0f..3b51e231551306e92cfe8fdf2e4e7777ab45d722 100644 +index 0f82376ac386ce4dfcf2799fbd92a32ca37095e5..32da5cfc19793afa2053c8e2a37fdcf17e43e6cd 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -20,6 +20,7 @@ public class PlayerChunk { diff --git a/Spigot-Server-Patches/0359-Implement-CraftBlockSoundGroup.patch b/Spigot-Server-Patches/0358-Implement-CraftBlockSoundGroup.patch similarity index 100% rename from Spigot-Server-Patches/0359-Implement-CraftBlockSoundGroup.patch rename to Spigot-Server-Patches/0358-Implement-CraftBlockSoundGroup.patch diff --git a/Spigot-Server-Patches/0360-Chunk-debug-command.patch b/Spigot-Server-Patches/0359-Chunk-debug-command.patch similarity index 99% rename from Spigot-Server-Patches/0360-Chunk-debug-command.patch rename to Spigot-Server-Patches/0359-Chunk-debug-command.patch index 52686ab0d..a72c580b6 100644 --- a/Spigot-Server-Patches/0360-Chunk-debug-command.patch +++ b/Spigot-Server-Patches/0359-Chunk-debug-command.patch @@ -399,7 +399,7 @@ index 816d55b17ea531bc2f25b92c003b127fe6e04112..2507bdf7bfa65f1bc728a46322d2a570 + } } diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 3b51e231551306e92cfe8fdf2e4e7777ab45d722..6538fc2874d6a24fdd69dee7224d69d0f7ca56ee 100644 +index 32da5cfc19793afa2053c8e2a37fdcf17e43e6cd..f2cd43a449b8a474dcfad735239d54678fce2d13 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -29,7 +29,7 @@ public class PlayerChunk { diff --git a/Spigot-Server-Patches/0361-Catch-exceptions-from-dispenser-entity-spawns.patch b/Spigot-Server-Patches/0360-Catch-exceptions-from-dispenser-entity-spawns.patch similarity index 100% rename from Spigot-Server-Patches/0361-Catch-exceptions-from-dispenser-entity-spawns.patch rename to Spigot-Server-Patches/0360-Catch-exceptions-from-dispenser-entity-spawns.patch diff --git a/Spigot-Server-Patches/0362-Fix-World-isChunkGenerated-calls.patch b/Spigot-Server-Patches/0361-Fix-World-isChunkGenerated-calls.patch similarity index 99% rename from Spigot-Server-Patches/0362-Fix-World-isChunkGenerated-calls.patch rename to Spigot-Server-Patches/0361-Fix-World-isChunkGenerated-calls.patch index 37678bf80..96712fe8d 100644 --- a/Spigot-Server-Patches/0362-Fix-World-isChunkGenerated-calls.patch +++ b/Spigot-Server-Patches/0361-Fix-World-isChunkGenerated-calls.patch @@ -108,7 +108,7 @@ index 2fde0b6ca8f38a998ac73b68be61fbfea9088cee..fa03834dacacf7ae6a326c88007256a2 @Nullable private PersistentStructureLegacy c; diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 6538fc2874d6a24fdd69dee7224d69d0f7ca56ee..3f125a57f43ea1678bd891ab7c1e6b892de55542 100644 +index f2cd43a449b8a474dcfad735239d54678fce2d13..94a6b5742b3ce2cac0f7567117fadeeb05e888ef 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -113,6 +113,19 @@ public class PlayerChunk { diff --git a/Spigot-Server-Patches/0363-Show-blockstate-location-if-we-failed-to-read-it.patch b/Spigot-Server-Patches/0362-Show-blockstate-location-if-we-failed-to-read-it.patch similarity index 100% rename from Spigot-Server-Patches/0363-Show-blockstate-location-if-we-failed-to-read-it.patch rename to Spigot-Server-Patches/0362-Show-blockstate-location-if-we-failed-to-read-it.patch diff --git a/Spigot-Server-Patches/0364-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch b/Spigot-Server-Patches/0363-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch similarity index 100% rename from Spigot-Server-Patches/0364-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch rename to Spigot-Server-Patches/0363-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch diff --git a/Spigot-Server-Patches/0365-incremental-chunk-saving.patch b/Spigot-Server-Patches/0364-incremental-chunk-saving.patch similarity index 99% rename from Spigot-Server-Patches/0365-incremental-chunk-saving.patch rename to Spigot-Server-Patches/0364-incremental-chunk-saving.patch index 1dc3c2c47..076b16c59 100644 --- a/Spigot-Server-Patches/0365-incremental-chunk-saving.patch +++ b/Spigot-Server-Patches/0364-incremental-chunk-saving.patch @@ -104,7 +104,7 @@ index a68adf340c4e0210bd9c3c75acb3d503775870ec..a8eb817fd02456aebc8a2681c8ff849a this.methodProfiler.enter("snooper"); if (((DedicatedServer) this).getDedicatedServerProperties().snooperEnabled && !this.snooper.d() && this.ticks > 100) { // Spigot diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 3f125a57f43ea1678bd891ab7c1e6b892de55542..f558fa255933cbe9f15a6fa8e2dcd456380e5620 100644 +index 94a6b5742b3ce2cac0f7567117fadeeb05e888ef..10dfdecba53cf16f9fae8a2be1144ef8cda1006d 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -42,6 +42,9 @@ public class PlayerChunk { diff --git a/Spigot-Server-Patches/0366-Anti-Xray.patch b/Spigot-Server-Patches/0365-Anti-Xray.patch similarity index 100% rename from Spigot-Server-Patches/0366-Anti-Xray.patch rename to Spigot-Server-Patches/0365-Anti-Xray.patch diff --git a/Spigot-Server-Patches/0367-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/Spigot-Server-Patches/0366-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch similarity index 100% rename from Spigot-Server-Patches/0367-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch rename to Spigot-Server-Patches/0366-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch diff --git a/Spigot-Server-Patches/0368-Configurable-projectile-relative-velocity.patch b/Spigot-Server-Patches/0367-Configurable-projectile-relative-velocity.patch similarity index 100% rename from Spigot-Server-Patches/0368-Configurable-projectile-relative-velocity.patch rename to Spigot-Server-Patches/0367-Configurable-projectile-relative-velocity.patch diff --git a/Spigot-Server-Patches/0369-Mark-entities-as-being-ticked-when-notifying-navigat.patch b/Spigot-Server-Patches/0368-Mark-entities-as-being-ticked-when-notifying-navigat.patch similarity index 100% rename from Spigot-Server-Patches/0369-Mark-entities-as-being-ticked-when-notifying-navigat.patch rename to Spigot-Server-Patches/0368-Mark-entities-as-being-ticked-when-notifying-navigat.patch diff --git a/Spigot-Server-Patches/0370-offset-item-frame-ticking.patch b/Spigot-Server-Patches/0369-offset-item-frame-ticking.patch similarity index 100% rename from Spigot-Server-Patches/0370-offset-item-frame-ticking.patch rename to Spigot-Server-Patches/0369-offset-item-frame-ticking.patch diff --git a/Spigot-Server-Patches/0371-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0370-Avoid-hopper-searches-if-there-are-no-items.patch similarity index 100% rename from Spigot-Server-Patches/0371-Avoid-hopper-searches-if-there-are-no-items.patch rename to Spigot-Server-Patches/0370-Avoid-hopper-searches-if-there-are-no-items.patch diff --git a/Spigot-Server-Patches/0372-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0371-Asynchronous-chunk-IO-and-loading.patch similarity index 99% rename from Spigot-Server-Patches/0372-Asynchronous-chunk-IO-and-loading.patch rename to Spigot-Server-Patches/0371-Asynchronous-chunk-IO-and-loading.patch index 999a732af..6dbd40002 100644 --- a/Spigot-Server-Patches/0372-Asynchronous-chunk-IO-and-loading.patch +++ b/Spigot-Server-Patches/0371-Asynchronous-chunk-IO-and-loading.patch @@ -3010,7 +3010,7 @@ index 4c52c57c02571353f71772e3650932f314da62ca..71daa0cb08d69c16bded510d1a490534 @Override diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index f558fa255933cbe9f15a6fa8e2dcd456380e5620..12f91b5a5f740d661f8422b0ba870e3454c26467 100644 +index 10dfdecba53cf16f9fae8a2be1144ef8cda1006d..301836c7d465afe82737b0aa5ad68bf51122ff6b 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -129,6 +129,18 @@ public class PlayerChunk { diff --git a/Spigot-Server-Patches/0373-Use-getChunkIfLoadedImmediately-in-places.patch b/Spigot-Server-Patches/0372-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from Spigot-Server-Patches/0373-Use-getChunkIfLoadedImmediately-in-places.patch rename to Spigot-Server-Patches/0372-Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/Spigot-Server-Patches/0374-Reduce-sync-loads.patch b/Spigot-Server-Patches/0373-Reduce-sync-loads.patch similarity index 100% rename from Spigot-Server-Patches/0374-Reduce-sync-loads.patch rename to Spigot-Server-Patches/0373-Reduce-sync-loads.patch diff --git a/Spigot-Server-Patches/0375-Implement-alternative-item-despawn-rate.patch b/Spigot-Server-Patches/0374-Implement-alternative-item-despawn-rate.patch similarity index 100% rename from Spigot-Server-Patches/0375-Implement-alternative-item-despawn-rate.patch rename to Spigot-Server-Patches/0374-Implement-alternative-item-despawn-rate.patch diff --git a/Spigot-Server-Patches/0376-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/Spigot-Server-Patches/0375-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch similarity index 100% rename from Spigot-Server-Patches/0376-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch rename to Spigot-Server-Patches/0375-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch diff --git a/Spigot-Server-Patches/0377-Fix-MC-158900.patch b/Spigot-Server-Patches/0376-Fix-MC-158900.patch similarity index 100% rename from Spigot-Server-Patches/0377-Fix-MC-158900.patch rename to Spigot-Server-Patches/0376-Fix-MC-158900.patch diff --git a/Spigot-Server-Patches/0378-implement-optional-per-player-mob-spawns.patch b/Spigot-Server-Patches/0377-implement-optional-per-player-mob-spawns.patch similarity index 100% rename from Spigot-Server-Patches/0378-implement-optional-per-player-mob-spawns.patch rename to Spigot-Server-Patches/0377-implement-optional-per-player-mob-spawns.patch diff --git a/Spigot-Server-Patches/0379-Prevent-consuming-the-wrong-itemstack.patch b/Spigot-Server-Patches/0378-Prevent-consuming-the-wrong-itemstack.patch similarity index 100% rename from Spigot-Server-Patches/0379-Prevent-consuming-the-wrong-itemstack.patch rename to Spigot-Server-Patches/0378-Prevent-consuming-the-wrong-itemstack.patch diff --git a/Spigot-Server-Patches/0380-Fix-nether-portal-creation.patch b/Spigot-Server-Patches/0379-Fix-nether-portal-creation.patch similarity index 100% rename from Spigot-Server-Patches/0380-Fix-nether-portal-creation.patch rename to Spigot-Server-Patches/0379-Fix-nether-portal-creation.patch diff --git a/Spigot-Server-Patches/0381-Generator-Settings.patch b/Spigot-Server-Patches/0380-Generator-Settings.patch similarity index 100% rename from Spigot-Server-Patches/0381-Generator-Settings.patch rename to Spigot-Server-Patches/0380-Generator-Settings.patch diff --git a/Spigot-Server-Patches/0382-Fix-MC-161754.patch b/Spigot-Server-Patches/0381-Fix-MC-161754.patch similarity index 100% rename from Spigot-Server-Patches/0382-Fix-MC-161754.patch rename to Spigot-Server-Patches/0381-Fix-MC-161754.patch diff --git a/Spigot-Server-Patches/0383-Performance-improvement-for-Chunk.getEntities.patch b/Spigot-Server-Patches/0382-Performance-improvement-for-Chunk.getEntities.patch similarity index 100% rename from Spigot-Server-Patches/0383-Performance-improvement-for-Chunk.getEntities.patch rename to Spigot-Server-Patches/0382-Performance-improvement-for-Chunk.getEntities.patch diff --git a/Spigot-Server-Patches/0384-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch b/Spigot-Server-Patches/0383-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch similarity index 100% rename from Spigot-Server-Patches/0384-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch rename to Spigot-Server-Patches/0383-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch diff --git a/Spigot-Server-Patches/0385-Expose-the-internal-current-tick.patch b/Spigot-Server-Patches/0384-Expose-the-internal-current-tick.patch similarity index 100% rename from Spigot-Server-Patches/0385-Expose-the-internal-current-tick.patch rename to Spigot-Server-Patches/0384-Expose-the-internal-current-tick.patch diff --git a/Spigot-Server-Patches/0386-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/Spigot-Server-Patches/0385-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch similarity index 100% rename from Spigot-Server-Patches/0386-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch rename to Spigot-Server-Patches/0385-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch diff --git a/Spigot-Server-Patches/0387-Add-option-to-disable-pillager-patrols.patch b/Spigot-Server-Patches/0386-Add-option-to-disable-pillager-patrols.patch similarity index 100% rename from Spigot-Server-Patches/0387-Add-option-to-disable-pillager-patrols.patch rename to Spigot-Server-Patches/0386-Add-option-to-disable-pillager-patrols.patch diff --git a/Spigot-Server-Patches/0388-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/Spigot-Server-Patches/0387-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch similarity index 100% rename from Spigot-Server-Patches/0388-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch rename to Spigot-Server-Patches/0387-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch diff --git a/Spigot-Server-Patches/0389-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0388-PlayerLaunchProjectileEvent.patch similarity index 100% rename from Spigot-Server-Patches/0389-PlayerLaunchProjectileEvent.patch rename to Spigot-Server-Patches/0388-PlayerLaunchProjectileEvent.patch diff --git a/Spigot-Server-Patches/0390-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/Spigot-Server-Patches/0389-Add-CraftMagicNumbers.isSupportedApiVersion.patch similarity index 100% rename from Spigot-Server-Patches/0390-Add-CraftMagicNumbers.isSupportedApiVersion.patch rename to Spigot-Server-Patches/0389-Add-CraftMagicNumbers.isSupportedApiVersion.patch diff --git a/Spigot-Server-Patches/0391-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/Spigot-Server-Patches/0390-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch similarity index 100% rename from Spigot-Server-Patches/0391-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch rename to Spigot-Server-Patches/0390-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch diff --git a/Spigot-Server-Patches/0392-MC-145656-Fix-Follow-Range-Initial-Target.patch b/Spigot-Server-Patches/0391-MC-145656-Fix-Follow-Range-Initial-Target.patch similarity index 100% rename from Spigot-Server-Patches/0392-MC-145656-Fix-Follow-Range-Initial-Target.patch rename to Spigot-Server-Patches/0391-MC-145656-Fix-Follow-Range-Initial-Target.patch diff --git a/Spigot-Server-Patches/0393-Optimize-Hoppers.patch b/Spigot-Server-Patches/0392-Optimize-Hoppers.patch similarity index 100% rename from Spigot-Server-Patches/0393-Optimize-Hoppers.patch rename to Spigot-Server-Patches/0392-Optimize-Hoppers.patch diff --git a/Spigot-Server-Patches/0394-PlayerDeathEvent-shouldDropExperience.patch b/Spigot-Server-Patches/0393-PlayerDeathEvent-shouldDropExperience.patch similarity index 100% rename from Spigot-Server-Patches/0394-PlayerDeathEvent-shouldDropExperience.patch rename to Spigot-Server-Patches/0393-PlayerDeathEvent-shouldDropExperience.patch diff --git a/Spigot-Server-Patches/0395-Prevent-bees-loading-chunks-checking-hive-position.patch b/Spigot-Server-Patches/0394-Prevent-bees-loading-chunks-checking-hive-position.patch similarity index 100% rename from Spigot-Server-Patches/0395-Prevent-bees-loading-chunks-checking-hive-position.patch rename to Spigot-Server-Patches/0394-Prevent-bees-loading-chunks-checking-hive-position.patch diff --git a/Spigot-Server-Patches/0396-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0395-Don-t-load-Chunks-from-Hoppers-and-other-things.patch similarity index 100% rename from Spigot-Server-Patches/0396-Don-t-load-Chunks-from-Hoppers-and-other-things.patch rename to Spigot-Server-Patches/0395-Don-t-load-Chunks-from-Hoppers-and-other-things.patch diff --git a/Spigot-Server-Patches/0397-Guard-against-serializing-mismatching-chunk-coordina.patch b/Spigot-Server-Patches/0396-Guard-against-serializing-mismatching-chunk-coordina.patch similarity index 100% rename from Spigot-Server-Patches/0397-Guard-against-serializing-mismatching-chunk-coordina.patch rename to Spigot-Server-Patches/0396-Guard-against-serializing-mismatching-chunk-coordina.patch diff --git a/Spigot-Server-Patches/0398-Optimise-IEntityAccess-getPlayerByUUID.patch b/Spigot-Server-Patches/0397-Optimise-IEntityAccess-getPlayerByUUID.patch similarity index 100% rename from Spigot-Server-Patches/0398-Optimise-IEntityAccess-getPlayerByUUID.patch rename to Spigot-Server-Patches/0397-Optimise-IEntityAccess-getPlayerByUUID.patch diff --git a/Spigot-Server-Patches/0399-Fix-items-not-falling-correctly.patch b/Spigot-Server-Patches/0398-Fix-items-not-falling-correctly.patch similarity index 100% rename from Spigot-Server-Patches/0399-Fix-items-not-falling-correctly.patch rename to Spigot-Server-Patches/0398-Fix-items-not-falling-correctly.patch diff --git a/Spigot-Server-Patches/0400-Lag-compensate-eating.patch b/Spigot-Server-Patches/0399-Lag-compensate-eating.patch similarity index 100% rename from Spigot-Server-Patches/0400-Lag-compensate-eating.patch rename to Spigot-Server-Patches/0399-Lag-compensate-eating.patch diff --git a/Spigot-Server-Patches/0401-Optimize-call-to-getFluid-for-explosions.patch b/Spigot-Server-Patches/0400-Optimize-call-to-getFluid-for-explosions.patch similarity index 100% rename from Spigot-Server-Patches/0401-Optimize-call-to-getFluid-for-explosions.patch rename to Spigot-Server-Patches/0400-Optimize-call-to-getFluid-for-explosions.patch diff --git a/Spigot-Server-Patches/0402-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/Spigot-Server-Patches/0401-Fix-last-firework-in-stack-not-having-effects-when-d.patch similarity index 100% rename from Spigot-Server-Patches/0402-Fix-last-firework-in-stack-not-having-effects-when-d.patch rename to Spigot-Server-Patches/0401-Fix-last-firework-in-stack-not-having-effects-when-d.patch diff --git a/Spigot-Server-Patches/0403-Add-effect-to-block-break-naturally.patch b/Spigot-Server-Patches/0402-Add-effect-to-block-break-naturally.patch similarity index 100% rename from Spigot-Server-Patches/0403-Add-effect-to-block-break-naturally.patch rename to Spigot-Server-Patches/0402-Add-effect-to-block-break-naturally.patch diff --git a/Spigot-Server-Patches/0404-Tracking-Range-Improvements.patch b/Spigot-Server-Patches/0403-Tracking-Range-Improvements.patch similarity index 100% rename from Spigot-Server-Patches/0404-Tracking-Range-Improvements.patch rename to Spigot-Server-Patches/0403-Tracking-Range-Improvements.patch diff --git a/Spigot-Server-Patches/0405-Entity-Activation-Range-2.0.patch b/Spigot-Server-Patches/0404-Entity-Activation-Range-2.0.patch similarity index 99% rename from Spigot-Server-Patches/0405-Entity-Activation-Range-2.0.patch rename to Spigot-Server-Patches/0404-Entity-Activation-Range-2.0.patch index 592267d2e..9173db1cd 100644 --- a/Spigot-Server-Patches/0405-Entity-Activation-Range-2.0.patch +++ b/Spigot-Server-Patches/0404-Entity-Activation-Range-2.0.patch @@ -334,7 +334,7 @@ index 182cd7e9110408fff9909ef362d368d055a2b167..f3df10587e652d3a26d15deb09304b97 return this.c; } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 303d82bf4ba21b4a74805750650d07778b30d875..77c611a5366943031624b07e64d069f3f1d2e49a 100644 +index 2477912af13545cdd2b2ec397cbe7c93d895be9b..768a05cd8d3ce025feca12593bb0844de1f481f7 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -82,6 +82,12 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0406-Fix-items-vanishing-through-end-portal.patch b/Spigot-Server-Patches/0405-Fix-items-vanishing-through-end-portal.patch similarity index 100% rename from Spigot-Server-Patches/0406-Fix-items-vanishing-through-end-portal.patch rename to Spigot-Server-Patches/0405-Fix-items-vanishing-through-end-portal.patch diff --git a/Spigot-Server-Patches/0407-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/Spigot-Server-Patches/0406-Bees-get-gravity-in-void.-Fixes-MC-167279.patch similarity index 100% rename from Spigot-Server-Patches/0407-Bees-get-gravity-in-void.-Fixes-MC-167279.patch rename to Spigot-Server-Patches/0406-Bees-get-gravity-in-void.-Fixes-MC-167279.patch diff --git a/Spigot-Server-Patches/0408-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/Spigot-Server-Patches/0407-Optimise-getChunkAt-calls-for-loaded-chunks.patch similarity index 100% rename from Spigot-Server-Patches/0408-Optimise-getChunkAt-calls-for-loaded-chunks.patch rename to Spigot-Server-Patches/0407-Optimise-getChunkAt-calls-for-loaded-chunks.patch diff --git a/Spigot-Server-Patches/0409-Allow-overriding-the-java-version-check.patch b/Spigot-Server-Patches/0408-Allow-overriding-the-java-version-check.patch similarity index 90% rename from Spigot-Server-Patches/0409-Allow-overriding-the-java-version-check.patch rename to Spigot-Server-Patches/0408-Allow-overriding-the-java-version-check.patch index c18f900cf..56bfb800e 100644 --- a/Spigot-Server-Patches/0409-Allow-overriding-the-java-version-check.patch +++ b/Spigot-Server-Patches/0408-Allow-overriding-the-java-version-check.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Allow overriding the java version check -DPaper.IgnoreJavaVersion=true diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index ac60ed4396b67838ded7c775ca1115eba40d318b..0176b72d8a1b54e57a462272dac16d3416fa7cd8 100644 +index ba949818493369c02d06d33d77a992c8ee8f457f..2befc5904249abb0461bac3305186de728d5b81d 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -175,7 +175,7 @@ public class Main { diff --git a/Spigot-Server-Patches/0410-Add-ThrownEggHatchEvent.patch b/Spigot-Server-Patches/0409-Add-ThrownEggHatchEvent.patch similarity index 100% rename from Spigot-Server-Patches/0410-Add-ThrownEggHatchEvent.patch rename to Spigot-Server-Patches/0409-Add-ThrownEggHatchEvent.patch diff --git a/Spigot-Server-Patches/0411-Optimise-random-block-ticking.patch b/Spigot-Server-Patches/0410-Optimise-random-block-ticking.patch similarity index 100% rename from Spigot-Server-Patches/0411-Optimise-random-block-ticking.patch rename to Spigot-Server-Patches/0410-Optimise-random-block-ticking.patch diff --git a/Spigot-Server-Patches/0412-Entity-Jump-API.patch b/Spigot-Server-Patches/0411-Entity-Jump-API.patch similarity index 100% rename from Spigot-Server-Patches/0412-Entity-Jump-API.patch rename to Spigot-Server-Patches/0411-Entity-Jump-API.patch diff --git a/Spigot-Server-Patches/0413-Add-option-to-nerf-pigmen-from-nether-portals.patch b/Spigot-Server-Patches/0412-Add-option-to-nerf-pigmen-from-nether-portals.patch similarity index 100% rename from Spigot-Server-Patches/0413-Add-option-to-nerf-pigmen-from-nether-portals.patch rename to Spigot-Server-Patches/0412-Add-option-to-nerf-pigmen-from-nether-portals.patch diff --git a/Spigot-Server-Patches/0414-Make-the-GUI-graph-fancier.patch b/Spigot-Server-Patches/0413-Make-the-GUI-graph-fancier.patch similarity index 100% rename from Spigot-Server-Patches/0414-Make-the-GUI-graph-fancier.patch rename to Spigot-Server-Patches/0413-Make-the-GUI-graph-fancier.patch diff --git a/Spigot-Server-Patches/0415-add-hand-to-BlockMultiPlaceEvent.patch b/Spigot-Server-Patches/0414-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from Spigot-Server-Patches/0415-add-hand-to-BlockMultiPlaceEvent.patch rename to Spigot-Server-Patches/0414-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/Spigot-Server-Patches/0416-Prevent-teleporting-dead-entities.patch b/Spigot-Server-Patches/0415-Prevent-teleporting-dead-entities.patch similarity index 100% rename from Spigot-Server-Patches/0416-Prevent-teleporting-dead-entities.patch rename to Spigot-Server-Patches/0415-Prevent-teleporting-dead-entities.patch diff --git a/Spigot-Server-Patches/0417-Validate-tripwire-hook-placement-before-update.patch b/Spigot-Server-Patches/0416-Validate-tripwire-hook-placement-before-update.patch similarity index 100% rename from Spigot-Server-Patches/0417-Validate-tripwire-hook-placement-before-update.patch rename to Spigot-Server-Patches/0416-Validate-tripwire-hook-placement-before-update.patch diff --git a/Spigot-Server-Patches/0418-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/Spigot-Server-Patches/0417-Add-option-to-allow-iron-golems-to-spawn-in-air.patch similarity index 100% rename from Spigot-Server-Patches/0418-Add-option-to-allow-iron-golems-to-spawn-in-air.patch rename to Spigot-Server-Patches/0417-Add-option-to-allow-iron-golems-to-spawn-in-air.patch diff --git a/Spigot-Server-Patches/0419-Configurable-chance-of-villager-zombie-infection.patch b/Spigot-Server-Patches/0418-Configurable-chance-of-villager-zombie-infection.patch similarity index 100% rename from Spigot-Server-Patches/0419-Configurable-chance-of-villager-zombie-infection.patch rename to Spigot-Server-Patches/0418-Configurable-chance-of-villager-zombie-infection.patch diff --git a/Spigot-Server-Patches/0420-Optimise-Chunk-getFluid.patch b/Spigot-Server-Patches/0419-Optimise-Chunk-getFluid.patch similarity index 100% rename from Spigot-Server-Patches/0420-Optimise-Chunk-getFluid.patch rename to Spigot-Server-Patches/0419-Optimise-Chunk-getFluid.patch diff --git a/Spigot-Server-Patches/0421-Optimise-TickListServer-by-rewriting-it.patch b/Spigot-Server-Patches/0420-Optimise-TickListServer-by-rewriting-it.patch similarity index 99% rename from Spigot-Server-Patches/0421-Optimise-TickListServer-by-rewriting-it.patch rename to Spigot-Server-Patches/0420-Optimise-TickListServer-by-rewriting-it.patch index 858d772f8..1a0638be3 100644 --- a/Spigot-Server-Patches/0421-Optimise-TickListServer-by-rewriting-it.patch +++ b/Spigot-Server-Patches/0420-Optimise-TickListServer-by-rewriting-it.patch @@ -990,7 +990,7 @@ index 33cfeabdee03195a294f303f28044a313cb1c4ed..2287e47d1b891135a5f2579ec324c705 public String toString() { return this.e + ": " + this.a + ", " + this.b + ", " + this.c + ", " + this.f; diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 12f91b5a5f740d661f8422b0ba870e3454c26467..844f5b204b0f8c4474b4b9ffdc9cb7f3564b1336 100644 +index 301836c7d465afe82737b0aa5ad68bf51122ff6b..054a3156f7b7b7077422b4951adf7bf45df42bfc 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -467,7 +467,9 @@ public class PlayerChunk { diff --git a/Spigot-Server-Patches/0422-Pillager-patrol-spawn-settings-and-per-player-option.patch b/Spigot-Server-Patches/0421-Pillager-patrol-spawn-settings-and-per-player-option.patch similarity index 100% rename from Spigot-Server-Patches/0422-Pillager-patrol-spawn-settings-and-per-player-option.patch rename to Spigot-Server-Patches/0421-Pillager-patrol-spawn-settings-and-per-player-option.patch diff --git a/Spigot-Server-Patches/0423-Ensure-Entity-is-never-double-registered.patch b/Spigot-Server-Patches/0422-Ensure-Entity-is-never-double-registered.patch similarity index 97% rename from Spigot-Server-Patches/0423-Ensure-Entity-is-never-double-registered.patch rename to Spigot-Server-Patches/0422-Ensure-Entity-is-never-double-registered.patch index d4ea3f245..b1d327a67 100644 --- a/Spigot-Server-Patches/0423-Ensure-Entity-is-never-double-registered.patch +++ b/Spigot-Server-Patches/0422-Ensure-Entity-is-never-double-registered.patch @@ -11,7 +11,7 @@ Vs behavior of non ticking of just overwriting state. We will now simply log a warning when this happens instead of crashing the server. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 28c3a8e5c09c3998e7e0d7ac9244dc8abcc6d69d..3467603fe784aad56acfb2879783aeb89cef1abc 100644 +index eaffc6ee2d677dd69f81a2822049a06ec0325149..ca85df9d05e763586a0cf269e997fbf629c44c98 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -59,6 +59,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0424-Fix-unregistering-entities-from-unloading-chunks.patch b/Spigot-Server-Patches/0423-Fix-unregistering-entities-from-unloading-chunks.patch similarity index 100% rename from Spigot-Server-Patches/0424-Fix-unregistering-entities-from-unloading-chunks.patch rename to Spigot-Server-Patches/0423-Fix-unregistering-entities-from-unloading-chunks.patch diff --git a/Spigot-Server-Patches/0425-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/Spigot-Server-Patches/0424-Remote-Connections-shouldn-t-hold-up-shutdown.patch similarity index 100% rename from Spigot-Server-Patches/0425-Remote-Connections-shouldn-t-hold-up-shutdown.patch rename to Spigot-Server-Patches/0424-Remote-Connections-shouldn-t-hold-up-shutdown.patch diff --git a/Spigot-Server-Patches/0426-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/Spigot-Server-Patches/0425-Do-not-allow-bees-to-load-chunks-for-beehives.patch similarity index 100% rename from Spigot-Server-Patches/0426-Do-not-allow-bees-to-load-chunks-for-beehives.patch rename to Spigot-Server-Patches/0425-Do-not-allow-bees-to-load-chunks-for-beehives.patch diff --git a/Spigot-Server-Patches/0427-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/Spigot-Server-Patches/0426-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch similarity index 100% rename from Spigot-Server-Patches/0427-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch rename to Spigot-Server-Patches/0426-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch diff --git a/Spigot-Server-Patches/0428-Optimize-Collision-to-not-load-chunks.patch b/Spigot-Server-Patches/0427-Optimize-Collision-to-not-load-chunks.patch similarity index 98% rename from Spigot-Server-Patches/0428-Optimize-Collision-to-not-load-chunks.patch rename to Spigot-Server-Patches/0427-Optimize-Collision-to-not-load-chunks.patch index 675d8c3bf..1d31a1f09 100644 --- a/Spigot-Server-Patches/0428-Optimize-Collision-to-not-load-chunks.patch +++ b/Spigot-Server-Patches/0427-Optimize-Collision-to-not-load-chunks.patch @@ -14,7 +14,7 @@ movement will load only the chunk the player enters anyways and avoids loading massive amounts of surrounding chunks due to large AABB lookups. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 3467603fe784aad56acfb2879783aeb89cef1abc..36c5d5cf3d18dffcd1a87a7b88b99857a39cd9f9 100644 +index ca85df9d05e763586a0cf269e997fbf629c44c98..da9f50f0e14a3294e63a2b45e1e4521187f8b4cc 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -80,6 +80,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0429-Don-t-tick-dead-players.patch b/Spigot-Server-Patches/0428-Don-t-tick-dead-players.patch similarity index 100% rename from Spigot-Server-Patches/0429-Don-t-tick-dead-players.patch rename to Spigot-Server-Patches/0428-Don-t-tick-dead-players.patch diff --git a/Spigot-Server-Patches/0430-Dead-Player-s-shouldn-t-be-able-to-move.patch b/Spigot-Server-Patches/0429-Dead-Player-s-shouldn-t-be-able-to-move.patch similarity index 100% rename from Spigot-Server-Patches/0430-Dead-Player-s-shouldn-t-be-able-to-move.patch rename to Spigot-Server-Patches/0429-Dead-Player-s-shouldn-t-be-able-to-move.patch diff --git a/Spigot-Server-Patches/0431-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch b/Spigot-Server-Patches/0430-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch similarity index 100% rename from Spigot-Server-Patches/0431-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch rename to Spigot-Server-Patches/0430-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch diff --git a/Spigot-Server-Patches/0432-Increase-Light-Queue-Size.patch b/Spigot-Server-Patches/0431-Increase-Light-Queue-Size.patch similarity index 100% rename from Spigot-Server-Patches/0432-Increase-Light-Queue-Size.patch rename to Spigot-Server-Patches/0431-Increase-Light-Queue-Size.patch diff --git a/Spigot-Server-Patches/0433-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch b/Spigot-Server-Patches/0432-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch similarity index 100% rename from Spigot-Server-Patches/0433-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch rename to Spigot-Server-Patches/0432-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch diff --git a/Spigot-Server-Patches/0434-Don-t-move-existing-players-to-world-spawn.patch b/Spigot-Server-Patches/0433-Don-t-move-existing-players-to-world-spawn.patch similarity index 100% rename from Spigot-Server-Patches/0434-Don-t-move-existing-players-to-world-spawn.patch rename to Spigot-Server-Patches/0433-Don-t-move-existing-players-to-world-spawn.patch diff --git a/Spigot-Server-Patches/0435-Add-tick-times-API-and-mspt-command.patch b/Spigot-Server-Patches/0434-Add-tick-times-API-and-mspt-command.patch similarity index 100% rename from Spigot-Server-Patches/0435-Add-tick-times-API-and-mspt-command.patch rename to Spigot-Server-Patches/0434-Add-tick-times-API-and-mspt-command.patch diff --git a/Spigot-Server-Patches/0436-Expose-MinecraftServer-isRunning.patch b/Spigot-Server-Patches/0435-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from Spigot-Server-Patches/0436-Expose-MinecraftServer-isRunning.patch rename to Spigot-Server-Patches/0435-Expose-MinecraftServer-isRunning.patch diff --git a/Spigot-Server-Patches/0437-Add-Raw-Byte-ItemStack-Serialization.patch b/Spigot-Server-Patches/0436-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from Spigot-Server-Patches/0437-Add-Raw-Byte-ItemStack-Serialization.patch rename to Spigot-Server-Patches/0436-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/Spigot-Server-Patches/0438-Remove-streams-from-Mob-AI-System.patch b/Spigot-Server-Patches/0437-Remove-streams-from-Mob-AI-System.patch similarity index 100% rename from Spigot-Server-Patches/0438-Remove-streams-from-Mob-AI-System.patch rename to Spigot-Server-Patches/0437-Remove-streams-from-Mob-AI-System.patch diff --git a/Spigot-Server-Patches/0439-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch b/Spigot-Server-Patches/0438-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch similarity index 100% rename from Spigot-Server-Patches/0439-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch rename to Spigot-Server-Patches/0438-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch diff --git a/Spigot-Server-Patches/0440-Async-command-map-building.patch b/Spigot-Server-Patches/0439-Async-command-map-building.patch similarity index 100% rename from Spigot-Server-Patches/0440-Async-command-map-building.patch rename to Spigot-Server-Patches/0439-Async-command-map-building.patch diff --git a/Spigot-Server-Patches/0441-Improved-Watchdog-Support.patch b/Spigot-Server-Patches/0440-Improved-Watchdog-Support.patch similarity index 99% rename from Spigot-Server-Patches/0441-Improved-Watchdog-Support.patch rename to Spigot-Server-Patches/0440-Improved-Watchdog-Support.patch index 1c8e40145..8fedd459f 100644 --- a/Spigot-Server-Patches/0441-Improved-Watchdog-Support.patch +++ b/Spigot-Server-Patches/0440-Improved-Watchdog-Support.patch @@ -337,7 +337,7 @@ index b86eb9afb170b8a827ce3f6c85de08c75f260b14..dec85293caeaf247ef58975f1f7dfd2b @Override diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 0176b72d8a1b54e57a462272dac16d3416fa7cd8..b9e14473ed7e1e07f14246f06ef4070a90f03f3f 100644 +index 2befc5904249abb0461bac3305186de728d5b81d..99efa63857dd3fb0a7d488937519ac225e379913 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -150,6 +150,37 @@ public class Main { diff --git a/Spigot-Server-Patches/0442-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0441-Optimize-Pathfinding.patch similarity index 100% rename from Spigot-Server-Patches/0442-Optimize-Pathfinding.patch rename to Spigot-Server-Patches/0441-Optimize-Pathfinding.patch diff --git a/Spigot-Server-Patches/0443-Reduce-Either-Optional-allocation.patch b/Spigot-Server-Patches/0442-Reduce-Either-Optional-allocation.patch similarity index 100% rename from Spigot-Server-Patches/0443-Reduce-Either-Optional-allocation.patch rename to Spigot-Server-Patches/0442-Reduce-Either-Optional-allocation.patch diff --git a/Spigot-Server-Patches/0444-Remove-streams-from-PairedQueue.patch b/Spigot-Server-Patches/0443-Remove-streams-from-PairedQueue.patch similarity index 100% rename from Spigot-Server-Patches/0444-Remove-streams-from-PairedQueue.patch rename to Spigot-Server-Patches/0443-Remove-streams-from-PairedQueue.patch diff --git a/Spigot-Server-Patches/0445-Reduce-memory-footprint-of-NBTTagCompound.patch b/Spigot-Server-Patches/0444-Reduce-memory-footprint-of-NBTTagCompound.patch similarity index 100% rename from Spigot-Server-Patches/0445-Reduce-memory-footprint-of-NBTTagCompound.patch rename to Spigot-Server-Patches/0444-Reduce-memory-footprint-of-NBTTagCompound.patch diff --git a/Spigot-Server-Patches/0446-Prevent-opening-inventories-when-frozen.patch b/Spigot-Server-Patches/0445-Prevent-opening-inventories-when-frozen.patch similarity index 100% rename from Spigot-Server-Patches/0446-Prevent-opening-inventories-when-frozen.patch rename to Spigot-Server-Patches/0445-Prevent-opening-inventories-when-frozen.patch diff --git a/Spigot-Server-Patches/0447-Optimise-ArraySetSorted-removeIf.patch b/Spigot-Server-Patches/0446-Optimise-ArraySetSorted-removeIf.patch similarity index 100% rename from Spigot-Server-Patches/0447-Optimise-ArraySetSorted-removeIf.patch rename to Spigot-Server-Patches/0446-Optimise-ArraySetSorted-removeIf.patch diff --git a/Spigot-Server-Patches/0448-Don-t-run-entity-collision-code-if-not-needed.patch b/Spigot-Server-Patches/0447-Don-t-run-entity-collision-code-if-not-needed.patch similarity index 100% rename from Spigot-Server-Patches/0448-Don-t-run-entity-collision-code-if-not-needed.patch rename to Spigot-Server-Patches/0447-Don-t-run-entity-collision-code-if-not-needed.patch diff --git a/Spigot-Server-Patches/0449-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch b/Spigot-Server-Patches/0448-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch similarity index 100% rename from Spigot-Server-Patches/0449-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch rename to Spigot-Server-Patches/0448-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch diff --git a/Spigot-Server-Patches/0450-Restrict-vanilla-teleport-command-to-valid-locations.patch b/Spigot-Server-Patches/0449-Restrict-vanilla-teleport-command-to-valid-locations.patch similarity index 100% rename from Spigot-Server-Patches/0450-Restrict-vanilla-teleport-command-to-valid-locations.patch rename to Spigot-Server-Patches/0449-Restrict-vanilla-teleport-command-to-valid-locations.patch diff --git a/Spigot-Server-Patches/0451-Implement-Player-Client-Options-API.patch b/Spigot-Server-Patches/0450-Implement-Player-Client-Options-API.patch similarity index 100% rename from Spigot-Server-Patches/0451-Implement-Player-Client-Options-API.patch rename to Spigot-Server-Patches/0450-Implement-Player-Client-Options-API.patch diff --git a/Spigot-Server-Patches/0452-Fix-Chunk-Post-Processing-deadlock-risk.patch b/Spigot-Server-Patches/0451-Fix-Chunk-Post-Processing-deadlock-risk.patch similarity index 100% rename from Spigot-Server-Patches/0452-Fix-Chunk-Post-Processing-deadlock-risk.patch rename to Spigot-Server-Patches/0451-Fix-Chunk-Post-Processing-deadlock-risk.patch diff --git a/Spigot-Server-Patches/0453-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/Spigot-Server-Patches/0452-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch similarity index 100% rename from Spigot-Server-Patches/0453-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch rename to Spigot-Server-Patches/0452-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch diff --git a/Spigot-Server-Patches/0454-Broadcast-join-message-to-console.patch b/Spigot-Server-Patches/0453-Broadcast-join-message-to-console.patch similarity index 100% rename from Spigot-Server-Patches/0454-Broadcast-join-message-to-console.patch rename to Spigot-Server-Patches/0453-Broadcast-join-message-to-console.patch diff --git a/Spigot-Server-Patches/0455-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/Spigot-Server-Patches/0454-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch similarity index 100% rename from Spigot-Server-Patches/0455-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch rename to Spigot-Server-Patches/0454-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch diff --git a/Spigot-Server-Patches/0456-Load-Chunks-for-Login-Asynchronously.patch b/Spigot-Server-Patches/0455-Load-Chunks-for-Login-Asynchronously.patch similarity index 100% rename from Spigot-Server-Patches/0456-Load-Chunks-for-Login-Asynchronously.patch rename to Spigot-Server-Patches/0455-Load-Chunks-for-Login-Asynchronously.patch diff --git a/Spigot-Server-Patches/0457-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/Spigot-Server-Patches/0456-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 100% rename from Spigot-Server-Patches/0457-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to Spigot-Server-Patches/0456-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch diff --git a/Spigot-Server-Patches/0458-Add-PlayerAttackEntityCooldownResetEvent.patch b/Spigot-Server-Patches/0457-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from Spigot-Server-Patches/0458-Add-PlayerAttackEntityCooldownResetEvent.patch rename to Spigot-Server-Patches/0457-Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/Spigot-Server-Patches/0459-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch b/Spigot-Server-Patches/0458-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch similarity index 100% rename from Spigot-Server-Patches/0459-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch rename to Spigot-Server-Patches/0458-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch diff --git a/Spigot-Server-Patches/0460-Don-t-fire-BlockFade-on-worldgen-threads.patch b/Spigot-Server-Patches/0459-Don-t-fire-BlockFade-on-worldgen-threads.patch similarity index 94% rename from Spigot-Server-Patches/0460-Don-t-fire-BlockFade-on-worldgen-threads.patch rename to Spigot-Server-Patches/0459-Don-t-fire-BlockFade-on-worldgen-threads.patch index d427580b7..4a08e0166 100644 --- a/Spigot-Server-Patches/0460-Don-t-fire-BlockFade-on-worldgen-threads.patch +++ b/Spigot-Server-Patches/0459-Don-t-fire-BlockFade-on-worldgen-threads.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Don't fire BlockFade on worldgen threads Caused a deadlock diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java -index acd0ec4bf30c5d559d99ec449fef166ce59076e6..5ef90510b8bdac2dcf58cabfa78ba48a30a22a97 100644 +index 4716f366342a3ef70d0ea50e3747786fad1e3573..e5d75a8a93ffe7bc3747b48210eea6189a956d54 100644 --- a/src/main/java/net/minecraft/server/BlockFire.java +++ b/src/main/java/net/minecraft/server/BlockFire.java @@ -73,6 +73,7 @@ public class BlockFire extends BlockFireAbstract { diff --git a/Spigot-Server-Patches/0461-Add-phantom-creative-and-insomniac-controls.patch b/Spigot-Server-Patches/0460-Add-phantom-creative-and-insomniac-controls.patch similarity index 100% rename from Spigot-Server-Patches/0461-Add-phantom-creative-and-insomniac-controls.patch rename to Spigot-Server-Patches/0460-Add-phantom-creative-and-insomniac-controls.patch diff --git a/Spigot-Server-Patches/0462-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/Spigot-Server-Patches/0461-Fix-numerous-item-duplication-issues-and-teleport-is.patch similarity index 100% rename from Spigot-Server-Patches/0462-Fix-numerous-item-duplication-issues-and-teleport-is.patch rename to Spigot-Server-Patches/0461-Fix-numerous-item-duplication-issues-and-teleport-is.patch diff --git a/Spigot-Server-Patches/0463-Implement-Brigadier-Mojang-API.patch b/Spigot-Server-Patches/0462-Implement-Brigadier-Mojang-API.patch similarity index 100% rename from Spigot-Server-Patches/0463-Implement-Brigadier-Mojang-API.patch rename to Spigot-Server-Patches/0462-Implement-Brigadier-Mojang-API.patch diff --git a/Spigot-Server-Patches/0464-Villager-Restocks-API.patch b/Spigot-Server-Patches/0463-Villager-Restocks-API.patch similarity index 100% rename from Spigot-Server-Patches/0464-Villager-Restocks-API.patch rename to Spigot-Server-Patches/0463-Villager-Restocks-API.patch diff --git a/Spigot-Server-Patches/0465-Validate-PickItem-Packet-and-kick-for-invalid.patch b/Spigot-Server-Patches/0464-Validate-PickItem-Packet-and-kick-for-invalid.patch similarity index 100% rename from Spigot-Server-Patches/0465-Validate-PickItem-Packet-and-kick-for-invalid.patch rename to Spigot-Server-Patches/0464-Validate-PickItem-Packet-and-kick-for-invalid.patch diff --git a/Spigot-Server-Patches/0466-Expose-game-version.patch b/Spigot-Server-Patches/0465-Expose-game-version.patch similarity index 100% rename from Spigot-Server-Patches/0466-Expose-game-version.patch rename to Spigot-Server-Patches/0465-Expose-game-version.patch diff --git a/Spigot-Server-Patches/0467-Optimize-Voxel-Shape-Merging.patch b/Spigot-Server-Patches/0466-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from Spigot-Server-Patches/0467-Optimize-Voxel-Shape-Merging.patch rename to Spigot-Server-Patches/0466-Optimize-Voxel-Shape-Merging.patch diff --git a/Spigot-Server-Patches/0468-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/Spigot-Server-Patches/0467-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 93% rename from Spigot-Server-Patches/0468-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to Spigot-Server-Patches/0467-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch index 3a0f263f2..6ecd156af 100644 --- a/Spigot-Server-Patches/0468-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch +++ b/Spigot-Server-Patches/0467-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch @@ -17,7 +17,7 @@ keeping long lived large direct buffers in cache. Set system properly at server startup if not set already to help protect from this. diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index b9e14473ed7e1e07f14246f06ef4070a90f03f3f..9118f054246ea09a4ca7b326604679d6c9addde4 100644 +index 99efa63857dd3fb0a7d488937519ac225e379913..26c0ced8c2f1e22092c5d4405b9c6be8ac04cf24 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -20,6 +20,7 @@ public class Main { diff --git a/Spigot-Server-Patches/0469-Implement-Mob-Goal-API.patch b/Spigot-Server-Patches/0468-Implement-Mob-Goal-API.patch similarity index 100% rename from Spigot-Server-Patches/0469-Implement-Mob-Goal-API.patch rename to Spigot-Server-Patches/0468-Implement-Mob-Goal-API.patch diff --git a/Spigot-Server-Patches/0470-Use-distance-map-to-optimise-entity-tracker.patch b/Spigot-Server-Patches/0469-Use-distance-map-to-optimise-entity-tracker.patch similarity index 100% rename from Spigot-Server-Patches/0470-Use-distance-map-to-optimise-entity-tracker.patch rename to Spigot-Server-Patches/0469-Use-distance-map-to-optimise-entity-tracker.patch diff --git a/Spigot-Server-Patches/0471-Optimize-isOutsideRange-to-use-distance-maps.patch b/Spigot-Server-Patches/0470-Optimize-isOutsideRange-to-use-distance-maps.patch similarity index 99% rename from Spigot-Server-Patches/0471-Optimize-isOutsideRange-to-use-distance-maps.patch rename to Spigot-Server-Patches/0470-Optimize-isOutsideRange-to-use-distance-maps.patch index 9f14777f3..1559f7705 100644 --- a/Spigot-Server-Patches/0471-Optimize-isOutsideRange-to-use-distance-maps.patch +++ b/Spigot-Server-Patches/0470-Optimize-isOutsideRange-to-use-distance-maps.patch @@ -161,7 +161,7 @@ index ebf532d6bc2faea310c373d1526db4e963e90438..98fddca0b906221d34dd7683d83920bb super(worldserver, worldserver.getSpawn(), worldserver.v(), gameprofile); this.spawnDimension = World.OVERWORLD; diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 844f5b204b0f8c4474b4b9ffdc9cb7f3564b1336..4074c1f8f8b71544df9aa6e8d59c5703f2036fd9 100644 +index 054a3156f7b7b7077422b4951adf7bf45df42bfc..69c7bbf6a83b07a3af62b8fabaa851c7f7dc9a98 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -45,6 +45,18 @@ public class PlayerChunk { diff --git a/Spigot-Server-Patches/0472-Stop-copy-on-write-operations-for-updating-light-dat.patch b/Spigot-Server-Patches/0471-Stop-copy-on-write-operations-for-updating-light-dat.patch similarity index 100% rename from Spigot-Server-Patches/0472-Stop-copy-on-write-operations-for-updating-light-dat.patch rename to Spigot-Server-Patches/0471-Stop-copy-on-write-operations-for-updating-light-dat.patch diff --git a/Spigot-Server-Patches/0473-No-Tick-view-distance-implementation.patch b/Spigot-Server-Patches/0472-No-Tick-view-distance-implementation.patch similarity index 100% rename from Spigot-Server-Patches/0473-No-Tick-view-distance-implementation.patch rename to Spigot-Server-Patches/0472-No-Tick-view-distance-implementation.patch diff --git a/Spigot-Server-Patches/0474-Add-villager-reputation-API.patch b/Spigot-Server-Patches/0473-Add-villager-reputation-API.patch similarity index 100% rename from Spigot-Server-Patches/0474-Add-villager-reputation-API.patch rename to Spigot-Server-Patches/0473-Add-villager-reputation-API.patch diff --git a/Spigot-Server-Patches/0475-Fix-Light-Command.patch b/Spigot-Server-Patches/0474-Fix-Light-Command.patch similarity index 98% rename from Spigot-Server-Patches/0475-Fix-Light-Command.patch rename to Spigot-Server-Patches/0474-Fix-Light-Command.patch index 64336b3ba..27e4b0f28 100644 --- a/Spigot-Server-Patches/0475-Fix-Light-Command.patch +++ b/Spigot-Server-Patches/0474-Fix-Light-Command.patch @@ -124,7 +124,7 @@ index f7d98a5ba54d041eef10b04f821e0958ad898b0a..a12bc81933c15606b7cde46937f504ea if (!SyncLoadFinder.ENABLED) { sender.sendMessage(ChatColor.RED + "This command requires the server startup flag '-Dpaper.debug-sync-loads=true' to be set."); diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 2784ea71b9f5ee93f6de8e5a3a135457f1be17a3..874bf7d3ddd22ddc4ea08dac1f548d246d85e991 100644 +index bd5643cae88b0c510a630b6166d95368c7405ae6..078cbc9f4dbd387ef1088c76b2f77ee47fff135d 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -321,6 +321,7 @@ public class PlayerChunk { diff --git a/Spigot-Server-Patches/0476-Fix-PotionEffect-ignores-icon-flag.patch b/Spigot-Server-Patches/0475-Fix-PotionEffect-ignores-icon-flag.patch similarity index 92% rename from Spigot-Server-Patches/0476-Fix-PotionEffect-ignores-icon-flag.patch rename to Spigot-Server-Patches/0475-Fix-PotionEffect-ignores-icon-flag.patch index da262f221..91bee2ef3 100644 --- a/Spigot-Server-Patches/0476-Fix-PotionEffect-ignores-icon-flag.patch +++ b/Spigot-Server-Patches/0475-Fix-PotionEffect-ignores-icon-flag.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix PotionEffect ignores icon flag diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index e8f9d4845eadfa065981b9beb0165f431e89377d..56f0d799ca80d877543ae43ba3c53d62bbce8133 100644 +index b8e29172a17ad7e30134ff8c63815c71ff1d19d1..97cc5b6b8bf1f44804e2c0528b631c51c75ab325 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -410,7 +410,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/Spigot-Server-Patches/0477-Optimize-brigadier-child-sorting-performance.patch b/Spigot-Server-Patches/0476-Optimize-brigadier-child-sorting-performance.patch similarity index 100% rename from Spigot-Server-Patches/0477-Optimize-brigadier-child-sorting-performance.patch rename to Spigot-Server-Patches/0476-Optimize-brigadier-child-sorting-performance.patch diff --git a/Spigot-Server-Patches/0478-Don-t-toString-block-unless-actually-showing-the-mes.patch b/Spigot-Server-Patches/0477-Don-t-toString-block-unless-actually-showing-the-mes.patch similarity index 100% rename from Spigot-Server-Patches/0478-Don-t-toString-block-unless-actually-showing-the-mes.patch rename to Spigot-Server-Patches/0477-Don-t-toString-block-unless-actually-showing-the-mes.patch diff --git a/Spigot-Server-Patches/0479-Potential-bed-API.patch b/Spigot-Server-Patches/0478-Potential-bed-API.patch similarity index 100% rename from Spigot-Server-Patches/0479-Potential-bed-API.patch rename to Spigot-Server-Patches/0478-Potential-bed-API.patch diff --git a/Spigot-Server-Patches/0480-Wait-for-Async-Tasks-during-shutdown.patch b/Spigot-Server-Patches/0479-Wait-for-Async-Tasks-during-shutdown.patch similarity index 100% rename from Spigot-Server-Patches/0480-Wait-for-Async-Tasks-during-shutdown.patch rename to Spigot-Server-Patches/0479-Wait-for-Async-Tasks-during-shutdown.patch diff --git a/Spigot-Server-Patches/0481-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/Spigot-Server-Patches/0480-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch similarity index 100% rename from Spigot-Server-Patches/0481-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch rename to Spigot-Server-Patches/0480-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch diff --git a/Spigot-Server-Patches/0482-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/Spigot-Server-Patches/0481-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 100% rename from Spigot-Server-Patches/0482-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to Spigot-Server-Patches/0481-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch diff --git a/Spigot-Server-Patches/0483-Optimize-NibbleArray-to-use-pooled-buffers.patch b/Spigot-Server-Patches/0482-Optimize-NibbleArray-to-use-pooled-buffers.patch similarity index 100% rename from Spigot-Server-Patches/0483-Optimize-NibbleArray-to-use-pooled-buffers.patch rename to Spigot-Server-Patches/0482-Optimize-NibbleArray-to-use-pooled-buffers.patch diff --git a/Spigot-Server-Patches/0484-Reduce-MutableInt-allocations-from-light-engine.patch b/Spigot-Server-Patches/0483-Reduce-MutableInt-allocations-from-light-engine.patch similarity index 100% rename from Spigot-Server-Patches/0484-Reduce-MutableInt-allocations-from-light-engine.patch rename to Spigot-Server-Patches/0483-Reduce-MutableInt-allocations-from-light-engine.patch diff --git a/Spigot-Server-Patches/0485-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/Spigot-Server-Patches/0484-Reduce-allocation-of-Vec3D-by-entity-tracker.patch similarity index 100% rename from Spigot-Server-Patches/0485-Reduce-allocation-of-Vec3D-by-entity-tracker.patch rename to Spigot-Server-Patches/0484-Reduce-allocation-of-Vec3D-by-entity-tracker.patch diff --git a/Spigot-Server-Patches/0486-Ensure-safe-gateway-teleport.patch b/Spigot-Server-Patches/0485-Ensure-safe-gateway-teleport.patch similarity index 100% rename from Spigot-Server-Patches/0486-Ensure-safe-gateway-teleport.patch rename to Spigot-Server-Patches/0485-Ensure-safe-gateway-teleport.patch diff --git a/Spigot-Server-Patches/0487-Add-option-for-console-having-all-permissions.patch b/Spigot-Server-Patches/0486-Add-option-for-console-having-all-permissions.patch similarity index 100% rename from Spigot-Server-Patches/0487-Add-option-for-console-having-all-permissions.patch rename to Spigot-Server-Patches/0486-Add-option-for-console-having-all-permissions.patch diff --git a/Spigot-Server-Patches/0488-Workaround-for-Client-Lag-Spikes-MC-162253.patch b/Spigot-Server-Patches/0487-Workaround-for-Client-Lag-Spikes-MC-162253.patch similarity index 100% rename from Spigot-Server-Patches/0488-Workaround-for-Client-Lag-Spikes-MC-162253.patch rename to Spigot-Server-Patches/0487-Workaround-for-Client-Lag-Spikes-MC-162253.patch diff --git a/Spigot-Server-Patches/0489-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/Spigot-Server-Patches/0488-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch similarity index 99% rename from Spigot-Server-Patches/0489-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch rename to Spigot-Server-Patches/0488-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch index 38ceebb5d..7f13c6504 100644 --- a/Spigot-Server-Patches/0489-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch +++ b/Spigot-Server-Patches/0488-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch @@ -628,7 +628,7 @@ index 0b5ddff008d151ad03a1f382a8f24494356e8701..ff74be14512a947e81b62d53e616131c chunkData.addProperty("queued-for-unload", chunkMap.unloadQueue.contains(playerChunk.location.pair())); chunkData.addProperty("status", status == null ? "unloaded" : status.toString()); diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 874bf7d3ddd22ddc4ea08dac1f548d246d85e991..b629afa7e6f046f1a09237f3355ec193c24e02d8 100644 +index 078cbc9f4dbd387ef1088c76b2f77ee47fff135d..c3621d9d410c23da5db024254311864680465125 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -1,6 +1,7 @@ diff --git a/Spigot-Server-Patches/0490-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch b/Spigot-Server-Patches/0489-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch similarity index 100% rename from Spigot-Server-Patches/0490-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch rename to Spigot-Server-Patches/0489-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch diff --git a/Spigot-Server-Patches/0491-Optimize-sending-packets-to-nearby-locations-sounds-.patch b/Spigot-Server-Patches/0490-Optimize-sending-packets-to-nearby-locations-sounds-.patch similarity index 100% rename from Spigot-Server-Patches/0491-Optimize-sending-packets-to-nearby-locations-sounds-.patch rename to Spigot-Server-Patches/0490-Optimize-sending-packets-to-nearby-locations-sounds-.patch diff --git a/Spigot-Server-Patches/0492-Improve-Chunk-Status-Transition-Speed.patch b/Spigot-Server-Patches/0491-Improve-Chunk-Status-Transition-Speed.patch similarity index 98% rename from Spigot-Server-Patches/0492-Improve-Chunk-Status-Transition-Speed.patch rename to Spigot-Server-Patches/0491-Improve-Chunk-Status-Transition-Speed.patch index c848fcb71..41710bc3d 100644 --- a/Spigot-Server-Patches/0492-Improve-Chunk-Status-Transition-Speed.patch +++ b/Spigot-Server-Patches/0491-Improve-Chunk-Status-Transition-Speed.patch @@ -36,7 +36,7 @@ scenario / path: Previously would have hopped to SERVER around 12+ times there extra. diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index b629afa7e6f046f1a09237f3355ec193c24e02d8..27c4dc6caf7b6303766dd8eee4812209600cd728 100644 +index c3621d9d410c23da5db024254311864680465125..1f14ebf09de9f2671b30498ea8fd66750ae85dff 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -58,6 +58,13 @@ public class PlayerChunk { diff --git a/Spigot-Server-Patches/0493-Fix-villager-trading-demand-MC-163962.patch b/Spigot-Server-Patches/0492-Fix-villager-trading-demand-MC-163962.patch similarity index 100% rename from Spigot-Server-Patches/0493-Fix-villager-trading-demand-MC-163962.patch rename to Spigot-Server-Patches/0492-Fix-villager-trading-demand-MC-163962.patch diff --git a/Spigot-Server-Patches/0494-Maps-shouldn-t-load-chunks.patch b/Spigot-Server-Patches/0493-Maps-shouldn-t-load-chunks.patch similarity index 100% rename from Spigot-Server-Patches/0494-Maps-shouldn-t-load-chunks.patch rename to Spigot-Server-Patches/0493-Maps-shouldn-t-load-chunks.patch diff --git a/Spigot-Server-Patches/0495-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/Spigot-Server-Patches/0494-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch similarity index 100% rename from Spigot-Server-Patches/0495-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch rename to Spigot-Server-Patches/0494-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch diff --git a/Spigot-Server-Patches/0496-Optimize-Bit-Operations-by-inlining.patch b/Spigot-Server-Patches/0495-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from Spigot-Server-Patches/0496-Optimize-Bit-Operations-by-inlining.patch rename to Spigot-Server-Patches/0495-Optimize-Bit-Operations-by-inlining.patch diff --git a/Spigot-Server-Patches/0497-Optimize-Light-Engine.patch b/Spigot-Server-Patches/0496-Optimize-Light-Engine.patch similarity index 100% rename from Spigot-Server-Patches/0497-Optimize-Light-Engine.patch rename to Spigot-Server-Patches/0496-Optimize-Light-Engine.patch diff --git a/Spigot-Server-Patches/0498-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0497-Delay-Chunk-Unloads-based-on-Player-Movement.patch similarity index 100% rename from Spigot-Server-Patches/0498-Delay-Chunk-Unloads-based-on-Player-Movement.patch rename to Spigot-Server-Patches/0497-Delay-Chunk-Unloads-based-on-Player-Movement.patch diff --git a/Spigot-Server-Patches/0499-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/Spigot-Server-Patches/0498-Add-Plugin-Tickets-to-API-Chunk-Methods.patch similarity index 100% rename from Spigot-Server-Patches/0499-Add-Plugin-Tickets-to-API-Chunk-Methods.patch rename to Spigot-Server-Patches/0498-Add-Plugin-Tickets-to-API-Chunk-Methods.patch diff --git a/Spigot-Server-Patches/0500-Fix-missing-chunks-due-to-integer-overflow.patch b/Spigot-Server-Patches/0499-Fix-missing-chunks-due-to-integer-overflow.patch similarity index 100% rename from Spigot-Server-Patches/0500-Fix-missing-chunks-due-to-integer-overflow.patch rename to Spigot-Server-Patches/0499-Fix-missing-chunks-due-to-integer-overflow.patch diff --git a/Spigot-Server-Patches/0501-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/Spigot-Server-Patches/0500-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 100% rename from Spigot-Server-Patches/0501-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to Spigot-Server-Patches/0500-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch diff --git a/Spigot-Server-Patches/0502-Fix-piston-physics-inconsistency-MC-188840.patch b/Spigot-Server-Patches/0501-Fix-piston-physics-inconsistency-MC-188840.patch similarity index 100% rename from Spigot-Server-Patches/0502-Fix-piston-physics-inconsistency-MC-188840.patch rename to Spigot-Server-Patches/0501-Fix-piston-physics-inconsistency-MC-188840.patch diff --git a/Spigot-Server-Patches/0503-Fix-sand-duping.patch b/Spigot-Server-Patches/0502-Fix-sand-duping.patch similarity index 100% rename from Spigot-Server-Patches/0503-Fix-sand-duping.patch rename to Spigot-Server-Patches/0502-Fix-sand-duping.patch diff --git a/Spigot-Server-Patches/0504-Prevent-position-desync-in-playerconnection-causing-.patch b/Spigot-Server-Patches/0503-Prevent-position-desync-in-playerconnection-causing-.patch similarity index 100% rename from Spigot-Server-Patches/0504-Prevent-position-desync-in-playerconnection-causing-.patch rename to Spigot-Server-Patches/0503-Prevent-position-desync-in-playerconnection-causing-.patch diff --git a/Spigot-Server-Patches/0505-Fix-enderdragon-exp-dupe.patch b/Spigot-Server-Patches/0504-Fix-enderdragon-exp-dupe.patch similarity index 100% rename from Spigot-Server-Patches/0505-Fix-enderdragon-exp-dupe.patch rename to Spigot-Server-Patches/0504-Fix-enderdragon-exp-dupe.patch diff --git a/Spigot-Server-Patches/0506-Inventory-getHolder-method-without-block-snapshot.patch b/Spigot-Server-Patches/0505-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from Spigot-Server-Patches/0506-Inventory-getHolder-method-without-block-snapshot.patch rename to Spigot-Server-Patches/0505-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/Spigot-Server-Patches/0507-Expose-Arrow-getItemStack.patch b/Spigot-Server-Patches/0506-Expose-Arrow-getItemStack.patch similarity index 100% rename from Spigot-Server-Patches/0507-Expose-Arrow-getItemStack.patch rename to Spigot-Server-Patches/0506-Expose-Arrow-getItemStack.patch diff --git a/Spigot-Server-Patches/0508-Add-and-implement-PlayerRecipeBookClickEvent.patch b/Spigot-Server-Patches/0507-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from Spigot-Server-Patches/0508-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to Spigot-Server-Patches/0507-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/Spigot-Server-Patches/0509-Hide-sync-chunk-writes-behind-flag.patch b/Spigot-Server-Patches/0508-Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from Spigot-Server-Patches/0509-Hide-sync-chunk-writes-behind-flag.patch rename to Spigot-Server-Patches/0508-Hide-sync-chunk-writes-behind-flag.patch diff --git a/Spigot-Server-Patches/0510-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0509-Limit-lightning-strike-effect-distance.patch similarity index 100% rename from Spigot-Server-Patches/0510-Limit-lightning-strike-effect-distance.patch rename to Spigot-Server-Patches/0509-Limit-lightning-strike-effect-distance.patch diff --git a/Spigot-Server-Patches/0511-Add-permission-for-command-blocks.patch b/Spigot-Server-Patches/0510-Add-permission-for-command-blocks.patch similarity index 100% rename from Spigot-Server-Patches/0511-Add-permission-for-command-blocks.patch rename to Spigot-Server-Patches/0510-Add-permission-for-command-blocks.patch diff --git a/Spigot-Server-Patches/0512-Ensure-Entity-AABB-s-are-never-invalid.patch b/Spigot-Server-Patches/0511-Ensure-Entity-AABB-s-are-never-invalid.patch similarity index 100% rename from Spigot-Server-Patches/0512-Ensure-Entity-AABB-s-are-never-invalid.patch rename to Spigot-Server-Patches/0511-Ensure-Entity-AABB-s-are-never-invalid.patch diff --git a/Spigot-Server-Patches/0513-Optimize-WorldBorder-collision-checks-and-air.patch b/Spigot-Server-Patches/0512-Optimize-WorldBorder-collision-checks-and-air.patch similarity index 100% rename from Spigot-Server-Patches/0513-Optimize-WorldBorder-collision-checks-and-air.patch rename to Spigot-Server-Patches/0512-Optimize-WorldBorder-collision-checks-and-air.patch diff --git a/Spigot-Server-Patches/0514-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/Spigot-Server-Patches/0513-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 100% rename from Spigot-Server-Patches/0514-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to Spigot-Server-Patches/0513-Fix-Per-World-Difficulty-Remembering-Difficulty.patch diff --git a/Spigot-Server-Patches/0515-Paper-dumpitem-command.patch b/Spigot-Server-Patches/0514-Paper-dumpitem-command.patch similarity index 100% rename from Spigot-Server-Patches/0515-Paper-dumpitem-command.patch rename to Spigot-Server-Patches/0514-Paper-dumpitem-command.patch diff --git a/Spigot-Server-Patches/0516-Don-t-allow-null-UUID-s-for-chat.patch b/Spigot-Server-Patches/0515-Don-t-allow-null-UUID-s-for-chat.patch similarity index 100% rename from Spigot-Server-Patches/0516-Don-t-allow-null-UUID-s-for-chat.patch rename to Spigot-Server-Patches/0515-Don-t-allow-null-UUID-s-for-chat.patch diff --git a/Spigot-Server-Patches/0517-Improve-Legacy-Component-serialization-size.patch b/Spigot-Server-Patches/0516-Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from Spigot-Server-Patches/0517-Improve-Legacy-Component-serialization-size.patch rename to Spigot-Server-Patches/0516-Improve-Legacy-Component-serialization-size.patch diff --git a/Spigot-Server-Patches/0518-Support-old-UUID-format-for-NBT.patch b/Spigot-Server-Patches/0517-Support-old-UUID-format-for-NBT.patch similarity index 100% rename from Spigot-Server-Patches/0518-Support-old-UUID-format-for-NBT.patch rename to Spigot-Server-Patches/0517-Support-old-UUID-format-for-NBT.patch diff --git a/Spigot-Server-Patches/0519-Clean-up-duplicated-GameProfile-Properties.patch b/Spigot-Server-Patches/0518-Clean-up-duplicated-GameProfile-Properties.patch similarity index 100% rename from Spigot-Server-Patches/0519-Clean-up-duplicated-GameProfile-Properties.patch rename to Spigot-Server-Patches/0518-Clean-up-duplicated-GameProfile-Properties.patch diff --git a/Spigot-Server-Patches/0520-Convert-legacy-attributes-in-Item-Meta.patch b/Spigot-Server-Patches/0519-Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from Spigot-Server-Patches/0520-Convert-legacy-attributes-in-Item-Meta.patch rename to Spigot-Server-Patches/0519-Convert-legacy-attributes-in-Item-Meta.patch diff --git a/Spigot-Server-Patches/0521-Remove-some-streams-from-structures.patch b/Spigot-Server-Patches/0520-Remove-some-streams-from-structures.patch similarity index 100% rename from Spigot-Server-Patches/0521-Remove-some-streams-from-structures.patch rename to Spigot-Server-Patches/0520-Remove-some-streams-from-structures.patch diff --git a/Spigot-Server-Patches/0522-Remove-streams-from-classes-related-villager-gossip.patch b/Spigot-Server-Patches/0521-Remove-streams-from-classes-related-villager-gossip.patch similarity index 100% rename from Spigot-Server-Patches/0522-Remove-streams-from-classes-related-villager-gossip.patch rename to Spigot-Server-Patches/0521-Remove-streams-from-classes-related-villager-gossip.patch diff --git a/Spigot-Server-Patches/0523-Support-components-in-ItemMeta.patch b/Spigot-Server-Patches/0522-Support-components-in-ItemMeta.patch similarity index 100% rename from Spigot-Server-Patches/0523-Support-components-in-ItemMeta.patch rename to Spigot-Server-Patches/0522-Support-components-in-ItemMeta.patch diff --git a/Spigot-Server-Patches/0524-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/Spigot-Server-Patches/0523-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch similarity index 100% rename from Spigot-Server-Patches/0524-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch rename to Spigot-Server-Patches/0523-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch diff --git a/Spigot-Server-Patches/0525-Add-entity-liquid-API.patch b/Spigot-Server-Patches/0524-Add-entity-liquid-API.patch similarity index 100% rename from Spigot-Server-Patches/0525-Add-entity-liquid-API.patch rename to Spigot-Server-Patches/0524-Add-entity-liquid-API.patch diff --git a/Spigot-Server-Patches/0526-Update-itemstack-legacy-name-and-lore.patch b/Spigot-Server-Patches/0525-Update-itemstack-legacy-name-and-lore.patch similarity index 100% rename from Spigot-Server-Patches/0526-Update-itemstack-legacy-name-and-lore.patch rename to Spigot-Server-Patches/0525-Update-itemstack-legacy-name-and-lore.patch diff --git a/Spigot-Server-Patches/0527-Spawn-player-in-correct-world-on-login.patch b/Spigot-Server-Patches/0526-Spawn-player-in-correct-world-on-login.patch similarity index 100% rename from Spigot-Server-Patches/0527-Spawn-player-in-correct-world-on-login.patch rename to Spigot-Server-Patches/0526-Spawn-player-in-correct-world-on-login.patch diff --git a/Spigot-Server-Patches/0528-Add-PrepareResultEvent.patch b/Spigot-Server-Patches/0527-Add-PrepareResultEvent.patch similarity index 100% rename from Spigot-Server-Patches/0528-Add-PrepareResultEvent.patch rename to Spigot-Server-Patches/0527-Add-PrepareResultEvent.patch diff --git a/Spigot-Server-Patches/0529-Allow-delegation-to-vanilla-chunk-gen.patch b/Spigot-Server-Patches/0528-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from Spigot-Server-Patches/0529-Allow-delegation-to-vanilla-chunk-gen.patch rename to Spigot-Server-Patches/0528-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/Spigot-Server-Patches/0530-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/Spigot-Server-Patches/0529-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 100% rename from Spigot-Server-Patches/0530-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to Spigot-Server-Patches/0529-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch diff --git a/Spigot-Server-Patches/0531-Optimize-NetworkManager-Exception-Handling.patch b/Spigot-Server-Patches/0530-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from Spigot-Server-Patches/0531-Optimize-NetworkManager-Exception-Handling.patch rename to Spigot-Server-Patches/0530-Optimize-NetworkManager-Exception-Handling.patch diff --git a/Spigot-Server-Patches/0532-Fix-Concurrency-issue-in-WeightedList.patch b/Spigot-Server-Patches/0531-Fix-Concurrency-issue-in-WeightedList.patch similarity index 100% rename from Spigot-Server-Patches/0532-Fix-Concurrency-issue-in-WeightedList.patch rename to Spigot-Server-Patches/0531-Fix-Concurrency-issue-in-WeightedList.patch diff --git a/Spigot-Server-Patches/0533-Optimize-the-advancement-data-player-iteration-to-be.patch b/Spigot-Server-Patches/0532-Optimize-the-advancement-data-player-iteration-to-be.patch similarity index 100% rename from Spigot-Server-Patches/0533-Optimize-the-advancement-data-player-iteration-to-be.patch rename to Spigot-Server-Patches/0532-Optimize-the-advancement-data-player-iteration-to-be.patch diff --git a/Spigot-Server-Patches/0534-Fix-arrows-never-despawning-MC-125757.patch b/Spigot-Server-Patches/0533-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from Spigot-Server-Patches/0534-Fix-arrows-never-despawning-MC-125757.patch rename to Spigot-Server-Patches/0533-Fix-arrows-never-despawning-MC-125757.patch diff --git a/Spigot-Server-Patches/0535-Thread-Safe-Vanilla-Command-permission-checking.patch b/Spigot-Server-Patches/0534-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from Spigot-Server-Patches/0535-Thread-Safe-Vanilla-Command-permission-checking.patch rename to Spigot-Server-Patches/0534-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/Spigot-Server-Patches/0536-Move-range-check-for-block-placing-up.patch b/Spigot-Server-Patches/0535-Move-range-check-for-block-placing-up.patch similarity index 100% rename from Spigot-Server-Patches/0536-Move-range-check-for-block-placing-up.patch rename to Spigot-Server-Patches/0535-Move-range-check-for-block-placing-up.patch diff --git a/Spigot-Server-Patches/0537-Fix-SPIGOT-5989.patch b/Spigot-Server-Patches/0536-Fix-SPIGOT-5989.patch similarity index 100% rename from Spigot-Server-Patches/0537-Fix-SPIGOT-5989.patch rename to Spigot-Server-Patches/0536-Fix-SPIGOT-5989.patch diff --git a/Spigot-Server-Patches/0538-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/Spigot-Server-Patches/0537-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from Spigot-Server-Patches/0538-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to Spigot-Server-Patches/0537-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/Spigot-Server-Patches/0539-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/Spigot-Server-Patches/0538-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from Spigot-Server-Patches/0539-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to Spigot-Server-Patches/0538-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/Spigot-Server-Patches/0540-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/Spigot-Server-Patches/0539-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from Spigot-Server-Patches/0540-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to Spigot-Server-Patches/0539-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/Spigot-Server-Patches/0541-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/Spigot-Server-Patches/0540-Add-missing-strikeLighting-call-to-World-spigot-stri.patch similarity index 100% rename from Spigot-Server-Patches/0541-Add-missing-strikeLighting-call-to-World-spigot-stri.patch rename to Spigot-Server-Patches/0540-Add-missing-strikeLighting-call-to-World-spigot-stri.patch diff --git a/Spigot-Server-Patches/0542-Fix-some-rails-connecting-improperly.patch b/Spigot-Server-Patches/0541-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from Spigot-Server-Patches/0542-Fix-some-rails-connecting-improperly.patch rename to Spigot-Server-Patches/0541-Fix-some-rails-connecting-improperly.patch diff --git a/Spigot-Server-Patches/0543-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/Spigot-Server-Patches/0542-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from Spigot-Server-Patches/0543-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to Spigot-Server-Patches/0542-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/Spigot-Server-Patches/0544-Incremental-player-saving.patch b/Spigot-Server-Patches/0543-Incremental-player-saving.patch similarity index 100% rename from Spigot-Server-Patches/0544-Incremental-player-saving.patch rename to Spigot-Server-Patches/0543-Incremental-player-saving.patch diff --git a/Spigot-Server-Patches/0545-Import-fastutil-classes.patch b/Spigot-Server-Patches/0544-Import-fastutil-classes.patch similarity index 100% rename from Spigot-Server-Patches/0545-Import-fastutil-classes.patch rename to Spigot-Server-Patches/0544-Import-fastutil-classes.patch diff --git a/Spigot-Server-Patches/0546-Don-t-mark-null-chunk-sections-for-block-updates.patch b/Spigot-Server-Patches/0545-Don-t-mark-null-chunk-sections-for-block-updates.patch similarity index 92% rename from Spigot-Server-Patches/0546-Don-t-mark-null-chunk-sections-for-block-updates.patch rename to Spigot-Server-Patches/0545-Don-t-mark-null-chunk-sections-for-block-updates.patch index a299083ba..ae133d2f2 100644 --- a/Spigot-Server-Patches/0546-Don-t-mark-null-chunk-sections-for-block-updates.patch +++ b/Spigot-Server-Patches/0545-Don-t-mark-null-chunk-sections-for-block-updates.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't mark null chunk sections for block updates diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 676f0d28b0c8a590c6429a93902953636b3c1f11..fc6197dd5bc7527ed66839c7e8316fb23ab5d14e 100644 +index de1e409dc5161371c6f14d036603be448fcd3e26..31684667a6a76fc83feb657def40bd34599ae159 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -420,6 +420,7 @@ public class PlayerChunk { diff --git a/Spigot-Server-Patches/0547-Remove-armour-stand-double-add-to-world.patch b/Spigot-Server-Patches/0546-Remove-armour-stand-double-add-to-world.patch similarity index 100% rename from Spigot-Server-Patches/0547-Remove-armour-stand-double-add-to-world.patch rename to Spigot-Server-Patches/0546-Remove-armour-stand-double-add-to-world.patch diff --git a/Spigot-Server-Patches/0548-Fix-MC-187716-Use-configured-height.patch b/Spigot-Server-Patches/0547-Fix-MC-187716-Use-configured-height.patch similarity index 100% rename from Spigot-Server-Patches/0548-Fix-MC-187716-Use-configured-height.patch rename to Spigot-Server-Patches/0547-Fix-MC-187716-Use-configured-height.patch diff --git a/Spigot-Server-Patches/0549-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch b/Spigot-Server-Patches/0548-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch similarity index 100% rename from Spigot-Server-Patches/0549-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch rename to Spigot-Server-Patches/0548-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch diff --git a/Spigot-Server-Patches/0550-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/Spigot-Server-Patches/0549-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from Spigot-Server-Patches/0550-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to Spigot-Server-Patches/0549-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/Spigot-Server-Patches/0551-Do-not-let-the-server-load-chunks-from-newer-version.patch b/Spigot-Server-Patches/0550-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from Spigot-Server-Patches/0551-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to Spigot-Server-Patches/0550-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/Spigot-Server-Patches/0552-Brand-support.patch b/Spigot-Server-Patches/0551-Brand-support.patch similarity index 100% rename from Spigot-Server-Patches/0552-Brand-support.patch rename to Spigot-Server-Patches/0551-Brand-support.patch diff --git a/Spigot-Server-Patches/0553-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch b/Spigot-Server-Patches/0552-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch similarity index 100% rename from Spigot-Server-Patches/0553-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch rename to Spigot-Server-Patches/0552-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch diff --git a/Spigot-Server-Patches/0554-Fix-MC-197271.patch b/Spigot-Server-Patches/0553-Fix-MC-197271.patch similarity index 100% rename from Spigot-Server-Patches/0554-Fix-MC-197271.patch rename to Spigot-Server-Patches/0553-Fix-MC-197271.patch diff --git a/Spigot-Server-Patches/0555-MC-197883-Bandaid-decode-issue.patch b/Spigot-Server-Patches/0554-MC-197883-Bandaid-decode-issue.patch similarity index 100% rename from Spigot-Server-Patches/0555-MC-197883-Bandaid-decode-issue.patch rename to Spigot-Server-Patches/0554-MC-197883-Bandaid-decode-issue.patch diff --git a/Spigot-Server-Patches/0556-Add-setMaxPlayers-API.patch b/Spigot-Server-Patches/0555-Add-setMaxPlayers-API.patch similarity index 100% rename from Spigot-Server-Patches/0556-Add-setMaxPlayers-API.patch rename to Spigot-Server-Patches/0555-Add-setMaxPlayers-API.patch diff --git a/Spigot-Server-Patches/0557-Add-playPickupItemAnimation-to-LivingEntity.patch b/Spigot-Server-Patches/0556-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from Spigot-Server-Patches/0557-Add-playPickupItemAnimation-to-LivingEntity.patch rename to Spigot-Server-Patches/0556-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/Spigot-Server-Patches/0558-Don-t-require-FACING-data.patch b/Spigot-Server-Patches/0557-Don-t-require-FACING-data.patch similarity index 100% rename from Spigot-Server-Patches/0558-Don-t-require-FACING-data.patch rename to Spigot-Server-Patches/0557-Don-t-require-FACING-data.patch diff --git a/Spigot-Server-Patches/0559-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/Spigot-Server-Patches/0558-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 100% rename from Spigot-Server-Patches/0559-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to Spigot-Server-Patches/0558-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch diff --git a/Spigot-Server-Patches/0560-Add-moon-phase-API.patch b/Spigot-Server-Patches/0559-Add-moon-phase-API.patch similarity index 100% rename from Spigot-Server-Patches/0560-Add-moon-phase-API.patch rename to Spigot-Server-Patches/0559-Add-moon-phase-API.patch diff --git a/Spigot-Server-Patches/0561-Prevent-headless-pistons-from-being-created.patch b/Spigot-Server-Patches/0560-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from Spigot-Server-Patches/0561-Prevent-headless-pistons-from-being-created.patch rename to Spigot-Server-Patches/0560-Prevent-headless-pistons-from-being-created.patch diff --git a/Spigot-Server-Patches/0562-Brand-support.patch b/Spigot-Server-Patches/0561-Brand-support.patch similarity index 100% rename from Spigot-Server-Patches/0562-Brand-support.patch rename to Spigot-Server-Patches/0561-Brand-support.patch diff --git a/Spigot-Server-Patches/0563-Add-BellRingEvent.patch b/Spigot-Server-Patches/0562-Add-BellRingEvent.patch similarity index 100% rename from Spigot-Server-Patches/0563-Add-BellRingEvent.patch rename to Spigot-Server-Patches/0562-Add-BellRingEvent.patch diff --git a/Spigot-Server-Patches/0564-Add-zombie-targets-turtle-egg-config.patch b/Spigot-Server-Patches/0563-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from Spigot-Server-Patches/0564-Add-zombie-targets-turtle-egg-config.patch rename to Spigot-Server-Patches/0563-Add-zombie-targets-turtle-egg-config.patch diff --git a/Spigot-Server-Patches/0565-Buffer-joins-to-world.patch b/Spigot-Server-Patches/0564-Buffer-joins-to-world.patch similarity index 100% rename from Spigot-Server-Patches/0565-Buffer-joins-to-world.patch rename to Spigot-Server-Patches/0564-Buffer-joins-to-world.patch diff --git a/Spigot-Server-Patches/0566-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0565-Optimize-redstone-algorithm.patch similarity index 100% rename from Spigot-Server-Patches/0566-Optimize-redstone-algorithm.patch rename to Spigot-Server-Patches/0565-Optimize-redstone-algorithm.patch diff --git a/Spigot-Server-Patches/0567-Fix-hex-colors-not-working-in-some-kick-messages.patch b/Spigot-Server-Patches/0566-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from Spigot-Server-Patches/0567-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to Spigot-Server-Patches/0566-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/Spigot-Server-Patches/0568-Fix-NPE-in-getBedSpawnLocation.patch b/Spigot-Server-Patches/0567-Fix-NPE-in-getBedSpawnLocation.patch similarity index 100% rename from Spigot-Server-Patches/0568-Fix-NPE-in-getBedSpawnLocation.patch rename to Spigot-Server-Patches/0567-Fix-NPE-in-getBedSpawnLocation.patch diff --git a/Spigot-Server-Patches/0569-PortalCreateEvent-needs-to-know-its-entity.patch b/Spigot-Server-Patches/0568-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from Spigot-Server-Patches/0569-PortalCreateEvent-needs-to-know-its-entity.patch rename to Spigot-Server-Patches/0568-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/Spigot-Server-Patches/0570-Fix-CraftTeam-null-check.patch b/Spigot-Server-Patches/0569-Fix-CraftTeam-null-check.patch similarity index 100% rename from Spigot-Server-Patches/0570-Fix-CraftTeam-null-check.patch rename to Spigot-Server-Patches/0569-Fix-CraftTeam-null-check.patch diff --git a/Spigot-Server-Patches/0571-Add-more-Evoker-API.patch b/Spigot-Server-Patches/0570-Add-more-Evoker-API.patch similarity index 100% rename from Spigot-Server-Patches/0571-Add-more-Evoker-API.patch rename to Spigot-Server-Patches/0570-Add-more-Evoker-API.patch diff --git a/Spigot-Server-Patches/0572-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/Spigot-Server-Patches/0571-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch similarity index 100% rename from Spigot-Server-Patches/0572-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch rename to Spigot-Server-Patches/0571-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch diff --git a/Spigot-Server-Patches/0573-Create-HoverEvent-from-ItemStack-Entity.patch b/Spigot-Server-Patches/0572-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from Spigot-Server-Patches/0573-Create-HoverEvent-from-ItemStack-Entity.patch rename to Spigot-Server-Patches/0572-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/Spigot-Server-Patches/0574-Cache-block-data-strings.patch b/Spigot-Server-Patches/0573-Cache-block-data-strings.patch similarity index 100% rename from Spigot-Server-Patches/0574-Cache-block-data-strings.patch rename to Spigot-Server-Patches/0573-Cache-block-data-strings.patch diff --git a/Spigot-Server-Patches/0575-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/Spigot-Server-Patches/0574-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 100% rename from Spigot-Server-Patches/0575-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to Spigot-Server-Patches/0574-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch diff --git a/Spigot-Server-Patches/0576-Use-wrapped-StructureManager-to-prevent-worldgen-dea.patch b/Spigot-Server-Patches/0575-Use-wrapped-StructureManager-to-prevent-worldgen-dea.patch similarity index 100% rename from Spigot-Server-Patches/0576-Use-wrapped-StructureManager-to-prevent-worldgen-dea.patch rename to Spigot-Server-Patches/0575-Use-wrapped-StructureManager-to-prevent-worldgen-dea.patch diff --git a/Spigot-Server-Patches/0577-Fix-block-data-exception-when-cancelling-PortalCreat.patch b/Spigot-Server-Patches/0576-Fix-block-data-exception-when-cancelling-PortalCreat.patch similarity index 100% rename from Spigot-Server-Patches/0577-Fix-block-data-exception-when-cancelling-PortalCreat.patch rename to Spigot-Server-Patches/0576-Fix-block-data-exception-when-cancelling-PortalCreat.patch diff --git a/Spigot-Server-Patches/0578-Add-additional-open-container-api-to-HumanEntity.patch b/Spigot-Server-Patches/0577-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from Spigot-Server-Patches/0578-Add-additional-open-container-api-to-HumanEntity.patch rename to Spigot-Server-Patches/0577-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/Spigot-Server-Patches/0579-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/Spigot-Server-Patches/0578-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from Spigot-Server-Patches/0579-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to Spigot-Server-Patches/0578-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/Spigot-Server-Patches/0580-Extend-block-drop-capture-to-capture-all-items-added.patch b/Spigot-Server-Patches/0579-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 100% rename from Spigot-Server-Patches/0580-Extend-block-drop-capture-to-capture-all-items-added.patch rename to Spigot-Server-Patches/0579-Extend-block-drop-capture-to-capture-all-items-added.patch diff --git a/Spigot-Server-Patches/0581-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/Spigot-Server-Patches/0580-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch similarity index 100% rename from Spigot-Server-Patches/0581-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch rename to Spigot-Server-Patches/0580-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch diff --git a/work/CraftBukkit b/work/CraftBukkit index f8d4da08e..a339310c4 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit f8d4da08e17c3b6e7147af8a945301535329bba3 +Subproject commit a339310c48548f0f82f923ff3f5fe2cdc7a8e8ba