diff --git a/Spigot-Server-Patches/0069-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0068-Use-a-Shared-Random-for-Entities.patch similarity index 100% rename from Spigot-Server-Patches/0069-Use-a-Shared-Random-for-Entities.patch rename to Spigot-Server-Patches/0068-Use-a-Shared-Random-for-Entities.patch diff --git a/Spigot-Server-Patches/0068-Waving-banner-workaround.patch b/Spigot-Server-Patches/0068-Waving-banner-workaround.patch deleted file mode 100644 index fa50db8a5d..0000000000 --- a/Spigot-Server-Patches/0068-Waving-banner-workaround.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Gabscap -Date: Sat, 19 Mar 2016 22:25:11 +0100 -Subject: [PATCH] Waving banner workaround - -This patch is a workaround for MC-63720 - -diff --git a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java -index 88c3d7efaf467c1c1487f589c2cdbfb6aba734ec..15af5927f3d1d41b2a4f86b4267aa6a0485fb53e 100644 ---- a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java -+++ b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java -@@ -4,7 +4,13 @@ import java.io.IOException; - - public class PacketPlayOutUpdateTime implements Packet { - -+ // World Age in ticks -+ // Not changed by server commands -+ // World Age must not be negative - private long a; -+ // Time of Day in ticks -+ // If negative the sun will stop moving at the Math.abs of the time -+ // Displayed in the debug screen (F3) - private long b; - - public PacketPlayOutUpdateTime() {} -@@ -19,6 +25,9 @@ public class PacketPlayOutUpdateTime implements Packet { - } - } - -+ // Paper start -+ this.a = this.a % 192000; -+ // Paper end - } - - @Override diff --git a/Spigot-Server-Patches/0070-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0069-Configurable-spawn-chances-for-skeleton-horses.patch similarity index 95% rename from Spigot-Server-Patches/0070-Configurable-spawn-chances-for-skeleton-horses.patch rename to Spigot-Server-Patches/0069-Configurable-spawn-chances-for-skeleton-horses.patch index 437da47f78..0abcda8b3b 100644 --- a/Spigot-Server-Patches/0070-Configurable-spawn-chances-for-skeleton-horses.patch +++ b/Spigot-Server-Patches/0069-Configurable-spawn-chances-for-skeleton-horses.patch @@ -22,7 +22,7 @@ index 4c956da69261d3092cd9abb1b98f7c9a220cc91e..6998ec2d7550094498649deb90289887 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index e307f939745db9688e96c42a70d337e8751874f2..2dfecbc93c5de9ea67064ff2b8e041e173fc0be2 100644 +index 01fde964fa2fae3cfefc4b9e8e2c59a997d09539..51afd8277d1b00e299c44d198faa64179940a8ec 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -479,7 +479,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0071-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0070-Optimize-isValidLocation-getType-and-getBlockData-fo.patch similarity index 100% rename from Spigot-Server-Patches/0071-Optimize-isValidLocation-getType-and-getBlockData-fo.patch rename to Spigot-Server-Patches/0070-Optimize-isValidLocation-getType-and-getBlockData-fo.patch diff --git a/Spigot-Server-Patches/0072-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/Spigot-Server-Patches/0071-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch similarity index 98% rename from Spigot-Server-Patches/0072-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch rename to Spigot-Server-Patches/0071-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch index 06ec784c72..a90f5caa32 100644 --- a/Spigot-Server-Patches/0072-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch +++ b/Spigot-Server-Patches/0071-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch @@ -66,7 +66,7 @@ index 92785a80bae6b5c88285536f74f23e0609d793ac..19f0149051d9ff58223624754b27285c this.getServer().getPluginManager().callEvent(event); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 2dfecbc93c5de9ea67064ff2b8e041e173fc0be2..e900ce242a84c8f6003905cf320070ea88ae13f3 100644 +index 51afd8277d1b00e299c44d198faa64179940a8ec..058d222b97c2698518f165f5a5b59fb2aed565fa 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -87,6 +87,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0073-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0072-Entity-AddTo-RemoveFrom-World-Events.patch similarity index 100% rename from Spigot-Server-Patches/0073-Entity-AddTo-RemoveFrom-World-Events.patch rename to Spigot-Server-Patches/0072-Entity-AddTo-RemoveFrom-World-Events.patch diff --git a/Spigot-Server-Patches/0074-Configurable-Chunk-Inhabited-Time.patch b/Spigot-Server-Patches/0073-Configurable-Chunk-Inhabited-Time.patch similarity index 100% rename from Spigot-Server-Patches/0074-Configurable-Chunk-Inhabited-Time.patch rename to Spigot-Server-Patches/0073-Configurable-Chunk-Inhabited-Time.patch diff --git a/Spigot-Server-Patches/0075-EntityPathfindEvent.patch b/Spigot-Server-Patches/0074-EntityPathfindEvent.patch similarity index 100% rename from Spigot-Server-Patches/0075-EntityPathfindEvent.patch rename to Spigot-Server-Patches/0074-EntityPathfindEvent.patch diff --git a/Spigot-Server-Patches/0076-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0075-Sanitise-RegionFileCache-and-make-configurable.patch similarity index 100% rename from Spigot-Server-Patches/0076-Sanitise-RegionFileCache-and-make-configurable.patch rename to Spigot-Server-Patches/0075-Sanitise-RegionFileCache-and-make-configurable.patch diff --git a/Spigot-Server-Patches/0077-Do-not-load-chunks-for-Pathfinding.patch b/Spigot-Server-Patches/0076-Do-not-load-chunks-for-Pathfinding.patch similarity index 100% rename from Spigot-Server-Patches/0077-Do-not-load-chunks-for-Pathfinding.patch rename to Spigot-Server-Patches/0076-Do-not-load-chunks-for-Pathfinding.patch diff --git a/Spigot-Server-Patches/0078-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0077-Add-PlayerUseUnknownEntityEvent.patch similarity index 100% rename from Spigot-Server-Patches/0078-Add-PlayerUseUnknownEntityEvent.patch rename to Spigot-Server-Patches/0077-Add-PlayerUseUnknownEntityEvent.patch diff --git a/Spigot-Server-Patches/0079-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0078-Fix-reducedDebugInfo-not-initialized-on-client.patch similarity index 92% rename from Spigot-Server-Patches/0079-Fix-reducedDebugInfo-not-initialized-on-client.patch rename to Spigot-Server-Patches/0078-Fix-reducedDebugInfo-not-initialized-on-client.patch index dd9c4a5b21..eb48a68d00 100644 --- a/Spigot-Server-Patches/0079-Fix-reducedDebugInfo-not-initialized-on-client.patch +++ b/Spigot-Server-Patches/0078-Fix-reducedDebugInfo-not-initialized-on-client.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix reducedDebugInfo not initialized on client diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 7c6e35590f4217ec68ddfc3e189b847eb48b1c20..7f76582918ce1ad48eb0feb9679cf2e2172f02db 100644 +index 3b7c4c611e8936faef09f3bec80f96037e45d77d..8d12df108d32819f5dc87a8ee5e9578a900a0e93 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -174,6 +174,7 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0080-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0079-Configurable-Grass-Spread-Tick-Rate.patch similarity index 100% rename from Spigot-Server-Patches/0080-Configurable-Grass-Spread-Tick-Rate.patch rename to Spigot-Server-Patches/0079-Configurable-Grass-Spread-Tick-Rate.patch diff --git a/Spigot-Server-Patches/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0080-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch similarity index 100% rename from Spigot-Server-Patches/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch rename to Spigot-Server-Patches/0080-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch diff --git a/Spigot-Server-Patches/0082-Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/0081-Remove-Debug-checks-from-DataBits.patch similarity index 100% rename from Spigot-Server-Patches/0082-Remove-Debug-checks-from-DataBits.patch rename to Spigot-Server-Patches/0081-Remove-Debug-checks-from-DataBits.patch diff --git a/Spigot-Server-Patches/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0082-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch similarity index 100% rename from Spigot-Server-Patches/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch rename to Spigot-Server-Patches/0082-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch diff --git a/Spigot-Server-Patches/0084-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0083-Workaround-for-setting-passengers-on-players.patch similarity index 92% rename from Spigot-Server-Patches/0084-Workaround-for-setting-passengers-on-players.patch rename to Spigot-Server-Patches/0083-Workaround-for-setting-passengers-on-players.patch index b9fbffc118..4d8424ab14 100644 --- a/Spigot-Server-Patches/0084-Workaround-for-setting-passengers-on-players.patch +++ b/Spigot-Server-Patches/0083-Workaround-for-setting-passengers-on-players.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Workaround for setting passengers on players SPIGOT-1915 & GH-114 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 9d10107169b5439c725b8450fab0b0d0dd96423e..c0ee227689c0865ecc4816ea534047aeb2b82c12 100644 +index a8b0bfe18c88ff14fa285cbf2f0da7713f20d0cc..8f352763d81bb44786a603e80feb3a25ce91eb7a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -792,6 +792,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0085-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0084-Remove-unused-World-Tile-Entity-List.patch similarity index 100% rename from Spigot-Server-Patches/0085-Remove-unused-World-Tile-Entity-List.patch rename to Spigot-Server-Patches/0084-Remove-unused-World-Tile-Entity-List.patch diff --git a/Spigot-Server-Patches/0086-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0085-Don-t-tick-Skulls-unused-code.patch similarity index 100% rename from Spigot-Server-Patches/0086-Don-t-tick-Skulls-unused-code.patch rename to Spigot-Server-Patches/0085-Don-t-tick-Skulls-unused-code.patch diff --git a/Spigot-Server-Patches/0087-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0086-Configurable-Player-Collision.patch similarity index 98% rename from Spigot-Server-Patches/0087-Configurable-Player-Collision.patch rename to Spigot-Server-Patches/0086-Configurable-Player-Collision.patch index 856b158fc3..c9264c51f7 100644 --- a/Spigot-Server-Patches/0087-Configurable-Player-Collision.patch +++ b/Spigot-Server-Patches/0086-Configurable-Player-Collision.patch @@ -57,7 +57,7 @@ index d1581c9d9838797eb425020d21bd0fba432e5652..99dc43159f240135957aee35f6129f19 packetdataserializer.a(this.c); packetdataserializer.a(this.d); diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 7f76582918ce1ad48eb0feb9679cf2e2172f02db..0287576bf59128583454ca2f60ca05cb978a36d9 100644 +index 8d12df108d32819f5dc87a8ee5e9578a900a0e93..234a6e73122c68358029ce2d578d82ab92ad5b45 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -75,6 +75,7 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0088-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-Server-Patches/0087-Add-handshake-event-to-allow-plugins-to-handle-clien.patch similarity index 100% rename from Spigot-Server-Patches/0088-Add-handshake-event-to-allow-plugins-to-handle-clien.patch rename to Spigot-Server-Patches/0087-Add-handshake-event-to-allow-plugins-to-handle-clien.patch diff --git a/Spigot-Server-Patches/0089-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0088-Configurable-RCON-IP-address.patch similarity index 100% rename from Spigot-Server-Patches/0089-Configurable-RCON-IP-address.patch rename to Spigot-Server-Patches/0088-Configurable-RCON-IP-address.patch diff --git a/Spigot-Server-Patches/0090-Prevent-Fire-from-loading-chunks-wrongly-spread.patch b/Spigot-Server-Patches/0089-Prevent-Fire-from-loading-chunks-wrongly-spread.patch similarity index 100% rename from Spigot-Server-Patches/0090-Prevent-Fire-from-loading-chunks-wrongly-spread.patch rename to Spigot-Server-Patches/0089-Prevent-Fire-from-loading-chunks-wrongly-spread.patch diff --git a/Spigot-Server-Patches/0091-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0090-Implement-PlayerLocaleChangeEvent.patch similarity index 96% rename from Spigot-Server-Patches/0091-Implement-PlayerLocaleChangeEvent.patch rename to Spigot-Server-Patches/0090-Implement-PlayerLocaleChangeEvent.patch index 3e2d64ddb6..273302ca82 100644 --- a/Spigot-Server-Patches/0091-Implement-PlayerLocaleChangeEvent.patch +++ b/Spigot-Server-Patches/0090-Implement-PlayerLocaleChangeEvent.patch @@ -29,7 +29,7 @@ index a91c4facac9cc1b7c2e497be77af636ac2b36138..bc85a155a6ca0e21ca1dcf737c015e99 this.locale = packetplayinsettings.locale; this.clientViewDistance = packetplayinsettings.viewDistance; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index c0ee227689c0865ecc4816ea534047aeb2b82c12..ba145b9a6e7cc82a1f9ee46db96487ab7a09a724 100644 +index 8f352763d81bb44786a603e80feb3a25ce91eb7a..f447059d0eecf68c44a74f27acd726f9355c4bd7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1816,8 +1816,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0092-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0091-EntityRegainHealthEvent-isFastRegen-API.patch similarity index 100% rename from Spigot-Server-Patches/0092-EntityRegainHealthEvent-isFastRegen-API.patch rename to Spigot-Server-Patches/0091-EntityRegainHealthEvent-isFastRegen-API.patch diff --git a/Spigot-Server-Patches/0093-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0092-Add-ability-to-configure-frosted_ice-properties.patch similarity index 100% rename from Spigot-Server-Patches/0093-Add-ability-to-configure-frosted_ice-properties.patch rename to Spigot-Server-Patches/0092-Add-ability-to-configure-frosted_ice-properties.patch diff --git a/Spigot-Server-Patches/0094-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0093-remove-null-possibility-for-getServer-singleton.patch similarity index 100% rename from Spigot-Server-Patches/0094-remove-null-possibility-for-getServer-singleton.patch rename to Spigot-Server-Patches/0093-remove-null-possibility-for-getServer-singleton.patch diff --git a/Spigot-Server-Patches/0095-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch similarity index 100% rename from Spigot-Server-Patches/0095-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch rename to Spigot-Server-Patches/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch diff --git a/Spigot-Server-Patches/0096-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0095-LootTable-API-Replenishable-Lootables-Feature.patch similarity index 100% rename from Spigot-Server-Patches/0096-LootTable-API-Replenishable-Lootables-Feature.patch rename to Spigot-Server-Patches/0095-LootTable-API-Replenishable-Lootables-Feature.patch diff --git a/Spigot-Server-Patches/0097-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch similarity index 100% rename from Spigot-Server-Patches/0097-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch rename to Spigot-Server-Patches/0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch diff --git a/Spigot-Server-Patches/0098-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0097-System-property-for-disabling-watchdoge.patch similarity index 100% rename from Spigot-Server-Patches/0098-System-property-for-disabling-watchdoge.patch rename to Spigot-Server-Patches/0097-System-property-for-disabling-watchdoge.patch diff --git a/Spigot-Server-Patches/0099-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0098-Optimize-UserCache-Thread-Safe.patch similarity index 100% rename from Spigot-Server-Patches/0099-Optimize-UserCache-Thread-Safe.patch rename to Spigot-Server-Patches/0098-Optimize-UserCache-Thread-Safe.patch diff --git a/Spigot-Server-Patches/0100-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0099-Avoid-blocking-on-Network-Manager-creation.patch similarity index 100% rename from Spigot-Server-Patches/0100-Avoid-blocking-on-Network-Manager-creation.patch rename to Spigot-Server-Patches/0099-Avoid-blocking-on-Network-Manager-creation.patch diff --git a/Spigot-Server-Patches/0101-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0100-Optional-TNT-doesn-t-move-in-water.patch similarity index 100% rename from Spigot-Server-Patches/0101-Optional-TNT-doesn-t-move-in-water.patch rename to Spigot-Server-Patches/0100-Optional-TNT-doesn-t-move-in-water.patch diff --git a/Spigot-Server-Patches/0102-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0101-Faster-redstone-torch-rapid-clock-removal.patch similarity index 100% rename from Spigot-Server-Patches/0102-Faster-redstone-torch-rapid-clock-removal.patch rename to Spigot-Server-Patches/0101-Faster-redstone-torch-rapid-clock-removal.patch diff --git a/Spigot-Server-Patches/0103-Add-server-name-parameter.patch b/Spigot-Server-Patches/0102-Add-server-name-parameter.patch similarity index 100% rename from Spigot-Server-Patches/0103-Add-server-name-parameter.patch rename to Spigot-Server-Patches/0102-Add-server-name-parameter.patch diff --git a/Spigot-Server-Patches/0104-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0103-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch similarity index 100% rename from Spigot-Server-Patches/0104-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch rename to Spigot-Server-Patches/0103-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch diff --git a/Spigot-Server-Patches/0105-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0104-Fix-Double-World-Add-issues.patch similarity index 100% rename from Spigot-Server-Patches/0105-Fix-Double-World-Add-issues.patch rename to Spigot-Server-Patches/0104-Fix-Double-World-Add-issues.patch diff --git a/Spigot-Server-Patches/0106-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0105-Fix-Old-Sign-Conversion.patch similarity index 100% rename from Spigot-Server-Patches/0106-Fix-Old-Sign-Conversion.patch rename to Spigot-Server-Patches/0105-Fix-Old-Sign-Conversion.patch diff --git a/Spigot-Server-Patches/0107-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0106-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch similarity index 100% rename from Spigot-Server-Patches/0107-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch rename to Spigot-Server-Patches/0106-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch diff --git a/Spigot-Server-Patches/0108-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0107-Add-setting-for-proxy-online-mode-status.patch similarity index 100% rename from Spigot-Server-Patches/0108-Add-setting-for-proxy-online-mode-status.patch rename to Spigot-Server-Patches/0107-Add-setting-for-proxy-online-mode-status.patch diff --git a/Spigot-Server-Patches/0109-Optimise-BlockState-s-hashCode-equals.patch b/Spigot-Server-Patches/0108-Optimise-BlockState-s-hashCode-equals.patch similarity index 100% rename from Spigot-Server-Patches/0109-Optimise-BlockState-s-hashCode-equals.patch rename to Spigot-Server-Patches/0108-Optimise-BlockState-s-hashCode-equals.patch diff --git a/Spigot-Server-Patches/0110-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0109-Configurable-packet-in-spam-threshold.patch similarity index 100% rename from Spigot-Server-Patches/0110-Configurable-packet-in-spam-threshold.patch rename to Spigot-Server-Patches/0109-Configurable-packet-in-spam-threshold.patch diff --git a/Spigot-Server-Patches/0111-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0110-Configurable-flying-kick-messages.patch similarity index 100% rename from Spigot-Server-Patches/0111-Configurable-flying-kick-messages.patch rename to Spigot-Server-Patches/0110-Configurable-flying-kick-messages.patch diff --git a/Spigot-Server-Patches/0112-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0111-Chunk-registration-fixes.patch similarity index 100% rename from Spigot-Server-Patches/0112-Chunk-registration-fixes.patch rename to Spigot-Server-Patches/0111-Chunk-registration-fixes.patch diff --git a/Spigot-Server-Patches/0113-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0112-Remove-FishingHook-reference-on-Craft-Entity-removal.patch similarity index 100% rename from Spigot-Server-Patches/0113-Remove-FishingHook-reference-on-Craft-Entity-removal.patch rename to Spigot-Server-Patches/0112-Remove-FishingHook-reference-on-Craft-Entity-removal.patch diff --git a/Spigot-Server-Patches/0114-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0113-Auto-fix-bad-Y-levels-on-player-login.patch similarity index 100% rename from Spigot-Server-Patches/0114-Auto-fix-bad-Y-levels-on-player-login.patch rename to Spigot-Server-Patches/0113-Auto-fix-bad-Y-levels-on-player-login.patch diff --git a/Spigot-Server-Patches/0115-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0114-Option-to-remove-corrupt-tile-entities.patch similarity index 100% rename from Spigot-Server-Patches/0115-Option-to-remove-corrupt-tile-entities.patch rename to Spigot-Server-Patches/0114-Option-to-remove-corrupt-tile-entities.patch diff --git a/Spigot-Server-Patches/0116-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0115-Add-EntityZapEvent.patch similarity index 100% rename from Spigot-Server-Patches/0116-Add-EntityZapEvent.patch rename to Spigot-Server-Patches/0115-Add-EntityZapEvent.patch diff --git a/Spigot-Server-Patches/0117-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0116-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch similarity index 100% rename from Spigot-Server-Patches/0117-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch rename to Spigot-Server-Patches/0116-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch diff --git a/Spigot-Server-Patches/0118-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0117-Cache-user-authenticator-threads.patch similarity index 100% rename from Spigot-Server-Patches/0118-Cache-user-authenticator-threads.patch rename to Spigot-Server-Patches/0117-Cache-user-authenticator-threads.patch diff --git a/Spigot-Server-Patches/0119-Optimise-removeQueue.patch b/Spigot-Server-Patches/0118-Optimise-removeQueue.patch similarity index 100% rename from Spigot-Server-Patches/0119-Optimise-removeQueue.patch rename to Spigot-Server-Patches/0118-Optimise-removeQueue.patch diff --git a/Spigot-Server-Patches/0120-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0119-Allow-Reloading-of-Command-Aliases.patch similarity index 100% rename from Spigot-Server-Patches/0120-Allow-Reloading-of-Command-Aliases.patch rename to Spigot-Server-Patches/0119-Allow-Reloading-of-Command-Aliases.patch diff --git a/Spigot-Server-Patches/0121-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0120-Add-source-to-PlayerExpChangeEvent.patch similarity index 100% rename from Spigot-Server-Patches/0121-Add-source-to-PlayerExpChangeEvent.patch rename to Spigot-Server-Patches/0120-Add-source-to-PlayerExpChangeEvent.patch diff --git a/Spigot-Server-Patches/0122-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0121-Don-t-let-fishinghooks-use-portals.patch similarity index 100% rename from Spigot-Server-Patches/0122-Don-t-let-fishinghooks-use-portals.patch rename to Spigot-Server-Patches/0121-Don-t-let-fishinghooks-use-portals.patch diff --git a/Spigot-Server-Patches/0123-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0122-Add-ProjectileCollideEvent.patch similarity index 100% rename from Spigot-Server-Patches/0123-Add-ProjectileCollideEvent.patch rename to Spigot-Server-Patches/0122-Add-ProjectileCollideEvent.patch diff --git a/Spigot-Server-Patches/0124-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0123-Prevent-Pathfinding-out-of-World-Border.patch similarity index 100% rename from Spigot-Server-Patches/0124-Prevent-Pathfinding-out-of-World-Border.patch rename to Spigot-Server-Patches/0123-Prevent-Pathfinding-out-of-World-Border.patch diff --git a/Spigot-Server-Patches/0125-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0124-Optimize-World.isLoaded-BlockPosition-Z.patch similarity index 100% rename from Spigot-Server-Patches/0125-Optimize-World.isLoaded-BlockPosition-Z.patch rename to Spigot-Server-Patches/0124-Optimize-World.isLoaded-BlockPosition-Z.patch diff --git a/Spigot-Server-Patches/0126-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0125-Bound-Treasure-Maps-to-World-Border.patch similarity index 100% rename from Spigot-Server-Patches/0126-Bound-Treasure-Maps-to-World-Border.patch rename to Spigot-Server-Patches/0125-Bound-Treasure-Maps-to-World-Border.patch diff --git a/Spigot-Server-Patches/0127-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0126-Configurable-Cartographer-Treasure-Maps.patch similarity index 100% rename from Spigot-Server-Patches/0127-Configurable-Cartographer-Treasure-Maps.patch rename to Spigot-Server-Patches/0126-Configurable-Cartographer-Treasure-Maps.patch diff --git a/Spigot-Server-Patches/0128-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0127-Optimize-ItemStack.isEmpty.patch similarity index 100% rename from Spigot-Server-Patches/0128-Optimize-ItemStack.isEmpty.patch rename to Spigot-Server-Patches/0127-Optimize-ItemStack.isEmpty.patch diff --git a/Spigot-Server-Patches/0129-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0128-Add-API-methods-to-control-if-armour-stands-can-move.patch similarity index 100% rename from Spigot-Server-Patches/0129-Add-API-methods-to-control-if-armour-stands-can-move.patch rename to Spigot-Server-Patches/0128-Add-API-methods-to-control-if-armour-stands-can-move.patch diff --git a/Spigot-Server-Patches/0130-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0129-Properly-fix-item-duplication-bug.patch similarity index 100% rename from Spigot-Server-Patches/0130-Properly-fix-item-duplication-bug.patch rename to Spigot-Server-Patches/0129-Properly-fix-item-duplication-bug.patch diff --git a/Spigot-Server-Patches/0131-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0130-String-based-Action-Bar-API.patch similarity index 96% rename from Spigot-Server-Patches/0131-String-based-Action-Bar-API.patch rename to Spigot-Server-Patches/0130-String-based-Action-Bar-API.patch index 9ba7b5e251..d580362174 100644 --- a/Spigot-Server-Patches/0131-String-based-Action-Bar-API.patch +++ b/Spigot-Server-Patches/0130-String-based-Action-Bar-API.patch @@ -18,7 +18,7 @@ index bdfd17362518ff2398cf9e1743a7a4f0c7a0e966..cc14e4b4609fa7013df666181c0e02a5 public static Collector, ?, Map> a() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ba145b9a6e7cc82a1f9ee46db96487ab7a09a724..0101eccae2d7f55104c8ff1c38778db944e0c0aa 100644 +index f447059d0eecf68c44a74f27acd726f9355c4bd7..023bcc56e8c27d9660dadd90e074f64b75159d25 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -244,6 +244,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0132-Firework-API-s.patch b/Spigot-Server-Patches/0131-Firework-API-s.patch similarity index 100% rename from Spigot-Server-Patches/0132-Firework-API-s.patch rename to Spigot-Server-Patches/0131-Firework-API-s.patch diff --git a/Spigot-Server-Patches/0133-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0132-PlayerTeleportEndGatewayEvent.patch similarity index 100% rename from Spigot-Server-Patches/0133-PlayerTeleportEndGatewayEvent.patch rename to Spigot-Server-Patches/0132-PlayerTeleportEndGatewayEvent.patch diff --git a/Spigot-Server-Patches/0134-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0133-Provide-E-TE-Chunk-count-stat-methods.patch similarity index 100% rename from Spigot-Server-Patches/0134-Provide-E-TE-Chunk-count-stat-methods.patch rename to Spigot-Server-Patches/0133-Provide-E-TE-Chunk-count-stat-methods.patch diff --git a/Spigot-Server-Patches/0135-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0134-Enforce-Sync-Player-Saves.patch similarity index 91% rename from Spigot-Server-Patches/0135-Enforce-Sync-Player-Saves.patch rename to Spigot-Server-Patches/0134-Enforce-Sync-Player-Saves.patch index da1bf51645..7baa66fa78 100644 --- a/Spigot-Server-Patches/0135-Enforce-Sync-Player-Saves.patch +++ b/Spigot-Server-Patches/0134-Enforce-Sync-Player-Saves.patch @@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main the same way we handle async chunk loads. diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 0287576bf59128583454ca2f60ca05cb978a36d9..4c787974629ce2d39317c7c36036b7e22b0dc35f 100644 +index 234a6e73122c68358029ce2d578d82ab92ad5b45..b517099929ee2575f5cdb2661520c2f60ba72304 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -975,11 +975,13 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0136-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0135-Don-t-allow-entities-to-ride-themselves-572.patch similarity index 100% rename from Spigot-Server-Patches/0136-Don-t-allow-entities-to-ride-themselves-572.patch rename to Spigot-Server-Patches/0135-Don-t-allow-entities-to-ride-themselves-572.patch diff --git a/Spigot-Server-Patches/0137-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0136-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch similarity index 100% rename from Spigot-Server-Patches/0137-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch rename to Spigot-Server-Patches/0136-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch diff --git a/Spigot-Server-Patches/0138-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0137-Cap-Entity-Collisions.patch similarity index 100% rename from Spigot-Server-Patches/0138-Cap-Entity-Collisions.patch rename to Spigot-Server-Patches/0137-Cap-Entity-Collisions.patch diff --git a/Spigot-Server-Patches/0139-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0138-Remove-CraftScheduler-Async-Task-Debugger.patch similarity index 100% rename from Spigot-Server-Patches/0139-Remove-CraftScheduler-Async-Task-Debugger.patch rename to Spigot-Server-Patches/0138-Remove-CraftScheduler-Async-Task-Debugger.patch diff --git a/Spigot-Server-Patches/0140-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0139-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch similarity index 100% rename from Spigot-Server-Patches/0140-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch rename to Spigot-Server-Patches/0139-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch diff --git a/Spigot-Server-Patches/0141-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0140-Do-not-let-armorstands-drown.patch similarity index 100% rename from Spigot-Server-Patches/0141-Do-not-let-armorstands-drown.patch rename to Spigot-Server-Patches/0140-Do-not-let-armorstands-drown.patch diff --git a/Spigot-Server-Patches/0142-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0141-Properly-handle-async-calls-to-restart-the-server.patch similarity index 99% rename from Spigot-Server-Patches/0142-Properly-handle-async-calls-to-restart-the-server.patch rename to Spigot-Server-Patches/0141-Properly-handle-async-calls-to-restart-the-server.patch index f6300af2f4..15c03f7223 100644 --- a/Spigot-Server-Patches/0142-Properly-handle-async-calls-to-restart-the-server.patch +++ b/Spigot-Server-Patches/0141-Properly-handle-async-calls-to-restart-the-server.patch @@ -73,7 +73,7 @@ index 365719e9f6228f19dfb598d4850dc7ef69377f7c..836fdfcedb6b878c69bfa22cbbe1fc10 // Spigot Start private static double calcTps(double avg, double exp, double tps) diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 4c787974629ce2d39317c7c36036b7e22b0dc35f..6375d1061859ea9fa0faef93a92b90d4b38d5903 100644 +index b517099929ee2575f5cdb2661520c2f60ba72304..e42a789f24215f192427218fa08ae327f09c2a46 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1086,10 +1086,15 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0143-Add-system-property-to-disable-book-size-limits.patch b/Spigot-Server-Patches/0142-Add-system-property-to-disable-book-size-limits.patch similarity index 100% rename from Spigot-Server-Patches/0143-Add-system-property-to-disable-book-size-limits.patch rename to Spigot-Server-Patches/0142-Add-system-property-to-disable-book-size-limits.patch diff --git a/Spigot-Server-Patches/0144-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0143-Add-option-to-make-parrots-stay-on-shoulders-despite.patch similarity index 100% rename from Spigot-Server-Patches/0144-Add-option-to-make-parrots-stay-on-shoulders-despite.patch rename to Spigot-Server-Patches/0143-Add-option-to-make-parrots-stay-on-shoulders-despite.patch diff --git a/Spigot-Server-Patches/0145-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0144-Add-configuration-option-to-prevent-player-names-fro.patch similarity index 100% rename from Spigot-Server-Patches/0145-Add-configuration-option-to-prevent-player-names-fro.patch rename to Spigot-Server-Patches/0144-Add-configuration-option-to-prevent-player-names-fro.patch diff --git a/Spigot-Server-Patches/0146-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0145-Use-TerminalConsoleAppender-for-console-improvements.patch similarity index 99% rename from Spigot-Server-Patches/0146-Use-TerminalConsoleAppender-for-console-improvements.patch rename to Spigot-Server-Patches/0145-Use-TerminalConsoleAppender-for-console-improvements.patch index d8da1ee0d7..3a9af1ced9 100644 --- a/Spigot-Server-Patches/0146-Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/Spigot-Server-Patches/0145-Use-TerminalConsoleAppender-for-console-improvements.patch @@ -245,7 +245,7 @@ index 836fdfcedb6b878c69bfa22cbbe1fc10a25d8ad0..b14381fd33b19a511106046d0c66d583 public KeyPair getKeyPair() { diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 6375d1061859ea9fa0faef93a92b90d4b38d5903..11ecafedb839454bfac009dec5d41ed45b08c1d4 100644 +index e42a789f24215f192427218fa08ae327f09c2a46..6b12c1d96a2b0ea305425a563dd0e908c611db89 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -79,8 +79,7 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0147-provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/0146-provide-a-configurable-option-to-disable-creeper-lin.patch similarity index 100% rename from Spigot-Server-Patches/0147-provide-a-configurable-option-to-disable-creeper-lin.patch rename to Spigot-Server-Patches/0146-provide-a-configurable-option-to-disable-creeper-lin.patch diff --git a/Spigot-Server-Patches/0148-Item-canEntityPickup.patch b/Spigot-Server-Patches/0147-Item-canEntityPickup.patch similarity index 100% rename from Spigot-Server-Patches/0148-Item-canEntityPickup.patch rename to Spigot-Server-Patches/0147-Item-canEntityPickup.patch diff --git a/Spigot-Server-Patches/0149-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/0148-PlayerPickupItemEvent-setFlyAtPlayer.patch similarity index 100% rename from Spigot-Server-Patches/0149-PlayerPickupItemEvent-setFlyAtPlayer.patch rename to Spigot-Server-Patches/0148-PlayerPickupItemEvent-setFlyAtPlayer.patch diff --git a/Spigot-Server-Patches/0150-PlayerAttemptPickupItemEvent.patch b/Spigot-Server-Patches/0149-PlayerAttemptPickupItemEvent.patch similarity index 100% rename from Spigot-Server-Patches/0150-PlayerAttemptPickupItemEvent.patch rename to Spigot-Server-Patches/0149-PlayerAttemptPickupItemEvent.patch diff --git a/Spigot-Server-Patches/0151-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0150-Add-UnknownCommandEvent.patch similarity index 100% rename from Spigot-Server-Patches/0151-Add-UnknownCommandEvent.patch rename to Spigot-Server-Patches/0150-Add-UnknownCommandEvent.patch diff --git a/Spigot-Server-Patches/0152-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0151-Basic-PlayerProfile-API.patch similarity index 100% rename from Spigot-Server-Patches/0152-Basic-PlayerProfile-API.patch rename to Spigot-Server-Patches/0151-Basic-PlayerProfile-API.patch diff --git a/Spigot-Server-Patches/0153-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0152-Shoulder-Entities-Release-API.patch similarity index 100% rename from Spigot-Server-Patches/0153-Shoulder-Entities-Release-API.patch rename to Spigot-Server-Patches/0152-Shoulder-Entities-Release-API.patch diff --git a/Spigot-Server-Patches/0154-Profile-Lookup-Events.patch b/Spigot-Server-Patches/0153-Profile-Lookup-Events.patch similarity index 100% rename from Spigot-Server-Patches/0154-Profile-Lookup-Events.patch rename to Spigot-Server-Patches/0153-Profile-Lookup-Events.patch diff --git a/Spigot-Server-Patches/0155-Block-player-logins-during-server-shutdown.patch b/Spigot-Server-Patches/0154-Block-player-logins-during-server-shutdown.patch similarity index 100% rename from Spigot-Server-Patches/0155-Block-player-logins-during-server-shutdown.patch rename to Spigot-Server-Patches/0154-Block-player-logins-during-server-shutdown.patch diff --git a/Spigot-Server-Patches/0156-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0155-Entity-fromMobSpawner.patch similarity index 100% rename from Spigot-Server-Patches/0156-Entity-fromMobSpawner.patch rename to Spigot-Server-Patches/0155-Entity-fromMobSpawner.patch diff --git a/Spigot-Server-Patches/0157-Improve-the-Saddle-API-for-Horses.patch b/Spigot-Server-Patches/0156-Improve-the-Saddle-API-for-Horses.patch similarity index 100% rename from Spigot-Server-Patches/0157-Improve-the-Saddle-API-for-Horses.patch rename to Spigot-Server-Patches/0156-Improve-the-Saddle-API-for-Horses.patch diff --git a/Spigot-Server-Patches/0158-Implement-ensureServerConversions-API.patch b/Spigot-Server-Patches/0157-Implement-ensureServerConversions-API.patch similarity index 100% rename from Spigot-Server-Patches/0158-Implement-ensureServerConversions-API.patch rename to Spigot-Server-Patches/0157-Implement-ensureServerConversions-API.patch diff --git a/Spigot-Server-Patches/0159-Implement-getI18NDisplayName.patch b/Spigot-Server-Patches/0158-Implement-getI18NDisplayName.patch similarity index 100% rename from Spigot-Server-Patches/0159-Implement-getI18NDisplayName.patch rename to Spigot-Server-Patches/0158-Implement-getI18NDisplayName.patch diff --git a/Spigot-Server-Patches/0160-ProfileWhitelistVerifyEvent.patch b/Spigot-Server-Patches/0159-ProfileWhitelistVerifyEvent.patch similarity index 96% rename from Spigot-Server-Patches/0160-ProfileWhitelistVerifyEvent.patch rename to Spigot-Server-Patches/0159-ProfileWhitelistVerifyEvent.patch index d69d3925dc..ace5cb1e2d 100644 --- a/Spigot-Server-Patches/0160-ProfileWhitelistVerifyEvent.patch +++ b/Spigot-Server-Patches/0159-ProfileWhitelistVerifyEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] ProfileWhitelistVerifyEvent diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 11ecafedb839454bfac009dec5d41ed45b08c1d4..3fa1ea2958bec57d40b702bdbdc511d67b165d7e 100644 +index 6b12c1d96a2b0ea305425a563dd0e908c611db89..02479d398189f0956a6e2a8882f398e33853873e 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -543,9 +543,9 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0161-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0160-Fix-this-stupid-bullshit.patch similarity index 100% rename from Spigot-Server-Patches/0161-Fix-this-stupid-bullshit.patch rename to Spigot-Server-Patches/0160-Fix-this-stupid-bullshit.patch diff --git a/Spigot-Server-Patches/0162-Ocelot-despawns-should-honor-nametags-and-leash.patch b/Spigot-Server-Patches/0161-Ocelot-despawns-should-honor-nametags-and-leash.patch similarity index 100% rename from Spigot-Server-Patches/0162-Ocelot-despawns-should-honor-nametags-and-leash.patch rename to Spigot-Server-Patches/0161-Ocelot-despawns-should-honor-nametags-and-leash.patch diff --git a/Spigot-Server-Patches/0163-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/Spigot-Server-Patches/0162-Reset-spawner-timer-when-spawner-event-is-cancelled.patch similarity index 100% rename from Spigot-Server-Patches/0163-Reset-spawner-timer-when-spawner-event-is-cancelled.patch rename to Spigot-Server-Patches/0162-Reset-spawner-timer-when-spawner-event-is-cancelled.patch diff --git a/Spigot-Server-Patches/0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/Spigot-Server-Patches/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch similarity index 100% rename from Spigot-Server-Patches/0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch rename to Spigot-Server-Patches/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch diff --git a/Spigot-Server-Patches/0165-Allow-specifying-a-custom-authentication-servers-dow.patch b/Spigot-Server-Patches/0164-Allow-specifying-a-custom-authentication-servers-dow.patch similarity index 100% rename from Spigot-Server-Patches/0165-Allow-specifying-a-custom-authentication-servers-dow.patch rename to Spigot-Server-Patches/0164-Allow-specifying-a-custom-authentication-servers-dow.patch diff --git a/Spigot-Server-Patches/0166-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0165-LivingEntity-setKiller.patch similarity index 100% rename from Spigot-Server-Patches/0166-LivingEntity-setKiller.patch rename to Spigot-Server-Patches/0165-LivingEntity-setKiller.patch diff --git a/Spigot-Server-Patches/0167-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0166-Handle-plugin-prefixes-using-Log4J-configuration.patch similarity index 100% rename from Spigot-Server-Patches/0167-Handle-plugin-prefixes-using-Log4J-configuration.patch rename to Spigot-Server-Patches/0166-Handle-plugin-prefixes-using-Log4J-configuration.patch diff --git a/Spigot-Server-Patches/0168-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0167-Include-Log4J2-SLF4J-implementation.patch similarity index 100% rename from Spigot-Server-Patches/0168-Include-Log4J2-SLF4J-implementation.patch rename to Spigot-Server-Patches/0167-Include-Log4J2-SLF4J-implementation.patch diff --git a/Spigot-Server-Patches/0169-Improve-Log4J-Configuration-Plugin-Loggers.patch b/Spigot-Server-Patches/0168-Improve-Log4J-Configuration-Plugin-Loggers.patch similarity index 100% rename from Spigot-Server-Patches/0169-Improve-Log4J-Configuration-Plugin-Loggers.patch rename to Spigot-Server-Patches/0168-Improve-Log4J-Configuration-Plugin-Loggers.patch diff --git a/Spigot-Server-Patches/0170-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0169-Add-PlayerJumpEvent.patch similarity index 100% rename from Spigot-Server-Patches/0170-Add-PlayerJumpEvent.patch rename to Spigot-Server-Patches/0169-Add-PlayerJumpEvent.patch diff --git a/Spigot-Server-Patches/0171-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0170-handle-PacketPlayInKeepAlive-async.patch similarity index 100% rename from Spigot-Server-Patches/0171-handle-PacketPlayInKeepAlive-async.patch rename to Spigot-Server-Patches/0170-handle-PacketPlayInKeepAlive-async.patch diff --git a/Spigot-Server-Patches/0172-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0171-Expose-client-protocol-version-and-virtual-host.patch similarity index 98% rename from Spigot-Server-Patches/0172-Expose-client-protocol-version-and-virtual-host.patch rename to Spigot-Server-Patches/0171-Expose-client-protocol-version-and-virtual-host.patch index 205c4e727b..76d5cfb75b 100644 --- a/Spigot-Server-Patches/0172-Expose-client-protocol-version-and-virtual-host.patch +++ b/Spigot-Server-Patches/0171-Expose-client-protocol-version-and-virtual-host.patch @@ -103,7 +103,7 @@ index 4f008e4723d2cb0bcabb2d5621203d63c40c4923..8545146fb1f093f821e3b966d9337049 return this.a; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 0101eccae2d7f55104c8ff1c38778db944e0c0aa..366912aa71ec8cd654977443786fa3cc44e0566a 100644 +index 023bcc56e8c27d9660dadd90e074f64b75159d25..1fcc00fbec16a85ae5f3eb92c9d8f0780a7cf5ce 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -188,6 +188,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0173-revert-serverside-behavior-of-keepalives.patch b/Spigot-Server-Patches/0172-revert-serverside-behavior-of-keepalives.patch similarity index 100% rename from Spigot-Server-Patches/0173-revert-serverside-behavior-of-keepalives.patch rename to Spigot-Server-Patches/0172-revert-serverside-behavior-of-keepalives.patch diff --git a/Spigot-Server-Patches/0174-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/0173-Send-attack-SoundEffects-only-to-players-who-can-see.patch similarity index 100% rename from Spigot-Server-Patches/0174-Send-attack-SoundEffects-only-to-players-who-can-see.patch rename to Spigot-Server-Patches/0173-Send-attack-SoundEffects-only-to-players-who-can-see.patch diff --git a/Spigot-Server-Patches/0175-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0174-Option-for-maximum-exp-value-when-merging-orbs.patch similarity index 100% rename from Spigot-Server-Patches/0175-Option-for-maximum-exp-value-when-merging-orbs.patch rename to Spigot-Server-Patches/0174-Option-for-maximum-exp-value-when-merging-orbs.patch diff --git a/Spigot-Server-Patches/0176-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0175-Add-PlayerArmorChangeEvent.patch similarity index 100% rename from Spigot-Server-Patches/0176-Add-PlayerArmorChangeEvent.patch rename to Spigot-Server-Patches/0175-Add-PlayerArmorChangeEvent.patch diff --git a/Spigot-Server-Patches/0177-Prevent-logins-from-being-processed-when-the-player-.patch b/Spigot-Server-Patches/0176-Prevent-logins-from-being-processed-when-the-player-.patch similarity index 100% rename from Spigot-Server-Patches/0177-Prevent-logins-from-being-processed-when-the-player-.patch rename to Spigot-Server-Patches/0176-Prevent-logins-from-being-processed-when-the-player-.patch diff --git a/Spigot-Server-Patches/0178-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0177-use-CB-BlockState-implementations-for-captured-block.patch similarity index 100% rename from Spigot-Server-Patches/0178-use-CB-BlockState-implementations-for-captured-block.patch rename to Spigot-Server-Patches/0177-use-CB-BlockState-implementations-for-captured-block.patch diff --git a/Spigot-Server-Patches/0179-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0178-API-to-get-a-BlockState-without-a-snapshot.patch similarity index 100% rename from Spigot-Server-Patches/0179-API-to-get-a-BlockState-without-a-snapshot.patch rename to Spigot-Server-Patches/0178-API-to-get-a-BlockState-without-a-snapshot.patch diff --git a/Spigot-Server-Patches/0180-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0179-AsyncTabCompleteEvent.patch similarity index 100% rename from Spigot-Server-Patches/0180-AsyncTabCompleteEvent.patch rename to Spigot-Server-Patches/0179-AsyncTabCompleteEvent.patch diff --git a/Spigot-Server-Patches/0181-Avoid-NPE-in-PathfinderGoalTempt.patch b/Spigot-Server-Patches/0180-Avoid-NPE-in-PathfinderGoalTempt.patch similarity index 100% rename from Spigot-Server-Patches/0181-Avoid-NPE-in-PathfinderGoalTempt.patch rename to Spigot-Server-Patches/0180-Avoid-NPE-in-PathfinderGoalTempt.patch diff --git a/Spigot-Server-Patches/0182-PlayerPickupExperienceEvent.patch b/Spigot-Server-Patches/0181-PlayerPickupExperienceEvent.patch similarity index 100% rename from Spigot-Server-Patches/0182-PlayerPickupExperienceEvent.patch rename to Spigot-Server-Patches/0181-PlayerPickupExperienceEvent.patch diff --git a/Spigot-Server-Patches/0183-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0182-ExperienceOrbMergeEvent.patch similarity index 100% rename from Spigot-Server-Patches/0183-ExperienceOrbMergeEvent.patch rename to Spigot-Server-Patches/0182-ExperienceOrbMergeEvent.patch diff --git a/Spigot-Server-Patches/0184-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0183-Ability-to-apply-mending-to-XP-API.patch similarity index 97% rename from Spigot-Server-Patches/0184-Ability-to-apply-mending-to-XP-API.patch rename to Spigot-Server-Patches/0183-Ability-to-apply-mending-to-XP-API.patch index 0ed1d1818d..368c2037f9 100644 --- a/Spigot-Server-Patches/0184-Ability-to-apply-mending-to-XP-API.patch +++ b/Spigot-Server-Patches/0183-Ability-to-apply-mending-to-XP-API.patch @@ -42,7 +42,7 @@ index 8354d18aa03d29202c82227a1891903a64c7921b..4df7df781d12e38885ecfbc89dd1d42d return i * 2; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 366912aa71ec8cd654977443786fa3cc44e0566a..88da51fd414f0107ef0bbe5eea423c14275d6bc9 100644 +index 1fcc00fbec16a85ae5f3eb92c9d8f0780a7cf5ce..2852bb13a7482ca152f8e013142a3efc4645d540 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1098,8 +1098,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0185-Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/0184-Make-max-squid-spawn-height-configurable.patch similarity index 100% rename from Spigot-Server-Patches/0185-Make-max-squid-spawn-height-configurable.patch rename to Spigot-Server-Patches/0184-Make-max-squid-spawn-height-configurable.patch diff --git a/Spigot-Server-Patches/0186-PreCreatureSpawnEvent.patch b/Spigot-Server-Patches/0185-PreCreatureSpawnEvent.patch similarity index 100% rename from Spigot-Server-Patches/0186-PreCreatureSpawnEvent.patch rename to Spigot-Server-Patches/0185-PreCreatureSpawnEvent.patch diff --git a/Spigot-Server-Patches/0187-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0186-PlayerNaturallySpawnCreaturesEvent.patch similarity index 100% rename from Spigot-Server-Patches/0187-PlayerNaturallySpawnCreaturesEvent.patch rename to Spigot-Server-Patches/0186-PlayerNaturallySpawnCreaturesEvent.patch diff --git a/Spigot-Server-Patches/0188-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-Server-Patches/0187-Add-setPlayerProfile-API-for-Skulls.patch similarity index 100% rename from Spigot-Server-Patches/0188-Add-setPlayerProfile-API-for-Skulls.patch rename to Spigot-Server-Patches/0187-Add-setPlayerProfile-API-for-Skulls.patch diff --git a/Spigot-Server-Patches/0189-Fill-Profile-Property-Events.patch b/Spigot-Server-Patches/0188-Fill-Profile-Property-Events.patch similarity index 100% rename from Spigot-Server-Patches/0189-Fill-Profile-Property-Events.patch rename to Spigot-Server-Patches/0188-Fill-Profile-Property-Events.patch diff --git a/Spigot-Server-Patches/0190-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-Server-Patches/0189-PlayerAdvancementCriterionGrantEvent.patch similarity index 100% rename from Spigot-Server-Patches/0190-PlayerAdvancementCriterionGrantEvent.patch rename to Spigot-Server-Patches/0189-PlayerAdvancementCriterionGrantEvent.patch diff --git a/Spigot-Server-Patches/0191-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0190-Add-ArmorStand-Item-Meta.patch similarity index 100% rename from Spigot-Server-Patches/0191-Add-ArmorStand-Item-Meta.patch rename to Spigot-Server-Patches/0190-Add-ArmorStand-Item-Meta.patch diff --git a/Spigot-Server-Patches/0192-Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/0191-Extend-Player-Interact-cancellation.patch similarity index 100% rename from Spigot-Server-Patches/0192-Extend-Player-Interact-cancellation.patch rename to Spigot-Server-Patches/0191-Extend-Player-Interact-cancellation.patch diff --git a/Spigot-Server-Patches/0193-Tameable-getOwnerUniqueId-API.patch b/Spigot-Server-Patches/0192-Tameable-getOwnerUniqueId-API.patch similarity index 100% rename from Spigot-Server-Patches/0193-Tameable-getOwnerUniqueId-API.patch rename to Spigot-Server-Patches/0192-Tameable-getOwnerUniqueId-API.patch diff --git a/Spigot-Server-Patches/0194-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0193-Toggleable-player-crits-helps-mitigate-hacked-client.patch similarity index 100% rename from Spigot-Server-Patches/0194-Toggleable-player-crits-helps-mitigate-hacked-client.patch rename to Spigot-Server-Patches/0193-Toggleable-player-crits-helps-mitigate-hacked-client.patch diff --git a/Spigot-Server-Patches/0195-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/Spigot-Server-Patches/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch similarity index 100% rename from Spigot-Server-Patches/0195-Prevent-Frosted-Ice-from-loading-holding-chunks.patch rename to Spigot-Server-Patches/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch diff --git a/Spigot-Server-Patches/0196-Disable-Explicit-Network-Manager-Flushing.patch b/Spigot-Server-Patches/0195-Disable-Explicit-Network-Manager-Flushing.patch similarity index 100% rename from Spigot-Server-Patches/0196-Disable-Explicit-Network-Manager-Flushing.patch rename to Spigot-Server-Patches/0195-Disable-Explicit-Network-Manager-Flushing.patch diff --git a/Spigot-Server-Patches/0197-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0196-Implement-extended-PaperServerListPingEvent.patch similarity index 100% rename from Spigot-Server-Patches/0197-Implement-extended-PaperServerListPingEvent.patch rename to Spigot-Server-Patches/0196-Implement-extended-PaperServerListPingEvent.patch diff --git a/Spigot-Server-Patches/0198-Improved-Async-Task-Scheduler.patch b/Spigot-Server-Patches/0197-Improved-Async-Task-Scheduler.patch similarity index 100% rename from Spigot-Server-Patches/0198-Improved-Async-Task-Scheduler.patch rename to Spigot-Server-Patches/0197-Improved-Async-Task-Scheduler.patch diff --git a/Spigot-Server-Patches/0199-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-Server-Patches/0198-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch similarity index 100% rename from Spigot-Server-Patches/0199-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch rename to Spigot-Server-Patches/0198-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch diff --git a/Spigot-Server-Patches/0200-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0199-Player.setPlayerProfile-API.patch similarity index 98% rename from Spigot-Server-Patches/0200-Player.setPlayerProfile-API.patch rename to Spigot-Server-Patches/0199-Player.setPlayerProfile-API.patch index e098e770b7..58d2130552 100644 --- a/Spigot-Server-Patches/0200-Player.setPlayerProfile-API.patch +++ b/Spigot-Server-Patches/0199-Player.setPlayerProfile-API.patch @@ -48,7 +48,7 @@ index b8642986f4304b48bf88c4a1d4ddfab1fbae175a..87dcb1688d1bf1221609a410c33a8d61 uniqueId = i.getId(); // Paper end diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 88da51fd414f0107ef0bbe5eea423c14275d6bc9..79db5b2c858f952b8bca089500dfd18db084f2e7 100644 +index 2852bb13a7482ca152f8e013142a3efc4645d540..c30743056ccb27267e4aa7413e996720676765a1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1256,8 +1256,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0201-Fix-Dragon-Server-Crashes.patch b/Spigot-Server-Patches/0200-Fix-Dragon-Server-Crashes.patch similarity index 100% rename from Spigot-Server-Patches/0201-Fix-Dragon-Server-Crashes.patch rename to Spigot-Server-Patches/0200-Fix-Dragon-Server-Crashes.patch diff --git a/Spigot-Server-Patches/0202-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0201-getPlayerUniqueId-API.patch similarity index 100% rename from Spigot-Server-Patches/0202-getPlayerUniqueId-API.patch rename to Spigot-Server-Patches/0201-getPlayerUniqueId-API.patch diff --git a/Spigot-Server-Patches/0203-Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/0202-Make-player-data-saving-configurable.patch similarity index 100% rename from Spigot-Server-Patches/0203-Make-player-data-saving-configurable.patch rename to Spigot-Server-Patches/0202-Make-player-data-saving-configurable.patch diff --git a/Spigot-Server-Patches/0204-Make-legacy-ping-handler-more-reliable.patch b/Spigot-Server-Patches/0203-Make-legacy-ping-handler-more-reliable.patch similarity index 100% rename from Spigot-Server-Patches/0204-Make-legacy-ping-handler-more-reliable.patch rename to Spigot-Server-Patches/0203-Make-legacy-ping-handler-more-reliable.patch diff --git a/Spigot-Server-Patches/0205-Call-PaperServerListPingEvent-for-legacy-pings.patch b/Spigot-Server-Patches/0204-Call-PaperServerListPingEvent-for-legacy-pings.patch similarity index 100% rename from Spigot-Server-Patches/0205-Call-PaperServerListPingEvent-for-legacy-pings.patch rename to Spigot-Server-Patches/0204-Call-PaperServerListPingEvent-for-legacy-pings.patch diff --git a/Spigot-Server-Patches/0206-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0205-Flag-to-disable-the-channel-limit.patch similarity index 95% rename from Spigot-Server-Patches/0206-Flag-to-disable-the-channel-limit.patch rename to Spigot-Server-Patches/0205-Flag-to-disable-the-channel-limit.patch index 8cad2d9598..a2eb206c03 100644 --- a/Spigot-Server-Patches/0206-Flag-to-disable-the-channel-limit.patch +++ b/Spigot-Server-Patches/0205-Flag-to-disable-the-channel-limit.patch @@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs. provide an optional flag to disable this check, at your own risk. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 79db5b2c858f952b8bca089500dfd18db084f2e7..c24a0c6bd72b4b2cbc2432d5e1651c3c396e4baf 100644 +index c30743056ccb27267e4aa7413e996720676765a1..0499a13549d19e9c81b4042219d8996fe1d86ae3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -141,6 +141,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0207-Add-method-to-open-already-placed-sign.patch b/Spigot-Server-Patches/0206-Add-method-to-open-already-placed-sign.patch similarity index 100% rename from Spigot-Server-Patches/0207-Add-method-to-open-already-placed-sign.patch rename to Spigot-Server-Patches/0206-Add-method-to-open-already-placed-sign.patch diff --git a/Spigot-Server-Patches/0208-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0207-Configurable-sprint-interruption-on-attack.patch similarity index 100% rename from Spigot-Server-Patches/0208-Configurable-sprint-interruption-on-attack.patch rename to Spigot-Server-Patches/0207-Configurable-sprint-interruption-on-attack.patch diff --git a/Spigot-Server-Patches/0209-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0208-Fix-exploit-that-allowed-colored-signs-to-be-created.patch similarity index 100% rename from Spigot-Server-Patches/0209-Fix-exploit-that-allowed-colored-signs-to-be-created.patch rename to Spigot-Server-Patches/0208-Fix-exploit-that-allowed-colored-signs-to-be-created.patch diff --git a/Spigot-Server-Patches/0210-EndermanEscapeEvent.patch b/Spigot-Server-Patches/0209-EndermanEscapeEvent.patch similarity index 100% rename from Spigot-Server-Patches/0210-EndermanEscapeEvent.patch rename to Spigot-Server-Patches/0209-EndermanEscapeEvent.patch diff --git a/Spigot-Server-Patches/0211-Enderman.teleportRandomly.patch b/Spigot-Server-Patches/0210-Enderman.teleportRandomly.patch similarity index 100% rename from Spigot-Server-Patches/0211-Enderman.teleportRandomly.patch rename to Spigot-Server-Patches/0210-Enderman.teleportRandomly.patch diff --git a/Spigot-Server-Patches/0212-Block-Enderpearl-Travel-Exploit.patch b/Spigot-Server-Patches/0211-Block-Enderpearl-Travel-Exploit.patch similarity index 100% rename from Spigot-Server-Patches/0212-Block-Enderpearl-Travel-Exploit.patch rename to Spigot-Server-Patches/0211-Block-Enderpearl-Travel-Exploit.patch diff --git a/Spigot-Server-Patches/0213-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0212-Expand-World.spawnParticle-API-and-add-Builder.patch similarity index 100% rename from Spigot-Server-Patches/0213-Expand-World.spawnParticle-API-and-add-Builder.patch rename to Spigot-Server-Patches/0212-Expand-World.spawnParticle-API-and-add-Builder.patch diff --git a/Spigot-Server-Patches/0214-EndermanAttackPlayerEvent.patch b/Spigot-Server-Patches/0213-EndermanAttackPlayerEvent.patch similarity index 100% rename from Spigot-Server-Patches/0214-EndermanAttackPlayerEvent.patch rename to Spigot-Server-Patches/0213-EndermanAttackPlayerEvent.patch diff --git a/Spigot-Server-Patches/0215-WitchConsumePotionEvent.patch b/Spigot-Server-Patches/0214-WitchConsumePotionEvent.patch similarity index 100% rename from Spigot-Server-Patches/0215-WitchConsumePotionEvent.patch rename to Spigot-Server-Patches/0214-WitchConsumePotionEvent.patch diff --git a/Spigot-Server-Patches/0216-WitchThrowPotionEvent.patch b/Spigot-Server-Patches/0215-WitchThrowPotionEvent.patch similarity index 100% rename from Spigot-Server-Patches/0216-WitchThrowPotionEvent.patch rename to Spigot-Server-Patches/0215-WitchThrowPotionEvent.patch diff --git a/Spigot-Server-Patches/0217-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0216-Allow-spawning-Item-entities-with-World.spawnEntity.patch similarity index 100% rename from Spigot-Server-Patches/0217-Allow-spawning-Item-entities-with-World.spawnEntity.patch rename to Spigot-Server-Patches/0216-Allow-spawning-Item-entities-with-World.spawnEntity.patch diff --git a/Spigot-Server-Patches/0218-WitchReadyPotionEvent.patch b/Spigot-Server-Patches/0217-WitchReadyPotionEvent.patch similarity index 100% rename from Spigot-Server-Patches/0218-WitchReadyPotionEvent.patch rename to Spigot-Server-Patches/0217-WitchReadyPotionEvent.patch diff --git a/Spigot-Server-Patches/0219-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0218-ItemStack-getMaxItemUseDuration.patch similarity index 100% rename from Spigot-Server-Patches/0219-ItemStack-getMaxItemUseDuration.patch rename to Spigot-Server-Patches/0218-ItemStack-getMaxItemUseDuration.patch diff --git a/Spigot-Server-Patches/0220-Implement-EntityTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0219-Implement-EntityTeleportEndGatewayEvent.patch similarity index 100% rename from Spigot-Server-Patches/0220-Implement-EntityTeleportEndGatewayEvent.patch rename to Spigot-Server-Patches/0219-Implement-EntityTeleportEndGatewayEvent.patch diff --git a/Spigot-Server-Patches/0221-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/Spigot-Server-Patches/0220-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch similarity index 100% rename from Spigot-Server-Patches/0221-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch rename to Spigot-Server-Patches/0220-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch diff --git a/Spigot-Server-Patches/0222-Fix-CraftEntity-hashCode.patch b/Spigot-Server-Patches/0221-Fix-CraftEntity-hashCode.patch similarity index 100% rename from Spigot-Server-Patches/0222-Fix-CraftEntity-hashCode.patch rename to Spigot-Server-Patches/0221-Fix-CraftEntity-hashCode.patch diff --git a/Spigot-Server-Patches/0223-Configurable-Alternative-LootPool-Luck-Formula.patch b/Spigot-Server-Patches/0222-Configurable-Alternative-LootPool-Luck-Formula.patch similarity index 100% rename from Spigot-Server-Patches/0223-Configurable-Alternative-LootPool-Luck-Formula.patch rename to Spigot-Server-Patches/0222-Configurable-Alternative-LootPool-Luck-Formula.patch diff --git a/Spigot-Server-Patches/0224-Print-Error-details-when-failing-to-save-player-data.patch b/Spigot-Server-Patches/0223-Print-Error-details-when-failing-to-save-player-data.patch similarity index 100% rename from Spigot-Server-Patches/0224-Print-Error-details-when-failing-to-save-player-data.patch rename to Spigot-Server-Patches/0223-Print-Error-details-when-failing-to-save-player-data.patch diff --git a/Spigot-Server-Patches/0225-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0224-Make-shield-blocking-delay-configurable.patch similarity index 100% rename from Spigot-Server-Patches/0225-Make-shield-blocking-delay-configurable.patch rename to Spigot-Server-Patches/0224-Make-shield-blocking-delay-configurable.patch diff --git a/Spigot-Server-Patches/0226-Improve-EntityShootBowEvent.patch b/Spigot-Server-Patches/0225-Improve-EntityShootBowEvent.patch similarity index 100% rename from Spigot-Server-Patches/0226-Improve-EntityShootBowEvent.patch rename to Spigot-Server-Patches/0225-Improve-EntityShootBowEvent.patch diff --git a/Spigot-Server-Patches/0227-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0226-PlayerReadyArrowEvent.patch similarity index 100% rename from Spigot-Server-Patches/0227-PlayerReadyArrowEvent.patch rename to Spigot-Server-Patches/0226-PlayerReadyArrowEvent.patch diff --git a/Spigot-Server-Patches/0228-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0227-Implement-EntityKnockbackByEntityEvent.patch similarity index 100% rename from Spigot-Server-Patches/0228-Implement-EntityKnockbackByEntityEvent.patch rename to Spigot-Server-Patches/0227-Implement-EntityKnockbackByEntityEvent.patch diff --git a/Spigot-Server-Patches/0229-Expand-Explosions-API.patch b/Spigot-Server-Patches/0228-Expand-Explosions-API.patch similarity index 100% rename from Spigot-Server-Patches/0229-Expand-Explosions-API.patch rename to Spigot-Server-Patches/0228-Expand-Explosions-API.patch diff --git a/Spigot-Server-Patches/0230-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0229-LivingEntity-Hand-Raised-Item-Use-API.patch similarity index 100% rename from Spigot-Server-Patches/0230-LivingEntity-Hand-Raised-Item-Use-API.patch rename to Spigot-Server-Patches/0229-LivingEntity-Hand-Raised-Item-Use-API.patch diff --git a/Spigot-Server-Patches/0231-RangedEntity-API.patch b/Spigot-Server-Patches/0230-RangedEntity-API.patch similarity index 100% rename from Spigot-Server-Patches/0231-RangedEntity-API.patch rename to Spigot-Server-Patches/0230-RangedEntity-API.patch diff --git a/Spigot-Server-Patches/0232-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0231-Add-config-to-disable-ender-dragon-legacy-check.patch similarity index 100% rename from Spigot-Server-Patches/0232-Add-config-to-disable-ender-dragon-legacy-check.patch rename to Spigot-Server-Patches/0231-Add-config-to-disable-ender-dragon-legacy-check.patch diff --git a/Spigot-Server-Patches/0233-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0232-Implement-World.getEntity-UUID-API.patch similarity index 100% rename from Spigot-Server-Patches/0233-Implement-World.getEntity-UUID-API.patch rename to Spigot-Server-Patches/0232-Implement-World.getEntity-UUID-API.patch diff --git a/Spigot-Server-Patches/0234-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0233-InventoryCloseEvent-Reason-API.patch similarity index 99% rename from Spigot-Server-Patches/0234-InventoryCloseEvent-Reason-API.patch rename to Spigot-Server-Patches/0233-InventoryCloseEvent-Reason-API.patch index f721c4bf4d..9865a04ec2 100644 --- a/Spigot-Server-Patches/0234-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-Server-Patches/0233-InventoryCloseEvent-Reason-API.patch @@ -180,7 +180,7 @@ index a1c318aa6501d9d0bdd53dc1fb8a99b7a782b4ce..ebcd2d043b3e6cf90b62eda1ea7a2d8c @Override public boolean isBlocking() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index c24a0c6bd72b4b2cbc2432d5e1651c3c396e4baf..8092fba753f08b31edfd457960b8edc3578fb3ca 100644 +index 0499a13549d19e9c81b4042219d8996fe1d86ae3..0a9e4dd47660748a80c40a2790ee197ceeb346b0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -813,7 +813,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0235-Vex-getSummoner-API.patch b/Spigot-Server-Patches/0234-Vex-getSummoner-API.patch similarity index 100% rename from Spigot-Server-Patches/0235-Vex-getSummoner-API.patch rename to Spigot-Server-Patches/0234-Vex-getSummoner-API.patch diff --git a/Spigot-Server-Patches/0236-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0235-Refresh-player-inventory-when-cancelling-PlayerInter.patch similarity index 100% rename from Spigot-Server-Patches/0236-Refresh-player-inventory-when-cancelling-PlayerInter.patch rename to Spigot-Server-Patches/0235-Refresh-player-inventory-when-cancelling-PlayerInter.patch diff --git a/Spigot-Server-Patches/0237-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0236-Don-t-change-the-Entity-Random-seed-for-squids.patch similarity index 100% rename from Spigot-Server-Patches/0237-Don-t-change-the-Entity-Random-seed-for-squids.patch rename to Spigot-Server-Patches/0236-Don-t-change-the-Entity-Random-seed-for-squids.patch diff --git a/Spigot-Server-Patches/0238-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0237-Re-add-vanilla-entity-warnings-for-duplicates.patch similarity index 100% rename from Spigot-Server-Patches/0238-Re-add-vanilla-entity-warnings-for-duplicates.patch rename to Spigot-Server-Patches/0237-Re-add-vanilla-entity-warnings-for-duplicates.patch diff --git a/Spigot-Server-Patches/0239-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/Spigot-Server-Patches/0238-Avoid-item-merge-if-stack-size-above-max-stack-size.patch similarity index 100% rename from Spigot-Server-Patches/0239-Avoid-item-merge-if-stack-size-above-max-stack-size.patch rename to Spigot-Server-Patches/0238-Avoid-item-merge-if-stack-size-above-max-stack-size.patch diff --git a/Spigot-Server-Patches/0240-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0239-Use-asynchronous-Log4j-2-loggers.patch similarity index 100% rename from Spigot-Server-Patches/0240-Use-asynchronous-Log4j-2-loggers.patch rename to Spigot-Server-Patches/0239-Use-asynchronous-Log4j-2-loggers.patch diff --git a/Spigot-Server-Patches/0241-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0240-add-more-information-to-Entity.toString.patch similarity index 100% rename from Spigot-Server-Patches/0241-add-more-information-to-Entity.toString.patch rename to Spigot-Server-Patches/0240-add-more-information-to-Entity.toString.patch diff --git a/Spigot-Server-Patches/0242-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0241-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch similarity index 100% rename from Spigot-Server-Patches/0242-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch rename to Spigot-Server-Patches/0241-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch diff --git a/Spigot-Server-Patches/0243-EnderDragon-Events.patch b/Spigot-Server-Patches/0242-EnderDragon-Events.patch similarity index 100% rename from Spigot-Server-Patches/0243-EnderDragon-Events.patch rename to Spigot-Server-Patches/0242-EnderDragon-Events.patch diff --git a/Spigot-Server-Patches/0244-PlayerElytraBoostEvent.patch b/Spigot-Server-Patches/0243-PlayerElytraBoostEvent.patch similarity index 100% rename from Spigot-Server-Patches/0244-PlayerElytraBoostEvent.patch rename to Spigot-Server-Patches/0243-PlayerElytraBoostEvent.patch diff --git a/Spigot-Server-Patches/0245-Improve-BlockPosition-inlining.patch b/Spigot-Server-Patches/0244-Improve-BlockPosition-inlining.patch similarity index 100% rename from Spigot-Server-Patches/0245-Improve-BlockPosition-inlining.patch rename to Spigot-Server-Patches/0244-Improve-BlockPosition-inlining.patch diff --git a/Spigot-Server-Patches/0246-Optimize-RegistryID.c.patch b/Spigot-Server-Patches/0245-Optimize-RegistryID.c.patch similarity index 100% rename from Spigot-Server-Patches/0246-Optimize-RegistryID.c.patch rename to Spigot-Server-Patches/0245-Optimize-RegistryID.c.patch diff --git a/Spigot-Server-Patches/0247-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0246-Option-to-prevent-armor-stands-from-doing-entity-loo.patch similarity index 100% rename from Spigot-Server-Patches/0247-Option-to-prevent-armor-stands-from-doing-entity-loo.patch rename to Spigot-Server-Patches/0246-Option-to-prevent-armor-stands-from-doing-entity-loo.patch diff --git a/Spigot-Server-Patches/0248-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0247-Vanished-players-don-t-have-rights.patch similarity index 100% rename from Spigot-Server-Patches/0248-Vanished-players-don-t-have-rights.patch rename to Spigot-Server-Patches/0247-Vanished-players-don-t-have-rights.patch diff --git a/Spigot-Server-Patches/0249-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0248-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch similarity index 100% rename from Spigot-Server-Patches/0249-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch rename to Spigot-Server-Patches/0248-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch diff --git a/Spigot-Server-Patches/0250-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0249-Add-some-Debug-to-Chunk-Entity-slices.patch similarity index 100% rename from Spigot-Server-Patches/0250-Add-some-Debug-to-Chunk-Entity-slices.patch rename to Spigot-Server-Patches/0249-Add-some-Debug-to-Chunk-Entity-slices.patch diff --git a/Spigot-Server-Patches/0251-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0250-SkeletonHorse-Additions.patch similarity index 100% rename from Spigot-Server-Patches/0251-SkeletonHorse-Additions.patch rename to Spigot-Server-Patches/0250-SkeletonHorse-Additions.patch diff --git a/Spigot-Server-Patches/0252-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0251-Prevent-Saving-Bad-entities-to-chunks.patch similarity index 100% rename from Spigot-Server-Patches/0252-Prevent-Saving-Bad-entities-to-chunks.patch rename to Spigot-Server-Patches/0251-Prevent-Saving-Bad-entities-to-chunks.patch diff --git a/Spigot-Server-Patches/0253-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0252-Don-t-call-getItemMeta-on-hasItemMeta.patch similarity index 100% rename from Spigot-Server-Patches/0253-Don-t-call-getItemMeta-on-hasItemMeta.patch rename to Spigot-Server-Patches/0252-Don-t-call-getItemMeta-on-hasItemMeta.patch diff --git a/Spigot-Server-Patches/0254-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0253-Ignore-Dead-Entities-in-entityList-iteration.patch similarity index 100% rename from Spigot-Server-Patches/0254-Ignore-Dead-Entities-in-entityList-iteration.patch rename to Spigot-Server-Patches/0253-Ignore-Dead-Entities-in-entityList-iteration.patch diff --git a/Spigot-Server-Patches/0255-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0254-Implement-Expanded-ArmorStand-API.patch similarity index 100% rename from Spigot-Server-Patches/0255-Implement-Expanded-ArmorStand-API.patch rename to Spigot-Server-Patches/0254-Implement-Expanded-ArmorStand-API.patch diff --git a/Spigot-Server-Patches/0256-AnvilDamageEvent.patch b/Spigot-Server-Patches/0255-AnvilDamageEvent.patch similarity index 100% rename from Spigot-Server-Patches/0256-AnvilDamageEvent.patch rename to Spigot-Server-Patches/0255-AnvilDamageEvent.patch diff --git a/Spigot-Server-Patches/0257-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0256-Add-TNTPrimeEvent.patch similarity index 100% rename from Spigot-Server-Patches/0257-Add-TNTPrimeEvent.patch rename to Spigot-Server-Patches/0256-Add-TNTPrimeEvent.patch diff --git a/Spigot-Server-Patches/0258-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0257-Break-up-and-make-tab-spam-limits-configurable.patch similarity index 100% rename from Spigot-Server-Patches/0258-Break-up-and-make-tab-spam-limits-configurable.patch rename to Spigot-Server-Patches/0257-Break-up-and-make-tab-spam-limits-configurable.patch diff --git a/Spigot-Server-Patches/0259-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0258-Add-hand-to-bucket-events.patch similarity index 100% rename from Spigot-Server-Patches/0259-Add-hand-to-bucket-events.patch rename to Spigot-Server-Patches/0258-Add-hand-to-bucket-events.patch diff --git a/Spigot-Server-Patches/0260-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0259-MC-135506-Experience-should-save-as-Integers.patch similarity index 100% rename from Spigot-Server-Patches/0260-MC-135506-Experience-should-save-as-Integers.patch rename to Spigot-Server-Patches/0259-MC-135506-Experience-should-save-as-Integers.patch diff --git a/Spigot-Server-Patches/0261-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0260-Fix-client-rendering-skulls-from-same-user.patch similarity index 100% rename from Spigot-Server-Patches/0261-Fix-client-rendering-skulls-from-same-user.patch rename to Spigot-Server-Patches/0260-Fix-client-rendering-skulls-from-same-user.patch diff --git a/Spigot-Server-Patches/0262-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0261-Add-Early-Warning-Feature-to-WatchDog.patch similarity index 100% rename from Spigot-Server-Patches/0262-Add-Early-Warning-Feature-to-WatchDog.patch rename to Spigot-Server-Patches/0261-Add-Early-Warning-Feature-to-WatchDog.patch diff --git a/Spigot-Server-Patches/0263-Make-EnderDragon-implement-Mob.patch b/Spigot-Server-Patches/0262-Make-EnderDragon-implement-Mob.patch similarity index 100% rename from Spigot-Server-Patches/0263-Make-EnderDragon-implement-Mob.patch rename to Spigot-Server-Patches/0262-Make-EnderDragon-implement-Mob.patch diff --git a/Spigot-Server-Patches/0264-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0263-Use-ConcurrentHashMap-in-JsonList.patch similarity index 98% rename from Spigot-Server-Patches/0264-Use-ConcurrentHashMap-in-JsonList.patch rename to Spigot-Server-Patches/0263-Use-ConcurrentHashMap-in-JsonList.patch index 512da0ab41..8681169662 100644 --- a/Spigot-Server-Patches/0264-Use-ConcurrentHashMap-in-JsonList.patch +++ b/Spigot-Server-Patches/0263-Use-ConcurrentHashMap-in-JsonList.patch @@ -122,7 +122,7 @@ index 5b01e4edb3c0f8bc785b70128cbe31b14356e4fb..9213bfb78e92b838189161045e394558 this.d.values().stream().map((jsonlistentry) -> { diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 129f4095cb98e1e4295b9a12105d06e239d96f6b..9a552465a262238614a6ee2a7e9118f9866d2441 100644 +index 020cd10518328b81495e44b816446c96bfe1bdcc..304ef7279f649dd8c51a68084b839c3092e5872e 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -546,7 +546,7 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0265-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0264-Use-a-Queue-for-Queueing-Commands.patch similarity index 100% rename from Spigot-Server-Patches/0265-Use-a-Queue-for-Queueing-Commands.patch rename to Spigot-Server-Patches/0264-Use-a-Queue-for-Queueing-Commands.patch diff --git a/Spigot-Server-Patches/0266-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0265-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch similarity index 100% rename from Spigot-Server-Patches/0266-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch rename to Spigot-Server-Patches/0265-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch diff --git a/Spigot-Server-Patches/0267-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0266-Allow-disabling-armour-stand-ticking.patch similarity index 100% rename from Spigot-Server-Patches/0267-Allow-disabling-armour-stand-ticking.patch rename to Spigot-Server-Patches/0266-Allow-disabling-armour-stand-ticking.patch diff --git a/Spigot-Server-Patches/0268-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0267-Optimize-BlockPosition-helper-methods.patch similarity index 100% rename from Spigot-Server-Patches/0268-Optimize-BlockPosition-helper-methods.patch rename to Spigot-Server-Patches/0267-Optimize-BlockPosition-helper-methods.patch diff --git a/Spigot-Server-Patches/0269-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0268-Restore-vanlla-default-mob-spawn-range.patch similarity index 100% rename from Spigot-Server-Patches/0269-Restore-vanlla-default-mob-spawn-range.patch rename to Spigot-Server-Patches/0268-Restore-vanlla-default-mob-spawn-range.patch diff --git a/Spigot-Server-Patches/0270-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0269-Slime-Pathfinder-Events.patch similarity index 100% rename from Spigot-Server-Patches/0270-Slime-Pathfinder-Events.patch rename to Spigot-Server-Patches/0269-Slime-Pathfinder-Events.patch diff --git a/Spigot-Server-Patches/0271-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0270-Configurable-speed-for-water-flowing-over-lava.patch similarity index 100% rename from Spigot-Server-Patches/0271-Configurable-speed-for-water-flowing-over-lava.patch rename to Spigot-Server-Patches/0270-Configurable-speed-for-water-flowing-over-lava.patch diff --git a/Spigot-Server-Patches/0272-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0271-Optimize-CraftBlockData-Creation.patch similarity index 100% rename from Spigot-Server-Patches/0272-Optimize-CraftBlockData-Creation.patch rename to Spigot-Server-Patches/0271-Optimize-CraftBlockData-Creation.patch diff --git a/Spigot-Server-Patches/0273-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0272-Optimize-RegistryMaterials.patch similarity index 100% rename from Spigot-Server-Patches/0273-Optimize-RegistryMaterials.patch rename to Spigot-Server-Patches/0272-Optimize-RegistryMaterials.patch diff --git a/Spigot-Server-Patches/0274-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0273-Add-PhantomPreSpawnEvent.patch similarity index 100% rename from Spigot-Server-Patches/0274-Add-PhantomPreSpawnEvent.patch rename to Spigot-Server-Patches/0273-Add-PhantomPreSpawnEvent.patch diff --git a/Spigot-Server-Patches/0275-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0274-Add-More-Creeper-API.patch similarity index 100% rename from Spigot-Server-Patches/0275-Add-More-Creeper-API.patch rename to Spigot-Server-Patches/0274-Add-More-Creeper-API.patch diff --git a/Spigot-Server-Patches/0276-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0275-Inventory-removeItemAnySlot.patch similarity index 100% rename from Spigot-Server-Patches/0276-Inventory-removeItemAnySlot.patch rename to Spigot-Server-Patches/0275-Inventory-removeItemAnySlot.patch diff --git a/Spigot-Server-Patches/0277-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0276-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch similarity index 100% rename from Spigot-Server-Patches/0277-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch rename to Spigot-Server-Patches/0276-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch diff --git a/Spigot-Server-Patches/0278-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0277-Add-ray-tracing-methods-to-LivingEntity.patch similarity index 100% rename from Spigot-Server-Patches/0278-Add-ray-tracing-methods-to-LivingEntity.patch rename to Spigot-Server-Patches/0277-Add-ray-tracing-methods-to-LivingEntity.patch diff --git a/Spigot-Server-Patches/0279-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0278-Expose-attack-cooldown-methods-for-Player.patch similarity index 94% rename from Spigot-Server-Patches/0279-Expose-attack-cooldown-methods-for-Player.patch rename to Spigot-Server-Patches/0278-Expose-attack-cooldown-methods-for-Player.patch index 6dd7b27c37..fcaf2804cb 100644 --- a/Spigot-Server-Patches/0279-Expose-attack-cooldown-methods-for-Player.patch +++ b/Spigot-Server-Patches/0278-Expose-attack-cooldown-methods-for-Player.patch @@ -17,7 +17,7 @@ index 73a33eff97d26e5b3542d787344013e18e52db68..6a46b9262ba34febc2664a6f56c18684 return (float) (1.0D / this.b(GenericAttributes.ATTACK_SPEED) * 20.0D); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 8092fba753f08b31edfd457960b8edc3578fb3ca..7976d943855e444746b9e6efca57bfefe28bb0b1 100644 +index 0a9e4dd47660748a80c40a2790ee197ceeb346b0..0f3fd7baf158923b30380eaa4be1c24114a8bd51 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1993,6 +1993,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0280-Improve-death-events.patch b/Spigot-Server-Patches/0279-Improve-death-events.patch similarity index 99% rename from Spigot-Server-Patches/0280-Improve-death-events.patch rename to Spigot-Server-Patches/0279-Improve-death-events.patch index d8a66b29ae..4cfe70ce58 100644 --- a/Spigot-Server-Patches/0280-Improve-death-events.patch +++ b/Spigot-Server-Patches/0279-Improve-death-events.patch @@ -352,7 +352,7 @@ index 9a2e6bedfc50fba10f37c01d825f80415bfb69d3..a4afe638515471159d505a5e402a9342 this.minecraftKey = minecraftKey; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 7976d943855e444746b9e6efca57bfefe28bb0b1..89553476d6dec092d04830c169b886d7868da3be 100644 +index 0f3fd7baf158923b30380eaa4be1c24114a8bd51..ef8396415cae1de269414e134d5fd02b43f3b729 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1784,7 +1784,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0281-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0280-Allow-chests-to-be-placed-with-NBT-data.patch similarity index 100% rename from Spigot-Server-Patches/0281-Allow-chests-to-be-placed-with-NBT-data.patch rename to Spigot-Server-Patches/0280-Allow-chests-to-be-placed-with-NBT-data.patch diff --git a/Spigot-Server-Patches/0282-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0281-Mob-Pathfinding-API.patch similarity index 100% rename from Spigot-Server-Patches/0282-Mob-Pathfinding-API.patch rename to Spigot-Server-Patches/0281-Mob-Pathfinding-API.patch diff --git a/Spigot-Server-Patches/0283-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0282-Prevent-chunk-loading-from-Fluid-Flowing.patch similarity index 100% rename from Spigot-Server-Patches/0283-Prevent-chunk-loading-from-Fluid-Flowing.patch rename to Spigot-Server-Patches/0282-Prevent-chunk-loading-from-Fluid-Flowing.patch diff --git a/Spigot-Server-Patches/0284-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0283-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch similarity index 100% rename from Spigot-Server-Patches/0284-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch rename to Spigot-Server-Patches/0283-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch diff --git a/Spigot-Server-Patches/0285-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0284-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch similarity index 100% rename from Spigot-Server-Patches/0285-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch rename to Spigot-Server-Patches/0284-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch diff --git a/Spigot-Server-Patches/0286-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0285-Prevent-mob-spawning-from-loading-generating-chunks.patch similarity index 95% rename from Spigot-Server-Patches/0286-Prevent-mob-spawning-from-loading-generating-chunks.patch rename to Spigot-Server-Patches/0285-Prevent-mob-spawning-from-loading-generating-chunks.patch index dbcd15f53a..b3883a3d56 100644 --- a/Spigot-Server-Patches/0286-Prevent-mob-spawning-from-loading-generating-chunks.patch +++ b/Spigot-Server-Patches/0285-Prevent-mob-spawning-from-loading-generating-chunks.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent mob spawning from loading/generating chunks also prevents if out of world border bounds diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index eb637c32f7a4faa99d30596c273e62ebffe74f3b..2561ba9b9c02ccb59bd7284ddfe62889911d4220 100644 +index 0ecdfd45073235b7b01e84f4490f17088c4ee675..60f0301747ff2363007791432471c20471d79f01 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -143,9 +143,9 @@ public final class SpawnerCreature { diff --git a/Spigot-Server-Patches/0287-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0286-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from Spigot-Server-Patches/0287-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to Spigot-Server-Patches/0286-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/Spigot-Server-Patches/0288-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0287-Implement-furnace-cook-speed-multiplier-API.patch similarity index 100% rename from Spigot-Server-Patches/0288-Implement-furnace-cook-speed-multiplier-API.patch rename to Spigot-Server-Patches/0287-Implement-furnace-cook-speed-multiplier-API.patch diff --git a/Spigot-Server-Patches/0289-PreSpawnerSpawnEvent.patch b/Spigot-Server-Patches/0288-PreSpawnerSpawnEvent.patch similarity index 100% rename from Spigot-Server-Patches/0289-PreSpawnerSpawnEvent.patch rename to Spigot-Server-Patches/0288-PreSpawnerSpawnEvent.patch diff --git a/Spigot-Server-Patches/0290-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0289-Catch-JsonParseException-in-Entity-and-TE-names.patch similarity index 100% rename from Spigot-Server-Patches/0290-Catch-JsonParseException-in-Entity-and-TE-names.patch rename to Spigot-Server-Patches/0289-Catch-JsonParseException-in-Entity-and-TE-names.patch diff --git a/Spigot-Server-Patches/0291-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0290-Honor-EntityAgeable.ageLock.patch similarity index 100% rename from Spigot-Server-Patches/0291-Honor-EntityAgeable.ageLock.patch rename to Spigot-Server-Patches/0290-Honor-EntityAgeable.ageLock.patch diff --git a/Spigot-Server-Patches/0292-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0291-Configurable-connection-throttle-kick-message.patch similarity index 100% rename from Spigot-Server-Patches/0292-Configurable-connection-throttle-kick-message.patch rename to Spigot-Server-Patches/0291-Configurable-connection-throttle-kick-message.patch diff --git a/Spigot-Server-Patches/0293-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0292-Hook-into-CB-plugin-rewrites.patch similarity index 100% rename from Spigot-Server-Patches/0293-Hook-into-CB-plugin-rewrites.patch rename to Spigot-Server-Patches/0292-Hook-into-CB-plugin-rewrites.patch diff --git a/Spigot-Server-Patches/0294-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0293-Allow-setting-the-vex-s-summoner.patch similarity index 100% rename from Spigot-Server-Patches/0294-Allow-setting-the-vex-s-summoner.patch rename to Spigot-Server-Patches/0293-Allow-setting-the-vex-s-summoner.patch diff --git a/Spigot-Server-Patches/0295-Add-sun-related-API.patch b/Spigot-Server-Patches/0294-Add-sun-related-API.patch similarity index 100% rename from Spigot-Server-Patches/0295-Add-sun-related-API.patch rename to Spigot-Server-Patches/0294-Add-sun-related-API.patch diff --git a/Spigot-Server-Patches/0296-Turtle-API.patch b/Spigot-Server-Patches/0295-Turtle-API.patch similarity index 100% rename from Spigot-Server-Patches/0296-Turtle-API.patch rename to Spigot-Server-Patches/0295-Turtle-API.patch diff --git a/Spigot-Server-Patches/0297-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0296-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch similarity index 100% rename from Spigot-Server-Patches/0297-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch rename to Spigot-Server-Patches/0296-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch diff --git a/Spigot-Server-Patches/0298-Call-player-spectator-target-events-and-improve-impl.patch b/Spigot-Server-Patches/0297-Call-player-spectator-target-events-and-improve-impl.patch similarity index 100% rename from Spigot-Server-Patches/0298-Call-player-spectator-target-events-and-improve-impl.patch rename to Spigot-Server-Patches/0297-Call-player-spectator-target-events-and-improve-impl.patch diff --git a/Spigot-Server-Patches/0299-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0298-Add-Velocity-IP-Forwarding-Support.patch similarity index 100% rename from Spigot-Server-Patches/0299-Add-Velocity-IP-Forwarding-Support.patch rename to Spigot-Server-Patches/0298-Add-Velocity-IP-Forwarding-Support.patch diff --git a/Spigot-Server-Patches/0300-Add-more-Witch-API.patch b/Spigot-Server-Patches/0299-Add-more-Witch-API.patch similarity index 100% rename from Spigot-Server-Patches/0300-Add-more-Witch-API.patch rename to Spigot-Server-Patches/0299-Add-more-Witch-API.patch diff --git a/Spigot-Server-Patches/0301-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0300-Check-Drowned-for-Villager-Aggression-Config.patch similarity index 100% rename from Spigot-Server-Patches/0301-Check-Drowned-for-Villager-Aggression-Config.patch rename to Spigot-Server-Patches/0300-Check-Drowned-for-Villager-Aggression-Config.patch diff --git a/Spigot-Server-Patches/0302-Here-s-Johnny.patch b/Spigot-Server-Patches/0301-Here-s-Johnny.patch similarity index 100% rename from Spigot-Server-Patches/0302-Here-s-Johnny.patch rename to Spigot-Server-Patches/0301-Here-s-Johnny.patch diff --git a/Spigot-Server-Patches/0303-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0302-Add-option-to-prevent-players-from-moving-into-unloa.patch similarity index 100% rename from Spigot-Server-Patches/0303-Add-option-to-prevent-players-from-moving-into-unloa.patch rename to Spigot-Server-Patches/0302-Add-option-to-prevent-players-from-moving-into-unloa.patch diff --git a/Spigot-Server-Patches/0304-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0303-Reset-players-airTicks-on-respawn.patch similarity index 100% rename from Spigot-Server-Patches/0304-Reset-players-airTicks-on-respawn.patch rename to Spigot-Server-Patches/0303-Reset-players-airTicks-on-respawn.patch diff --git a/Spigot-Server-Patches/0305-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0304-Don-t-sleep-after-profile-lookups-if-not-needed.patch similarity index 100% rename from Spigot-Server-Patches/0305-Don-t-sleep-after-profile-lookups-if-not-needed.patch rename to Spigot-Server-Patches/0304-Don-t-sleep-after-profile-lookups-if-not-needed.patch diff --git a/Spigot-Server-Patches/0306-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/Spigot-Server-Patches/0305-Improve-Server-Thread-Pool-and-Thread-Priorities.patch similarity index 100% rename from Spigot-Server-Patches/0306-Improve-Server-Thread-Pool-and-Thread-Priorities.patch rename to Spigot-Server-Patches/0305-Improve-Server-Thread-Pool-and-Thread-Priorities.patch diff --git a/Spigot-Server-Patches/0307-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0306-Optimize-World-Time-Updates.patch similarity index 100% rename from Spigot-Server-Patches/0307-Optimize-World-Time-Updates.patch rename to Spigot-Server-Patches/0306-Optimize-World-Time-Updates.patch diff --git a/Spigot-Server-Patches/0308-Restore-custom-InventoryHolder-support.patch b/Spigot-Server-Patches/0307-Restore-custom-InventoryHolder-support.patch similarity index 100% rename from Spigot-Server-Patches/0308-Restore-custom-InventoryHolder-support.patch rename to Spigot-Server-Patches/0307-Restore-custom-InventoryHolder-support.patch diff --git a/Spigot-Server-Patches/0309-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0308-Use-Vanilla-Minecart-Speeds.patch similarity index 100% rename from Spigot-Server-Patches/0309-Use-Vanilla-Minecart-Speeds.patch rename to Spigot-Server-Patches/0308-Use-Vanilla-Minecart-Speeds.patch diff --git a/Spigot-Server-Patches/0310-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0309-Fix-SpongeAbsortEvent-handling.patch similarity index 100% rename from Spigot-Server-Patches/0310-Fix-SpongeAbsortEvent-handling.patch rename to Spigot-Server-Patches/0309-Fix-SpongeAbsortEvent-handling.patch diff --git a/Spigot-Server-Patches/0311-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0310-Don-t-allow-digging-into-unloaded-chunks.patch similarity index 100% rename from Spigot-Server-Patches/0311-Don-t-allow-digging-into-unloaded-chunks.patch rename to Spigot-Server-Patches/0310-Don-t-allow-digging-into-unloaded-chunks.patch diff --git a/Spigot-Server-Patches/0312-Book-Size-Limits.patch b/Spigot-Server-Patches/0311-Book-Size-Limits.patch similarity index 100% rename from Spigot-Server-Patches/0312-Book-Size-Limits.patch rename to Spigot-Server-Patches/0311-Book-Size-Limits.patch diff --git a/Spigot-Server-Patches/0313-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0312-Make-the-default-permission-message-configurable.patch similarity index 100% rename from Spigot-Server-Patches/0313-Make-the-default-permission-message-configurable.patch rename to Spigot-Server-Patches/0312-Make-the-default-permission-message-configurable.patch diff --git a/Spigot-Server-Patches/0314-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0313-Prevent-rayTrace-from-loading-chunks.patch similarity index 100% rename from Spigot-Server-Patches/0314-Prevent-rayTrace-from-loading-chunks.patch rename to Spigot-Server-Patches/0313-Prevent-rayTrace-from-loading-chunks.patch diff --git a/Spigot-Server-Patches/0315-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0314-Handle-Large-Packets-disconnecting-client.patch similarity index 100% rename from Spigot-Server-Patches/0315-Handle-Large-Packets-disconnecting-client.patch rename to Spigot-Server-Patches/0314-Handle-Large-Packets-disconnecting-client.patch diff --git a/Spigot-Server-Patches/0316-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0315-force-entity-dismount-during-teleportation.patch similarity index 100% rename from Spigot-Server-Patches/0316-force-entity-dismount-during-teleportation.patch rename to Spigot-Server-Patches/0315-force-entity-dismount-during-teleportation.patch diff --git a/Spigot-Server-Patches/0317-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0316-Add-more-Zombie-API.patch similarity index 100% rename from Spigot-Server-Patches/0317-Add-more-Zombie-API.patch rename to Spigot-Server-Patches/0316-Add-more-Zombie-API.patch diff --git a/Spigot-Server-Patches/0318-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0317-Add-PlayerConnectionCloseEvent.patch similarity index 100% rename from Spigot-Server-Patches/0318-Add-PlayerConnectionCloseEvent.patch rename to Spigot-Server-Patches/0317-Add-PlayerConnectionCloseEvent.patch diff --git a/Spigot-Server-Patches/0319-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0318-Prevent-Enderman-from-loading-chunks.patch similarity index 100% rename from Spigot-Server-Patches/0319-Prevent-Enderman-from-loading-chunks.patch rename to Spigot-Server-Patches/0318-Prevent-Enderman-from-loading-chunks.patch diff --git a/Spigot-Server-Patches/0320-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0319-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 97% rename from Spigot-Server-Patches/0320-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to Spigot-Server-Patches/0319-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch index 95f1e2887f..a14d23bf44 100644 --- a/Spigot-Server-Patches/0320-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch +++ b/Spigot-Server-Patches/0319-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch @@ -28,7 +28,7 @@ index 0925bd03f0be1e8addef7c6ea28537ab34ede6a5..6dab9aec89fa0aa0103bf3f3a63aaf5d public boolean queueHealthUpdatePacket = false; public net.minecraft.server.PacketPlayOutUpdateHealth queuedHealthUpdatePacket; diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 9a552465a262238614a6ee2a7e9118f9866d2441..3af77481c1f4671602058be8f34504b302e20c9c 100644 +index 304ef7279f649dd8c51a68084b839c3092e5872e..ed4aafc01f5befce2e5a3d6a562c6a1c866b2378 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -97,6 +97,7 @@ public abstract class PlayerList { @@ -106,7 +106,7 @@ index 00333548b470435aa89fb0f4b29047eb1461e992..5770d4183c1b9ab6119a25930283c023 public Location getBedSpawnLocation() { NBTTagCompound data = getData(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 89553476d6dec092d04830c169b886d7868da3be..3d9720498e4758df71d80d1c8ec092edbe1de49d 100644 +index ef8396415cae1de269414e134d5fd02b43f3b729..08512916fd14e3795d021f4b4c9212e4d6efaed2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -142,6 +142,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0321-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0320-Workaround-for-vehicle-tracking-issue-on-disconnect.patch similarity index 100% rename from Spigot-Server-Patches/0321-Workaround-for-vehicle-tracking-issue-on-disconnect.patch rename to Spigot-Server-Patches/0320-Workaround-for-vehicle-tracking-issue-on-disconnect.patch diff --git a/Spigot-Server-Patches/0322-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/Spigot-Server-Patches/0321-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch similarity index 100% rename from Spigot-Server-Patches/0322-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch rename to Spigot-Server-Patches/0321-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch diff --git a/Spigot-Server-Patches/0323-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0322-Block-Entity-remove-from-being-called-on-Players.patch similarity index 93% rename from Spigot-Server-Patches/0323-Block-Entity-remove-from-being-called-on-Players.patch rename to Spigot-Server-Patches/0322-Block-Entity-remove-from-being-called-on-Players.patch index 43f36003eb..22de3c841c 100644 --- a/Spigot-Server-Patches/0323-Block-Entity-remove-from-being-called-on-Players.patch +++ b/Spigot-Server-Patches/0322-Block-Entity-remove-from-being-called-on-Players.patch @@ -12,7 +12,7 @@ Player we will look at limiting the scope of this change. It appears to be unintentional in the few cases we've seen so far. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 3d9720498e4758df71d80d1c8ec092edbe1de49d..602eeb3455bbc161070b000cf4a7a61611b8140e 100644 +index 08512916fd14e3795d021f4b4c9212e4d6efaed2..f153c2d75768effe846789618732b3e212a2b8d3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2038,6 +2038,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0324-BlockDestroyEvent.patch b/Spigot-Server-Patches/0323-BlockDestroyEvent.patch similarity index 100% rename from Spigot-Server-Patches/0324-BlockDestroyEvent.patch rename to Spigot-Server-Patches/0323-BlockDestroyEvent.patch diff --git a/Spigot-Server-Patches/0325-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/Spigot-Server-Patches/0324-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch similarity index 100% rename from Spigot-Server-Patches/0325-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch rename to Spigot-Server-Patches/0324-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch diff --git a/Spigot-Server-Patches/0326-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0325-Fix-sign-edit-memory-leak.patch similarity index 100% rename from Spigot-Server-Patches/0326-Fix-sign-edit-memory-leak.patch rename to Spigot-Server-Patches/0325-Fix-sign-edit-memory-leak.patch diff --git a/Spigot-Server-Patches/0327-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0326-Limit-Client-Sign-length-more.patch similarity index 100% rename from Spigot-Server-Patches/0327-Limit-Client-Sign-length-more.patch rename to Spigot-Server-Patches/0326-Limit-Client-Sign-length-more.patch diff --git a/Spigot-Server-Patches/0328-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/Spigot-Server-Patches/0327-Don-t-check-ConvertSigns-boolean-every-sign-save.patch similarity index 100% rename from Spigot-Server-Patches/0328-Don-t-check-ConvertSigns-boolean-every-sign-save.patch rename to Spigot-Server-Patches/0327-Don-t-check-ConvertSigns-boolean-every-sign-save.patch diff --git a/Spigot-Server-Patches/0329-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/Spigot-Server-Patches/0328-Optimize-Network-Manager-and-add-advanced-packet-sup.patch similarity index 100% rename from Spigot-Server-Patches/0329-Optimize-Network-Manager-and-add-advanced-packet-sup.patch rename to Spigot-Server-Patches/0328-Optimize-Network-Manager-and-add-advanced-packet-sup.patch diff --git a/Spigot-Server-Patches/0330-Handle-Oversized-Tile-Entities-in-chunks.patch b/Spigot-Server-Patches/0329-Handle-Oversized-Tile-Entities-in-chunks.patch similarity index 100% rename from Spigot-Server-Patches/0330-Handle-Oversized-Tile-Entities-in-chunks.patch rename to Spigot-Server-Patches/0329-Handle-Oversized-Tile-Entities-in-chunks.patch diff --git a/Spigot-Server-Patches/0331-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0330-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch similarity index 94% rename from Spigot-Server-Patches/0331-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch rename to Spigot-Server-Patches/0330-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch index 4d2c959aaa..ff3c410987 100644 --- a/Spigot-Server-Patches/0331-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch +++ b/Spigot-Server-Patches/0330-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch @@ -11,7 +11,7 @@ everything to the Whitelist object. https://github.com/PaperMC/Paper/issues/1880 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 3af77481c1f4671602058be8f34504b302e20c9c..4f6784a80cd385dcc73b2b00b3865e8ce6546a9a 100644 +index ed4aafc01f5befce2e5a3d6a562c6a1c866b2378..da345d7f1acd22441c2542d4f0268cd1b717a3e6 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -944,9 +944,9 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0332-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0331-Set-Zombie-last-tick-at-start-of-drowning-process.patch similarity index 100% rename from Spigot-Server-Patches/0332-Set-Zombie-last-tick-at-start-of-drowning-process.patch rename to Spigot-Server-Patches/0331-Set-Zombie-last-tick-at-start-of-drowning-process.patch diff --git a/Spigot-Server-Patches/0333-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0332-Allow-Saving-of-Oversized-Chunks.patch similarity index 100% rename from Spigot-Server-Patches/0333-Allow-Saving-of-Oversized-Chunks.patch rename to Spigot-Server-Patches/0332-Allow-Saving-of-Oversized-Chunks.patch diff --git a/Spigot-Server-Patches/0334-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0333-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch similarity index 88% rename from Spigot-Server-Patches/0334-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch rename to Spigot-Server-Patches/0333-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch index d81b4ed9bc..e9f146ac1a 100644 --- a/Spigot-Server-Patches/0334-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch +++ b/Spigot-Server-Patches/0333-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 4f6784a80cd385dcc73b2b00b3865e8ce6546a9a..19d8497d691e0ec6f4451298dcf4b4831062d5ed 100644 +index da345d7f1acd22441c2542d4f0268cd1b717a3e6..b6e8cd15fe2893ecde4c227f4fc28fcd07600f7c 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1062,6 +1062,7 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0335-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0334-Add-LivingEntity-getTargetEntity.patch similarity index 100% rename from Spigot-Server-Patches/0335-Add-LivingEntity-getTargetEntity.patch rename to Spigot-Server-Patches/0334-Add-LivingEntity-getTargetEntity.patch diff --git a/Spigot-Server-Patches/0336-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/Spigot-Server-Patches/0335-Use-proper-max-length-when-serialising-BungeeCord-te.patch similarity index 100% rename from Spigot-Server-Patches/0336-Use-proper-max-length-when-serialising-BungeeCord-te.patch rename to Spigot-Server-Patches/0335-Use-proper-max-length-when-serialising-BungeeCord-te.patch diff --git a/Spigot-Server-Patches/0337-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0336-Entity-getEntitySpawnReason.patch similarity index 100% rename from Spigot-Server-Patches/0337-Entity-getEntitySpawnReason.patch rename to Spigot-Server-Patches/0336-Entity-getEntitySpawnReason.patch diff --git a/Spigot-Server-Patches/0338-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0337-Update-entity-Metadata-for-all-tracked-players.patch similarity index 100% rename from Spigot-Server-Patches/0338-Update-entity-Metadata-for-all-tracked-players.patch rename to Spigot-Server-Patches/0337-Update-entity-Metadata-for-all-tracked-players.patch diff --git a/Spigot-Server-Patches/0339-Implement-PlayerPostRespawnEvent.patch b/Spigot-Server-Patches/0338-Implement-PlayerPostRespawnEvent.patch similarity index 95% rename from Spigot-Server-Patches/0339-Implement-PlayerPostRespawnEvent.patch rename to Spigot-Server-Patches/0338-Implement-PlayerPostRespawnEvent.patch index 1c16817f56..d4940aaaec 100644 --- a/Spigot-Server-Patches/0339-Implement-PlayerPostRespawnEvent.patch +++ b/Spigot-Server-Patches/0338-Implement-PlayerPostRespawnEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerPostRespawnEvent diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 5b2cecba3569a35ba259427747a8d39f51d1c8cb..fe1827d65d616322e6b540b18fff5bf32e0638ac 100644 +index 625a2b2d0c71c40fa44429b00f0391aac7bce277..a6aae6740c62f269e46db4a082fd983190deb290 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -668,9 +668,14 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0340-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/Spigot-Server-Patches/0339-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch similarity index 100% rename from Spigot-Server-Patches/0340-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch rename to Spigot-Server-Patches/0339-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch diff --git a/Spigot-Server-Patches/0341-Server-Tick-Events.patch b/Spigot-Server-Patches/0340-Server-Tick-Events.patch similarity index 100% rename from Spigot-Server-Patches/0341-Server-Tick-Events.patch rename to Spigot-Server-Patches/0340-Server-Tick-Events.patch diff --git a/Spigot-Server-Patches/0342-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-Server-Patches/0341-PlayerDeathEvent-getItemsToKeep.patch similarity index 100% rename from Spigot-Server-Patches/0342-PlayerDeathEvent-getItemsToKeep.patch rename to Spigot-Server-Patches/0341-PlayerDeathEvent-getItemsToKeep.patch diff --git a/Spigot-Server-Patches/0343-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0342-Optimize-Captured-TileEntity-Lookup.patch similarity index 100% rename from Spigot-Server-Patches/0343-Optimize-Captured-TileEntity-Lookup.patch rename to Spigot-Server-Patches/0342-Optimize-Captured-TileEntity-Lookup.patch diff --git a/Spigot-Server-Patches/0344-Add-Heightmap-API.patch b/Spigot-Server-Patches/0343-Add-Heightmap-API.patch similarity index 100% rename from Spigot-Server-Patches/0344-Add-Heightmap-API.patch rename to Spigot-Server-Patches/0343-Add-Heightmap-API.patch diff --git a/Spigot-Server-Patches/0345-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0344-Mob-Spawner-API-Enhancements.patch similarity index 100% rename from Spigot-Server-Patches/0345-Mob-Spawner-API-Enhancements.patch rename to Spigot-Server-Patches/0344-Mob-Spawner-API-Enhancements.patch diff --git a/Spigot-Server-Patches/0346-Per-Player-View-Distance-API-placeholders.patch b/Spigot-Server-Patches/0345-Per-Player-View-Distance-API-placeholders.patch similarity index 97% rename from Spigot-Server-Patches/0346-Per-Player-View-Distance-API-placeholders.patch rename to Spigot-Server-Patches/0345-Per-Player-View-Distance-API-placeholders.patch index 335e2c9096..d3d8736e1d 100644 --- a/Spigot-Server-Patches/0346-Per-Player-View-Distance-API-placeholders.patch +++ b/Spigot-Server-Patches/0345-Per-Player-View-Distance-API-placeholders.patch @@ -40,7 +40,7 @@ index ad5a7cbe83fb61b79203369895e82edca2ffcb72..06cf8ca80c314b7c236984c7f6236533 double deltaZ = this.locZ() - player.locZ(); double distanceSquared = deltaX * deltaX + deltaZ * deltaZ; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 602eeb3455bbc161070b000cf4a7a61611b8140e..fa4f2df4a669df838e5c553a21b9291ed7d6b32f 100644 +index f153c2d75768effe846789618732b3e212a2b8d3..1eaf0a0303e6d687d9626d1ffcca41d9169341a8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2047,6 +2047,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0347-Fix-CB-call-to-changed-postToMainThread-method.patch b/Spigot-Server-Patches/0346-Fix-CB-call-to-changed-postToMainThread-method.patch similarity index 100% rename from Spigot-Server-Patches/0347-Fix-CB-call-to-changed-postToMainThread-method.patch rename to Spigot-Server-Patches/0346-Fix-CB-call-to-changed-postToMainThread-method.patch diff --git a/Spigot-Server-Patches/0348-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/Spigot-Server-Patches/0347-Fix-sounds-when-item-frames-are-modified-MC-123450.patch similarity index 100% rename from Spigot-Server-Patches/0348-Fix-sounds-when-item-frames-are-modified-MC-123450.patch rename to Spigot-Server-Patches/0347-Fix-sounds-when-item-frames-are-modified-MC-123450.patch diff --git a/Spigot-Server-Patches/0349-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/Spigot-Server-Patches/0348-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch similarity index 100% rename from Spigot-Server-Patches/0349-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch rename to Spigot-Server-Patches/0348-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch diff --git a/Spigot-Server-Patches/0350-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch b/Spigot-Server-Patches/0349-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch similarity index 100% rename from Spigot-Server-Patches/0350-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch rename to Spigot-Server-Patches/0349-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch diff --git a/Spigot-Server-Patches/0351-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0350-Duplicate-UUID-Resolve-Option.patch similarity index 100% rename from Spigot-Server-Patches/0351-Duplicate-UUID-Resolve-Option.patch rename to Spigot-Server-Patches/0350-Duplicate-UUID-Resolve-Option.patch diff --git a/Spigot-Server-Patches/0352-improve-CraftWorld-isChunkLoaded.patch b/Spigot-Server-Patches/0351-improve-CraftWorld-isChunkLoaded.patch similarity index 100% rename from Spigot-Server-Patches/0352-improve-CraftWorld-isChunkLoaded.patch rename to Spigot-Server-Patches/0351-improve-CraftWorld-isChunkLoaded.patch diff --git a/Spigot-Server-Patches/0353-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0352-Configurable-Keep-Spawn-Loaded-range-per-world.patch similarity index 100% rename from Spigot-Server-Patches/0353-Configurable-Keep-Spawn-Loaded-range-per-world.patch rename to Spigot-Server-Patches/0352-Configurable-Keep-Spawn-Loaded-range-per-world.patch diff --git a/Spigot-Server-Patches/0354-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch b/Spigot-Server-Patches/0353-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch similarity index 100% rename from Spigot-Server-Patches/0354-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch rename to Spigot-Server-Patches/0353-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch diff --git a/Spigot-Server-Patches/0355-ChunkMapDistance-CME.patch b/Spigot-Server-Patches/0354-ChunkMapDistance-CME.patch similarity index 100% rename from Spigot-Server-Patches/0355-ChunkMapDistance-CME.patch rename to Spigot-Server-Patches/0354-ChunkMapDistance-CME.patch diff --git a/Spigot-Server-Patches/0356-Implement-CraftBlockSoundGroup.patch b/Spigot-Server-Patches/0355-Implement-CraftBlockSoundGroup.patch similarity index 100% rename from Spigot-Server-Patches/0356-Implement-CraftBlockSoundGroup.patch rename to Spigot-Server-Patches/0355-Implement-CraftBlockSoundGroup.patch diff --git a/Spigot-Server-Patches/0357-Chunk-debug-command.patch b/Spigot-Server-Patches/0356-Chunk-debug-command.patch similarity index 100% rename from Spigot-Server-Patches/0357-Chunk-debug-command.patch rename to Spigot-Server-Patches/0356-Chunk-debug-command.patch diff --git a/Spigot-Server-Patches/0358-Catch-exceptions-from-dispenser-entity-spawns.patch b/Spigot-Server-Patches/0357-Catch-exceptions-from-dispenser-entity-spawns.patch similarity index 100% rename from Spigot-Server-Patches/0358-Catch-exceptions-from-dispenser-entity-spawns.patch rename to Spigot-Server-Patches/0357-Catch-exceptions-from-dispenser-entity-spawns.patch diff --git a/Spigot-Server-Patches/0359-Fix-World-isChunkGenerated-calls.patch b/Spigot-Server-Patches/0358-Fix-World-isChunkGenerated-calls.patch similarity index 100% rename from Spigot-Server-Patches/0359-Fix-World-isChunkGenerated-calls.patch rename to Spigot-Server-Patches/0358-Fix-World-isChunkGenerated-calls.patch diff --git a/Spigot-Server-Patches/0360-Show-blockstate-location-if-we-failed-to-read-it.patch b/Spigot-Server-Patches/0359-Show-blockstate-location-if-we-failed-to-read-it.patch similarity index 100% rename from Spigot-Server-Patches/0360-Show-blockstate-location-if-we-failed-to-read-it.patch rename to Spigot-Server-Patches/0359-Show-blockstate-location-if-we-failed-to-read-it.patch diff --git a/Spigot-Server-Patches/0361-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch b/Spigot-Server-Patches/0360-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch similarity index 100% rename from Spigot-Server-Patches/0361-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch rename to Spigot-Server-Patches/0360-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch diff --git a/Spigot-Server-Patches/0362-incremental-chunk-saving.patch b/Spigot-Server-Patches/0361-incremental-chunk-saving.patch similarity index 100% rename from Spigot-Server-Patches/0362-incremental-chunk-saving.patch rename to Spigot-Server-Patches/0361-incremental-chunk-saving.patch diff --git a/Spigot-Server-Patches/0363-Anti-Xray.patch b/Spigot-Server-Patches/0362-Anti-Xray.patch similarity index 99% rename from Spigot-Server-Patches/0363-Anti-Xray.patch rename to Spigot-Server-Patches/0362-Anti-Xray.patch index 50d42b2ddb..7a4ca7027e 100644 --- a/Spigot-Server-Patches/0363-Anti-Xray.patch +++ b/Spigot-Server-Patches/0362-Anti-Xray.patch @@ -1414,7 +1414,7 @@ index 048cfcd32c774148f424b246b1f7048fd437afd8..e7ad9a926f58cc7e5d70229dd69f2f5b if (iblockdata1 == null) { // CraftBukkit start - remove blockstate if failed (or the same) diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 5a35395434ffdefd410573302a3d46cca9642a81..6b52f9b9adce975cdafaf12b2a1bea5ef1bbaaa4 100644 +index 3c7752769fb6a2da644f9d41ef783de9772ce5f7..1ad867b6b8c743ab03a3c0c1a75fc92e548b5a64 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -100,7 +100,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0364-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/Spigot-Server-Patches/0363-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch similarity index 96% rename from Spigot-Server-Patches/0364-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch rename to Spigot-Server-Patches/0363-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch index 76e73cc46c..8cf8dac81b 100644 --- a/Spigot-Server-Patches/0364-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch +++ b/Spigot-Server-Patches/0363-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch @@ -38,7 +38,7 @@ index b9410e3affed4004548acdc9355ac14d18c4a2c8..90e8defde0ef84f3146c8664805d6f11 public EngineMode engineMode; public int maxChunkSectionIndex; diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 2561ba9b9c02ccb59bd7284ddfe62889911d4220..99d4d6b4bdedcba7964ddc99467b8f8e5229b98a 100644 +index 60f0301747ff2363007791432471c20471d79f01..979988c3c39afd80ce0b99a65dff5618a69ab600 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -48,6 +48,13 @@ public final class SpawnerCreature { diff --git a/Spigot-Server-Patches/0365-Configurable-projectile-relative-velocity.patch b/Spigot-Server-Patches/0364-Configurable-projectile-relative-velocity.patch similarity index 100% rename from Spigot-Server-Patches/0365-Configurable-projectile-relative-velocity.patch rename to Spigot-Server-Patches/0364-Configurable-projectile-relative-velocity.patch diff --git a/Spigot-Server-Patches/0366-Mark-entities-as-being-ticked-when-notifying-navigat.patch b/Spigot-Server-Patches/0365-Mark-entities-as-being-ticked-when-notifying-navigat.patch similarity index 100% rename from Spigot-Server-Patches/0366-Mark-entities-as-being-ticked-when-notifying-navigat.patch rename to Spigot-Server-Patches/0365-Mark-entities-as-being-ticked-when-notifying-navigat.patch diff --git a/Spigot-Server-Patches/0367-offset-item-frame-ticking.patch b/Spigot-Server-Patches/0366-offset-item-frame-ticking.patch similarity index 100% rename from Spigot-Server-Patches/0367-offset-item-frame-ticking.patch rename to Spigot-Server-Patches/0366-offset-item-frame-ticking.patch diff --git a/Spigot-Server-Patches/0368-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0367-Avoid-hopper-searches-if-there-are-no-items.patch similarity index 100% rename from Spigot-Server-Patches/0368-Avoid-hopper-searches-if-there-are-no-items.patch rename to Spigot-Server-Patches/0367-Avoid-hopper-searches-if-there-are-no-items.patch diff --git a/Spigot-Server-Patches/0369-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0368-Asynchronous-chunk-IO-and-loading.patch similarity index 100% rename from Spigot-Server-Patches/0369-Asynchronous-chunk-IO-and-loading.patch rename to Spigot-Server-Patches/0368-Asynchronous-chunk-IO-and-loading.patch diff --git a/Spigot-Server-Patches/0370-Use-getChunkIfLoadedImmediately-in-places.patch b/Spigot-Server-Patches/0369-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 98% rename from Spigot-Server-Patches/0370-Use-getChunkIfLoadedImmediately-in-places.patch rename to Spigot-Server-Patches/0369-Use-getChunkIfLoadedImmediately-in-places.patch index 9e4ec36217..08c6f37377 100644 --- a/Spigot-Server-Patches/0370-Use-getChunkIfLoadedImmediately-in-places.patch +++ b/Spigot-Server-Patches/0369-Use-getChunkIfLoadedImmediately-in-places.patch @@ -65,7 +65,7 @@ index e7ad9a926f58cc7e5d70229dd69f2f5b34603a39..7a392774de7affb344166cc3344b2ebf if (chunk != null) { chunk.a(oclass, axisalignedbb, list, predicate); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 5a85c5b99179ffe4cfbd994b4c75f6dffaed110f..6962e258446d7096accad7ec581fbbd57f020986 100644 +index a999683d6d16d3704c76b1af95255ad3c02a9fc2..6b851421262efb9ce918a86b838512cd8f74da52 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -95,7 +95,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0371-Reduce-sync-loads.patch b/Spigot-Server-Patches/0370-Reduce-sync-loads.patch similarity index 99% rename from Spigot-Server-Patches/0371-Reduce-sync-loads.patch rename to Spigot-Server-Patches/0370-Reduce-sync-loads.patch index 76273e8ba7..ebdce0d57e 100644 --- a/Spigot-Server-Patches/0371-Reduce-sync-loads.patch +++ b/Spigot-Server-Patches/0370-Reduce-sync-loads.patch @@ -329,7 +329,7 @@ index 7a392774de7affb344166cc3344b2ebf5468e299..358ea68714fe1352259b158d61a7d195 if (chunk != null) { chunk.a(oclass, axisalignedbb, list, predicate); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 6962e258446d7096accad7ec581fbbd57f020986..1325d88b9ebd9128c5f737683cddeb0cce6166c7 100644 +index 6b851421262efb9ce918a86b838512cd8f74da52..c7a39cd7ac8ca48b2b2fb42738406c94150f5d77 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -170,6 +170,12 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0372-Implement-alternative-item-despawn-rate.patch b/Spigot-Server-Patches/0371-Implement-alternative-item-despawn-rate.patch similarity index 100% rename from Spigot-Server-Patches/0372-Implement-alternative-item-despawn-rate.patch rename to Spigot-Server-Patches/0371-Implement-alternative-item-despawn-rate.patch diff --git a/Spigot-Server-Patches/0373-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/Spigot-Server-Patches/0372-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch similarity index 100% rename from Spigot-Server-Patches/0373-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch rename to Spigot-Server-Patches/0372-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch diff --git a/Spigot-Server-Patches/0374-Fix-MC-158900.patch b/Spigot-Server-Patches/0373-Fix-MC-158900.patch similarity index 94% rename from Spigot-Server-Patches/0374-Fix-MC-158900.patch rename to Spigot-Server-Patches/0373-Fix-MC-158900.patch index d3461d0ec0..523a7a23e6 100644 --- a/Spigot-Server-Patches/0374-Fix-MC-158900.patch +++ b/Spigot-Server-Patches/0373-Fix-MC-158900.patch @@ -7,7 +7,7 @@ The problem was we were checking isExpired() on the entry, but if it was expired at that point, then it would be null. diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index fe1827d65d616322e6b540b18fff5bf32e0638ac..120b4941a54750e94f8f10f809fb77214eb63c66 100644 +index a6aae6740c62f269e46db4a082fd983190deb290..1d4bb2004d606ef7bf9fba3474f057b04b3354b5 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -534,8 +534,10 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0375-implement-optional-per-player-mob-spawns.patch b/Spigot-Server-Patches/0374-implement-optional-per-player-mob-spawns.patch similarity index 100% rename from Spigot-Server-Patches/0375-implement-optional-per-player-mob-spawns.patch rename to Spigot-Server-Patches/0374-implement-optional-per-player-mob-spawns.patch diff --git a/Spigot-Server-Patches/0376-Prevent-consuming-the-wrong-itemstack.patch b/Spigot-Server-Patches/0375-Prevent-consuming-the-wrong-itemstack.patch similarity index 100% rename from Spigot-Server-Patches/0376-Prevent-consuming-the-wrong-itemstack.patch rename to Spigot-Server-Patches/0375-Prevent-consuming-the-wrong-itemstack.patch diff --git a/Spigot-Server-Patches/0377-Fix-nether-portal-creation.patch b/Spigot-Server-Patches/0376-Fix-nether-portal-creation.patch similarity index 100% rename from Spigot-Server-Patches/0377-Fix-nether-portal-creation.patch rename to Spigot-Server-Patches/0376-Fix-nether-portal-creation.patch diff --git a/Spigot-Server-Patches/0378-Generator-Settings.patch b/Spigot-Server-Patches/0377-Generator-Settings.patch similarity index 100% rename from Spigot-Server-Patches/0378-Generator-Settings.patch rename to Spigot-Server-Patches/0377-Generator-Settings.patch diff --git a/Spigot-Server-Patches/0379-Fix-MC-161754.patch b/Spigot-Server-Patches/0378-Fix-MC-161754.patch similarity index 100% rename from Spigot-Server-Patches/0379-Fix-MC-161754.patch rename to Spigot-Server-Patches/0378-Fix-MC-161754.patch diff --git a/Spigot-Server-Patches/0380-Performance-improvement-for-Chunk.getEntities.patch b/Spigot-Server-Patches/0379-Performance-improvement-for-Chunk.getEntities.patch similarity index 100% rename from Spigot-Server-Patches/0380-Performance-improvement-for-Chunk.getEntities.patch rename to Spigot-Server-Patches/0379-Performance-improvement-for-Chunk.getEntities.patch diff --git a/Spigot-Server-Patches/0381-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch b/Spigot-Server-Patches/0380-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch similarity index 100% rename from Spigot-Server-Patches/0381-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch rename to Spigot-Server-Patches/0380-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch diff --git a/Spigot-Server-Patches/0382-Expose-the-internal-current-tick.patch b/Spigot-Server-Patches/0381-Expose-the-internal-current-tick.patch similarity index 100% rename from Spigot-Server-Patches/0382-Expose-the-internal-current-tick.patch rename to Spigot-Server-Patches/0381-Expose-the-internal-current-tick.patch diff --git a/Spigot-Server-Patches/0383-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/Spigot-Server-Patches/0382-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch similarity index 94% rename from Spigot-Server-Patches/0383-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch rename to Spigot-Server-Patches/0382-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch index 2ca9921dad..24777b0d96 100644 --- a/Spigot-Server-Patches/0383-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch +++ b/Spigot-Server-Patches/0382-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch @@ -18,7 +18,7 @@ index e3f271a82f188f16ec249148fb4fb2af746d20ae..c5f9e6beb06219fe4d085e6c5adb0a4e PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld()); this.world.getServer().getPluginManager().callEvent(changeEvent); diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 120b4941a54750e94f8f10f809fb77214eb63c66..10427498fe34ab5b40ada89597d7ae0a96b5398a 100644 +index 1d4bb2004d606ef7bf9fba3474f057b04b3354b5..da1f15c3b7af9bfafae43315f509290662576ba1 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -773,6 +773,8 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0384-Add-option-to-disable-pillager-patrols.patch b/Spigot-Server-Patches/0383-Add-option-to-disable-pillager-patrols.patch similarity index 100% rename from Spigot-Server-Patches/0384-Add-option-to-disable-pillager-patrols.patch rename to Spigot-Server-Patches/0383-Add-option-to-disable-pillager-patrols.patch diff --git a/Spigot-Server-Patches/0385-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/Spigot-Server-Patches/0384-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch similarity index 100% rename from Spigot-Server-Patches/0385-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch rename to Spigot-Server-Patches/0384-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch diff --git a/Spigot-Server-Patches/0386-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0385-PlayerLaunchProjectileEvent.patch similarity index 100% rename from Spigot-Server-Patches/0386-PlayerLaunchProjectileEvent.patch rename to Spigot-Server-Patches/0385-PlayerLaunchProjectileEvent.patch diff --git a/Spigot-Server-Patches/0387-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/Spigot-Server-Patches/0386-Add-CraftMagicNumbers.isSupportedApiVersion.patch similarity index 100% rename from Spigot-Server-Patches/0387-Add-CraftMagicNumbers.isSupportedApiVersion.patch rename to Spigot-Server-Patches/0386-Add-CraftMagicNumbers.isSupportedApiVersion.patch diff --git a/Spigot-Server-Patches/0388-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/Spigot-Server-Patches/0387-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch similarity index 100% rename from Spigot-Server-Patches/0388-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch rename to Spigot-Server-Patches/0387-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch diff --git a/Spigot-Server-Patches/0389-MC-145656-Fix-Follow-Range-Initial-Target.patch b/Spigot-Server-Patches/0388-MC-145656-Fix-Follow-Range-Initial-Target.patch similarity index 100% rename from Spigot-Server-Patches/0389-MC-145656-Fix-Follow-Range-Initial-Target.patch rename to Spigot-Server-Patches/0388-MC-145656-Fix-Follow-Range-Initial-Target.patch diff --git a/Spigot-Server-Patches/0390-Optimize-Hoppers.patch b/Spigot-Server-Patches/0389-Optimize-Hoppers.patch similarity index 100% rename from Spigot-Server-Patches/0390-Optimize-Hoppers.patch rename to Spigot-Server-Patches/0389-Optimize-Hoppers.patch diff --git a/Spigot-Server-Patches/0391-PlayerDeathEvent-shouldDropExperience.patch b/Spigot-Server-Patches/0390-PlayerDeathEvent-shouldDropExperience.patch similarity index 100% rename from Spigot-Server-Patches/0391-PlayerDeathEvent-shouldDropExperience.patch rename to Spigot-Server-Patches/0390-PlayerDeathEvent-shouldDropExperience.patch diff --git a/Spigot-Server-Patches/0392-Prevent-bees-loading-chunks-checking-hive-position.patch b/Spigot-Server-Patches/0391-Prevent-bees-loading-chunks-checking-hive-position.patch similarity index 100% rename from Spigot-Server-Patches/0392-Prevent-bees-loading-chunks-checking-hive-position.patch rename to Spigot-Server-Patches/0391-Prevent-bees-loading-chunks-checking-hive-position.patch diff --git a/Spigot-Server-Patches/0393-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0392-Don-t-load-Chunks-from-Hoppers-and-other-things.patch similarity index 100% rename from Spigot-Server-Patches/0393-Don-t-load-Chunks-from-Hoppers-and-other-things.patch rename to Spigot-Server-Patches/0392-Don-t-load-Chunks-from-Hoppers-and-other-things.patch diff --git a/Spigot-Server-Patches/0394-Guard-against-serializing-mismatching-chunk-coordina.patch b/Spigot-Server-Patches/0393-Guard-against-serializing-mismatching-chunk-coordina.patch similarity index 100% rename from Spigot-Server-Patches/0394-Guard-against-serializing-mismatching-chunk-coordina.patch rename to Spigot-Server-Patches/0393-Guard-against-serializing-mismatching-chunk-coordina.patch diff --git a/Spigot-Server-Patches/0395-Optimise-IEntityAccess-getPlayerByUUID.patch b/Spigot-Server-Patches/0394-Optimise-IEntityAccess-getPlayerByUUID.patch similarity index 96% rename from Spigot-Server-Patches/0395-Optimise-IEntityAccess-getPlayerByUUID.patch rename to Spigot-Server-Patches/0394-Optimise-IEntityAccess-getPlayerByUUID.patch index 1229bb7e23..b72317bb9b 100644 --- a/Spigot-Server-Patches/0395-Optimise-IEntityAccess-getPlayerByUUID.patch +++ b/Spigot-Server-Patches/0394-Optimise-IEntityAccess-getPlayerByUUID.patch @@ -23,7 +23,7 @@ index 14400d0e4b0713e852861ed55e289e4dead95cea..07dbdd560909c8ef64740d82f02bae3d EntityHuman entityhuman = (EntityHuman) this.getPlayers().get(i); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 1325d88b9ebd9128c5f737683cddeb0cce6166c7..f79f04cd4d0c1f3518cbd08960206b06f9b819f6 100644 +index c7a39cd7ac8ca48b2b2fb42738406c94150f5d77..a06a9c4a50acdad951da3a95d0c46cf9766164c1 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -177,6 +177,15 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0396-Fix-items-not-falling-correctly.patch b/Spigot-Server-Patches/0395-Fix-items-not-falling-correctly.patch similarity index 100% rename from Spigot-Server-Patches/0396-Fix-items-not-falling-correctly.patch rename to Spigot-Server-Patches/0395-Fix-items-not-falling-correctly.patch diff --git a/Spigot-Server-Patches/0397-Lag-compensate-eating.patch b/Spigot-Server-Patches/0396-Lag-compensate-eating.patch similarity index 100% rename from Spigot-Server-Patches/0397-Lag-compensate-eating.patch rename to Spigot-Server-Patches/0396-Lag-compensate-eating.patch diff --git a/Spigot-Server-Patches/0398-Optimize-call-to-getFluid-for-explosions.patch b/Spigot-Server-Patches/0397-Optimize-call-to-getFluid-for-explosions.patch similarity index 100% rename from Spigot-Server-Patches/0398-Optimize-call-to-getFluid-for-explosions.patch rename to Spigot-Server-Patches/0397-Optimize-call-to-getFluid-for-explosions.patch diff --git a/Spigot-Server-Patches/0399-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/Spigot-Server-Patches/0398-Fix-last-firework-in-stack-not-having-effects-when-d.patch similarity index 100% rename from Spigot-Server-Patches/0399-Fix-last-firework-in-stack-not-having-effects-when-d.patch rename to Spigot-Server-Patches/0398-Fix-last-firework-in-stack-not-having-effects-when-d.patch diff --git a/Spigot-Server-Patches/0400-Add-effect-to-block-break-naturally.patch b/Spigot-Server-Patches/0399-Add-effect-to-block-break-naturally.patch similarity index 100% rename from Spigot-Server-Patches/0400-Add-effect-to-block-break-naturally.patch rename to Spigot-Server-Patches/0399-Add-effect-to-block-break-naturally.patch diff --git a/Spigot-Server-Patches/0401-Tracking-Range-Improvements.patch b/Spigot-Server-Patches/0400-Tracking-Range-Improvements.patch similarity index 100% rename from Spigot-Server-Patches/0401-Tracking-Range-Improvements.patch rename to Spigot-Server-Patches/0400-Tracking-Range-Improvements.patch diff --git a/Spigot-Server-Patches/0402-Entity-Activation-Range-2.0.patch b/Spigot-Server-Patches/0401-Entity-Activation-Range-2.0.patch similarity index 100% rename from Spigot-Server-Patches/0402-Entity-Activation-Range-2.0.patch rename to Spigot-Server-Patches/0401-Entity-Activation-Range-2.0.patch diff --git a/Spigot-Server-Patches/0403-Fix-items-vanishing-through-end-portal.patch b/Spigot-Server-Patches/0402-Fix-items-vanishing-through-end-portal.patch similarity index 100% rename from Spigot-Server-Patches/0403-Fix-items-vanishing-through-end-portal.patch rename to Spigot-Server-Patches/0402-Fix-items-vanishing-through-end-portal.patch diff --git a/Spigot-Server-Patches/0404-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/Spigot-Server-Patches/0403-Bees-get-gravity-in-void.-Fixes-MC-167279.patch similarity index 100% rename from Spigot-Server-Patches/0404-Bees-get-gravity-in-void.-Fixes-MC-167279.patch rename to Spigot-Server-Patches/0403-Bees-get-gravity-in-void.-Fixes-MC-167279.patch diff --git a/Spigot-Server-Patches/0405-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/Spigot-Server-Patches/0404-Optimise-getChunkAt-calls-for-loaded-chunks.patch similarity index 100% rename from Spigot-Server-Patches/0405-Optimise-getChunkAt-calls-for-loaded-chunks.patch rename to Spigot-Server-Patches/0404-Optimise-getChunkAt-calls-for-loaded-chunks.patch diff --git a/Spigot-Server-Patches/0406-Allow-overriding-the-java-version-check.patch b/Spigot-Server-Patches/0405-Allow-overriding-the-java-version-check.patch similarity index 100% rename from Spigot-Server-Patches/0406-Allow-overriding-the-java-version-check.patch rename to Spigot-Server-Patches/0405-Allow-overriding-the-java-version-check.patch diff --git a/Spigot-Server-Patches/0407-Add-ThrownEggHatchEvent.patch b/Spigot-Server-Patches/0406-Add-ThrownEggHatchEvent.patch similarity index 100% rename from Spigot-Server-Patches/0407-Add-ThrownEggHatchEvent.patch rename to Spigot-Server-Patches/0406-Add-ThrownEggHatchEvent.patch diff --git a/Spigot-Server-Patches/0408-Optimise-random-block-ticking.patch b/Spigot-Server-Patches/0407-Optimise-random-block-ticking.patch similarity index 99% rename from Spigot-Server-Patches/0408-Optimise-random-block-ticking.patch rename to Spigot-Server-Patches/0407-Optimise-random-block-ticking.patch index 9604f2dedb..db8a7e6d4f 100644 --- a/Spigot-Server-Patches/0408-Optimise-random-block-ticking.patch +++ b/Spigot-Server-Patches/0407-Optimise-random-block-ticking.patch @@ -267,7 +267,7 @@ index f229fb7409e509878af1dca1ecda058f85a94776..c0cf73c57958f5b20cfe8e1f20046427 public boolean isSavingDisabled() { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 7048f1e79380f2d36c944a125eea139a96cd91c9..a284100a2fac4217f9353fbe7c3d459c23252501 100644 +index c345729675c76c5cd02a469283ed668a2df52816..52b1f4afc47d91603e1829275daecf8e9dd4cb1f 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -561,7 +561,12 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0409-Entity-Jump-API.patch b/Spigot-Server-Patches/0408-Entity-Jump-API.patch similarity index 100% rename from Spigot-Server-Patches/0409-Entity-Jump-API.patch rename to Spigot-Server-Patches/0408-Entity-Jump-API.patch diff --git a/Spigot-Server-Patches/0410-Add-option-to-nerf-pigmen-from-nether-portals.patch b/Spigot-Server-Patches/0409-Add-option-to-nerf-pigmen-from-nether-portals.patch similarity index 100% rename from Spigot-Server-Patches/0410-Add-option-to-nerf-pigmen-from-nether-portals.patch rename to Spigot-Server-Patches/0409-Add-option-to-nerf-pigmen-from-nether-portals.patch diff --git a/Spigot-Server-Patches/0411-Make-the-GUI-graph-fancier.patch b/Spigot-Server-Patches/0410-Make-the-GUI-graph-fancier.patch similarity index 100% rename from Spigot-Server-Patches/0411-Make-the-GUI-graph-fancier.patch rename to Spigot-Server-Patches/0410-Make-the-GUI-graph-fancier.patch diff --git a/Spigot-Server-Patches/0412-add-hand-to-BlockMultiPlaceEvent.patch b/Spigot-Server-Patches/0411-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from Spigot-Server-Patches/0412-add-hand-to-BlockMultiPlaceEvent.patch rename to Spigot-Server-Patches/0411-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/Spigot-Server-Patches/0413-Prevent-teleporting-dead-entities.patch b/Spigot-Server-Patches/0412-Prevent-teleporting-dead-entities.patch similarity index 100% rename from Spigot-Server-Patches/0413-Prevent-teleporting-dead-entities.patch rename to Spigot-Server-Patches/0412-Prevent-teleporting-dead-entities.patch diff --git a/Spigot-Server-Patches/0414-Validate-tripwire-hook-placement-before-update.patch b/Spigot-Server-Patches/0413-Validate-tripwire-hook-placement-before-update.patch similarity index 100% rename from Spigot-Server-Patches/0414-Validate-tripwire-hook-placement-before-update.patch rename to Spigot-Server-Patches/0413-Validate-tripwire-hook-placement-before-update.patch diff --git a/Spigot-Server-Patches/0415-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/Spigot-Server-Patches/0414-Add-option-to-allow-iron-golems-to-spawn-in-air.patch similarity index 100% rename from Spigot-Server-Patches/0415-Add-option-to-allow-iron-golems-to-spawn-in-air.patch rename to Spigot-Server-Patches/0414-Add-option-to-allow-iron-golems-to-spawn-in-air.patch diff --git a/Spigot-Server-Patches/0416-Configurable-chance-of-villager-zombie-infection.patch b/Spigot-Server-Patches/0415-Configurable-chance-of-villager-zombie-infection.patch similarity index 100% rename from Spigot-Server-Patches/0416-Configurable-chance-of-villager-zombie-infection.patch rename to Spigot-Server-Patches/0415-Configurable-chance-of-villager-zombie-infection.patch diff --git a/Spigot-Server-Patches/0417-Optimise-Chunk-getFluid.patch b/Spigot-Server-Patches/0416-Optimise-Chunk-getFluid.patch similarity index 100% rename from Spigot-Server-Patches/0417-Optimise-Chunk-getFluid.patch rename to Spigot-Server-Patches/0416-Optimise-Chunk-getFluid.patch diff --git a/Spigot-Server-Patches/0418-Optimise-TickListServer-by-rewriting-it.patch b/Spigot-Server-Patches/0417-Optimise-TickListServer-by-rewriting-it.patch similarity index 99% rename from Spigot-Server-Patches/0418-Optimise-TickListServer-by-rewriting-it.patch rename to Spigot-Server-Patches/0417-Optimise-TickListServer-by-rewriting-it.patch index 721dd4aca2..3a89a84ef0 100644 --- a/Spigot-Server-Patches/0418-Optimise-TickListServer-by-rewriting-it.patch +++ b/Spigot-Server-Patches/0417-Optimise-TickListServer-by-rewriting-it.patch @@ -1191,7 +1191,7 @@ index 3b8f56c0f0507ebdd9ac20be70688b4c0cfe4cf8..3e148b7e99554a1abe257dd3c9acafb9 } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index a284100a2fac4217f9353fbe7c3d459c23252501..784381e117ea9e39f3dabedba35daf0a41b119c5 100644 +index 52b1f4afc47d91603e1829275daecf8e9dd4cb1f..f816b3baf956729ffa8b404cc1baa5e64888e714 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -186,6 +186,15 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0419-Pillager-patrol-spawn-settings-and-per-player-option.patch b/Spigot-Server-Patches/0418-Pillager-patrol-spawn-settings-and-per-player-option.patch similarity index 100% rename from Spigot-Server-Patches/0419-Pillager-patrol-spawn-settings-and-per-player-option.patch rename to Spigot-Server-Patches/0418-Pillager-patrol-spawn-settings-and-per-player-option.patch diff --git a/Spigot-Server-Patches/0420-Ensure-Entity-is-never-double-registered.patch b/Spigot-Server-Patches/0419-Ensure-Entity-is-never-double-registered.patch similarity index 100% rename from Spigot-Server-Patches/0420-Ensure-Entity-is-never-double-registered.patch rename to Spigot-Server-Patches/0419-Ensure-Entity-is-never-double-registered.patch diff --git a/Spigot-Server-Patches/0421-Fix-unregistering-entities-from-unloading-chunks.patch b/Spigot-Server-Patches/0420-Fix-unregistering-entities-from-unloading-chunks.patch similarity index 100% rename from Spigot-Server-Patches/0421-Fix-unregistering-entities-from-unloading-chunks.patch rename to Spigot-Server-Patches/0420-Fix-unregistering-entities-from-unloading-chunks.patch diff --git a/Spigot-Server-Patches/0422-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/Spigot-Server-Patches/0421-Remote-Connections-shouldn-t-hold-up-shutdown.patch similarity index 100% rename from Spigot-Server-Patches/0422-Remote-Connections-shouldn-t-hold-up-shutdown.patch rename to Spigot-Server-Patches/0421-Remote-Connections-shouldn-t-hold-up-shutdown.patch diff --git a/Spigot-Server-Patches/0423-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/Spigot-Server-Patches/0422-Do-not-allow-bees-to-load-chunks-for-beehives.patch similarity index 100% rename from Spigot-Server-Patches/0423-Do-not-allow-bees-to-load-chunks-for-beehives.patch rename to Spigot-Server-Patches/0422-Do-not-allow-bees-to-load-chunks-for-beehives.patch diff --git a/Spigot-Server-Patches/0424-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/Spigot-Server-Patches/0423-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch similarity index 100% rename from Spigot-Server-Patches/0424-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch rename to Spigot-Server-Patches/0423-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch diff --git a/Spigot-Server-Patches/0425-Optimize-Collision-to-not-load-chunks.patch b/Spigot-Server-Patches/0424-Optimize-Collision-to-not-load-chunks.patch similarity index 98% rename from Spigot-Server-Patches/0425-Optimize-Collision-to-not-load-chunks.patch rename to Spigot-Server-Patches/0424-Optimize-Collision-to-not-load-chunks.patch index 0fd3679efe..6b30ffc788 100644 --- a/Spigot-Server-Patches/0425-Optimize-Collision-to-not-load-chunks.patch +++ b/Spigot-Server-Patches/0424-Optimize-Collision-to-not-load-chunks.patch @@ -40,7 +40,7 @@ index 7bb0843d76864fc10575532745eb63f9ca478354..25e54a1fadc5d31fb250a3f47524b4f3 Stream c(@Nullable Entity entity, AxisAlignedBB axisalignedbb, Predicate predicate); diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 10427498fe34ab5b40ada89597d7ae0a96b5398a..bf14839c99a2c2336bba4a12ee49d4c7c79c30c9 100644 +index da1f15c3b7af9bfafae43315f509290662576ba1..a124b47f07dd223151f23cc27a6e5ee5921b7942 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -736,6 +736,7 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0426-Don-t-tick-dead-players.patch b/Spigot-Server-Patches/0425-Don-t-tick-dead-players.patch similarity index 100% rename from Spigot-Server-Patches/0426-Don-t-tick-dead-players.patch rename to Spigot-Server-Patches/0425-Don-t-tick-dead-players.patch diff --git a/Spigot-Server-Patches/0427-Dead-Player-s-shouldn-t-be-able-to-move.patch b/Spigot-Server-Patches/0426-Dead-Player-s-shouldn-t-be-able-to-move.patch similarity index 100% rename from Spigot-Server-Patches/0427-Dead-Player-s-shouldn-t-be-able-to-move.patch rename to Spigot-Server-Patches/0426-Dead-Player-s-shouldn-t-be-able-to-move.patch diff --git a/Spigot-Server-Patches/0428-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch b/Spigot-Server-Patches/0427-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch similarity index 100% rename from Spigot-Server-Patches/0428-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch rename to Spigot-Server-Patches/0427-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch diff --git a/Spigot-Server-Patches/0429-Increase-Light-Queue-Size.patch b/Spigot-Server-Patches/0428-Increase-Light-Queue-Size.patch similarity index 100% rename from Spigot-Server-Patches/0429-Increase-Light-Queue-Size.patch rename to Spigot-Server-Patches/0428-Increase-Light-Queue-Size.patch diff --git a/Spigot-Server-Patches/0430-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch b/Spigot-Server-Patches/0429-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch similarity index 99% rename from Spigot-Server-Patches/0430-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch rename to Spigot-Server-Patches/0429-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch index a1921da317..a476b7324f 100644 --- a/Spigot-Server-Patches/0430-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch +++ b/Spigot-Server-Patches/0429-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch @@ -226,7 +226,7 @@ index 8e2300e22ca76562acf29c42c0025b4d4c2689b1..664daf13341285a7e24c67a62e765627 // Spigot Start CrashReport crashreport; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index ca4317d90bb5885ad2b1714e4c4e99902a9c23f6..7d0fddfc702ec0f0928404af1af96a21b5809be1 100644 +index ed13a1bc54cebebbafbf9a3822d2942fbc09249e..87c581fe9c4e12f2cdf93d864ccc7383f2933304 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -457,6 +457,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0431-Don-t-move-existing-players-to-world-spawn.patch b/Spigot-Server-Patches/0430-Don-t-move-existing-players-to-world-spawn.patch similarity index 96% rename from Spigot-Server-Patches/0431-Don-t-move-existing-players-to-world-spawn.patch rename to Spigot-Server-Patches/0430-Don-t-move-existing-players-to-world-spawn.patch index f8f6bed3ff..4a4d94f66e 100644 --- a/Spigot-Server-Patches/0431-Don-t-move-existing-players-to-world-spawn.patch +++ b/Spigot-Server-Patches/0430-Don-t-move-existing-players-to-world-spawn.patch @@ -40,7 +40,7 @@ index 9b13be3be5c911a00f2278f05557795cd916054d..dde0e9f1911d34791c7d7396f82cff5f this.playerInteractManager.a((WorldServer) world); } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index bf14839c99a2c2336bba4a12ee49d4c7c79c30c9..c11e941ba1ab12507ca5acbcaf034a6dfd97bbca 100644 +index a124b47f07dd223151f23cc27a6e5ee5921b7942..a1987b17adb5fa8fdeb601da948839fb1fd35aaf 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -134,6 +134,8 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0432-Add-tick-times-API-and-mspt-command.patch b/Spigot-Server-Patches/0431-Add-tick-times-API-and-mspt-command.patch similarity index 100% rename from Spigot-Server-Patches/0432-Add-tick-times-API-and-mspt-command.patch rename to Spigot-Server-Patches/0431-Add-tick-times-API-and-mspt-command.patch diff --git a/Spigot-Server-Patches/0433-Expose-MinecraftServer-isRunning.patch b/Spigot-Server-Patches/0432-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from Spigot-Server-Patches/0433-Expose-MinecraftServer-isRunning.patch rename to Spigot-Server-Patches/0432-Expose-MinecraftServer-isRunning.patch diff --git a/Spigot-Server-Patches/0434-Add-Raw-Byte-ItemStack-Serialization.patch b/Spigot-Server-Patches/0433-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from Spigot-Server-Patches/0434-Add-Raw-Byte-ItemStack-Serialization.patch rename to Spigot-Server-Patches/0433-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/Spigot-Server-Patches/0435-Remove-streams-from-Mob-AI-System.patch b/Spigot-Server-Patches/0434-Remove-streams-from-Mob-AI-System.patch similarity index 100% rename from Spigot-Server-Patches/0435-Remove-streams-from-Mob-AI-System.patch rename to Spigot-Server-Patches/0434-Remove-streams-from-Mob-AI-System.patch diff --git a/Spigot-Server-Patches/0436-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch b/Spigot-Server-Patches/0435-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch similarity index 95% rename from Spigot-Server-Patches/0436-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch rename to Spigot-Server-Patches/0435-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch index fff1818c6f..f5916f8442 100644 --- a/Spigot-Server-Patches/0436-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch +++ b/Spigot-Server-Patches/0435-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Delay unsafe actions until after entity ticking is done This will help prevent many cases of unregistering entities during entity ticking diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 7d0fddfc702ec0f0928404af1af96a21b5809be1..977a48bdd81d18992cacbd0ce6be2418fa9a103f 100644 +index 87c581fe9c4e12f2cdf93d864ccc7383f2933304..00e88ddd3d41491db2508dba2a544df807703fb0 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -66,6 +66,16 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0437-Async-command-map-building.patch b/Spigot-Server-Patches/0436-Async-command-map-building.patch similarity index 100% rename from Spigot-Server-Patches/0437-Async-command-map-building.patch rename to Spigot-Server-Patches/0436-Async-command-map-building.patch diff --git a/Spigot-Server-Patches/0438-Improved-Watchdog-Support.patch b/Spigot-Server-Patches/0437-Improved-Watchdog-Support.patch similarity index 99% rename from Spigot-Server-Patches/0438-Improved-Watchdog-Support.patch rename to Spigot-Server-Patches/0437-Improved-Watchdog-Support.patch index 4bcd6c9a93..bfa6beb08b 100644 --- a/Spigot-Server-Patches/0438-Improved-Watchdog-Support.patch +++ b/Spigot-Server-Patches/0437-Improved-Watchdog-Support.patch @@ -279,7 +279,7 @@ index d3a597d878de4cb625484cbf3a9838961d38ada0..16e4acdb0f834883a480829a864ef757 list.stream().map((playerchunk) -> { CompletableFuture completablefuture; diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index c11e941ba1ab12507ca5acbcaf034a6dfd97bbca..0b3ab0ecd263137a789c3d58db6a658666534e89 100644 +index a1987b17adb5fa8fdeb601da948839fb1fd35aaf..fbd0ecb7bee67bf5affb6be6a57a8a0a8e2686b3 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -432,7 +432,7 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0439-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0438-Optimize-Pathfinding.patch similarity index 100% rename from Spigot-Server-Patches/0439-Optimize-Pathfinding.patch rename to Spigot-Server-Patches/0438-Optimize-Pathfinding.patch diff --git a/Spigot-Server-Patches/0440-Reduce-Either-Optional-allocation.patch b/Spigot-Server-Patches/0439-Reduce-Either-Optional-allocation.patch similarity index 100% rename from Spigot-Server-Patches/0440-Reduce-Either-Optional-allocation.patch rename to Spigot-Server-Patches/0439-Reduce-Either-Optional-allocation.patch diff --git a/Spigot-Server-Patches/0441-Remove-streams-from-PairedQueue.patch b/Spigot-Server-Patches/0440-Remove-streams-from-PairedQueue.patch similarity index 100% rename from Spigot-Server-Patches/0441-Remove-streams-from-PairedQueue.patch rename to Spigot-Server-Patches/0440-Remove-streams-from-PairedQueue.patch diff --git a/Spigot-Server-Patches/0442-Reduce-memory-footprint-of-NBTTagCompound.patch b/Spigot-Server-Patches/0441-Reduce-memory-footprint-of-NBTTagCompound.patch similarity index 100% rename from Spigot-Server-Patches/0442-Reduce-memory-footprint-of-NBTTagCompound.patch rename to Spigot-Server-Patches/0441-Reduce-memory-footprint-of-NBTTagCompound.patch diff --git a/Spigot-Server-Patches/0443-Prevent-opening-inventories-when-frozen.patch b/Spigot-Server-Patches/0442-Prevent-opening-inventories-when-frozen.patch similarity index 100% rename from Spigot-Server-Patches/0443-Prevent-opening-inventories-when-frozen.patch rename to Spigot-Server-Patches/0442-Prevent-opening-inventories-when-frozen.patch diff --git a/Spigot-Server-Patches/0444-Optimise-ArraySetSorted-removeIf.patch b/Spigot-Server-Patches/0443-Optimise-ArraySetSorted-removeIf.patch similarity index 100% rename from Spigot-Server-Patches/0444-Optimise-ArraySetSorted-removeIf.patch rename to Spigot-Server-Patches/0443-Optimise-ArraySetSorted-removeIf.patch diff --git a/Spigot-Server-Patches/0445-Don-t-run-entity-collision-code-if-not-needed.patch b/Spigot-Server-Patches/0444-Don-t-run-entity-collision-code-if-not-needed.patch similarity index 100% rename from Spigot-Server-Patches/0445-Don-t-run-entity-collision-code-if-not-needed.patch rename to Spigot-Server-Patches/0444-Don-t-run-entity-collision-code-if-not-needed.patch diff --git a/Spigot-Server-Patches/0446-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch b/Spigot-Server-Patches/0445-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch similarity index 100% rename from Spigot-Server-Patches/0446-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch rename to Spigot-Server-Patches/0445-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch diff --git a/Spigot-Server-Patches/0447-Restrict-vanilla-teleport-command-to-valid-locations.patch b/Spigot-Server-Patches/0446-Restrict-vanilla-teleport-command-to-valid-locations.patch similarity index 100% rename from Spigot-Server-Patches/0447-Restrict-vanilla-teleport-command-to-valid-locations.patch rename to Spigot-Server-Patches/0446-Restrict-vanilla-teleport-command-to-valid-locations.patch diff --git a/Spigot-Server-Patches/0448-Implement-Player-Client-Options-API.patch b/Spigot-Server-Patches/0447-Implement-Player-Client-Options-API.patch similarity index 98% rename from Spigot-Server-Patches/0448-Implement-Player-Client-Options-API.patch rename to Spigot-Server-Patches/0447-Implement-Player-Client-Options-API.patch index c84c2084c4..5a97fda3e0 100644 --- a/Spigot-Server-Patches/0448-Implement-Player-Client-Options-API.patch +++ b/Spigot-Server-Patches/0447-Implement-Player-Client-Options-API.patch @@ -149,7 +149,7 @@ index dbc3552d50c4129e1844c8a379ab5ba396645f52..87ec3987d4b6de836016e91ef90383e3 return this.e; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index fa4f2df4a669df838e5c553a21b9291ed7d6b32f..a4c112844ce99e770d8ad2df5a096be39897c4ce 100644 +index 1eaf0a0303e6d687d9626d1ffcca41d9169341a8..708636e9ce98a8e83ffb3854e14912d135a58c1d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1,5 +1,8 @@ diff --git a/Spigot-Server-Patches/0449-Fix-Chunk-Post-Processing-deadlock-risk.patch b/Spigot-Server-Patches/0448-Fix-Chunk-Post-Processing-deadlock-risk.patch similarity index 100% rename from Spigot-Server-Patches/0449-Fix-Chunk-Post-Processing-deadlock-risk.patch rename to Spigot-Server-Patches/0448-Fix-Chunk-Post-Processing-deadlock-risk.patch diff --git a/Spigot-Server-Patches/0450-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/Spigot-Server-Patches/0449-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch similarity index 100% rename from Spigot-Server-Patches/0450-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch rename to Spigot-Server-Patches/0449-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch diff --git a/Spigot-Server-Patches/0451-Broadcast-join-message-to-console.patch b/Spigot-Server-Patches/0450-Broadcast-join-message-to-console.patch similarity index 92% rename from Spigot-Server-Patches/0451-Broadcast-join-message-to-console.patch rename to Spigot-Server-Patches/0450-Broadcast-join-message-to-console.patch index e2ab2b099d..ad85eddda0 100644 --- a/Spigot-Server-Patches/0451-Broadcast-join-message-to-console.patch +++ b/Spigot-Server-Patches/0450-Broadcast-join-message-to-console.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Broadcast join message to console diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 0b3ab0ecd263137a789c3d58db6a658666534e89..5943d1a319e0b9f576dd75773b2555a38a00f5ad 100644 +index fbd0ecb7bee67bf5affb6be6a57a8a0a8e2686b3..ad6977db5aefb547a9f9db6258c3b18da8ca509f 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -211,9 +211,9 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0452-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/Spigot-Server-Patches/0451-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch similarity index 98% rename from Spigot-Server-Patches/0452-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch rename to Spigot-Server-Patches/0451-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch index e5b06cff99..a57117b7c7 100644 --- a/Spigot-Server-Patches/0452-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch +++ b/Spigot-Server-Patches/0451-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch @@ -52,7 +52,7 @@ index 842f5ebad2a4d040b9912ec4841de426667cd91d..c2abf8dca89f3a4f3671e21b2cbfe9c7 if (!(entity instanceof EntityComplexPart)) { EntityTypes entitytypes = entity.getEntityType(); diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 5943d1a319e0b9f576dd75773b2555a38a00f5ad..34ec86448b8351792631a66d5078680f9d73a5f2 100644 +index ad6977db5aefb547a9f9db6258c3b18da8ca509f..791f40552f96fc597342345845bebd86184fa319 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -200,6 +200,12 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0453-Load-Chunks-for-Login-Asynchronously.patch b/Spigot-Server-Patches/0452-Load-Chunks-for-Login-Asynchronously.patch similarity index 99% rename from Spigot-Server-Patches/0453-Load-Chunks-for-Login-Asynchronously.patch rename to Spigot-Server-Patches/0452-Load-Chunks-for-Login-Asynchronously.patch index ac0117119b..1b9901171d 100644 --- a/Spigot-Server-Patches/0453-Load-Chunks-for-Login-Asynchronously.patch +++ b/Spigot-Server-Patches/0452-Load-Chunks-for-Login-Asynchronously.patch @@ -110,7 +110,7 @@ index 9b58dd080f318a2d197a6f60d40a48b728867b91..88a887f23fd5fc1acd03c1ef3a16a5b7 this.minecraftServer.getMethodProfiler().enter("keepAlive"); // Paper Start - give clients a longer time to respond to pings as per pre 1.12.2 timings diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 34ec86448b8351792631a66d5078680f9d73a5f2..7b20dd6d65288aca780f61bf2fc1acc47022af10 100644 +index 791f40552f96fc597342345845bebd86184fa319..0f46aac9d021dc115718b1e36b8fbe28cbc820c6 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -54,11 +54,12 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0454-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/Spigot-Server-Patches/0453-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 100% rename from Spigot-Server-Patches/0454-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to Spigot-Server-Patches/0453-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch diff --git a/Spigot-Server-Patches/0455-Add-PlayerAttackEntityCooldownResetEvent.patch b/Spigot-Server-Patches/0454-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from Spigot-Server-Patches/0455-Add-PlayerAttackEntityCooldownResetEvent.patch rename to Spigot-Server-Patches/0454-Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/Spigot-Server-Patches/0456-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch b/Spigot-Server-Patches/0455-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch similarity index 100% rename from Spigot-Server-Patches/0456-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch rename to Spigot-Server-Patches/0455-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch diff --git a/Spigot-Server-Patches/0457-Don-t-fire-BlockFade-on-worldgen-threads.patch b/Spigot-Server-Patches/0456-Don-t-fire-BlockFade-on-worldgen-threads.patch similarity index 100% rename from Spigot-Server-Patches/0457-Don-t-fire-BlockFade-on-worldgen-threads.patch rename to Spigot-Server-Patches/0456-Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/Spigot-Server-Patches/0458-Add-phantom-creative-and-insomniac-controls.patch b/Spigot-Server-Patches/0457-Add-phantom-creative-and-insomniac-controls.patch similarity index 100% rename from Spigot-Server-Patches/0458-Add-phantom-creative-and-insomniac-controls.patch rename to Spigot-Server-Patches/0457-Add-phantom-creative-and-insomniac-controls.patch diff --git a/Spigot-Server-Patches/0459-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/Spigot-Server-Patches/0458-Fix-numerous-item-duplication-issues-and-teleport-is.patch similarity index 100% rename from Spigot-Server-Patches/0459-Fix-numerous-item-duplication-issues-and-teleport-is.patch rename to Spigot-Server-Patches/0458-Fix-numerous-item-duplication-issues-and-teleport-is.patch diff --git a/Spigot-Server-Patches/0460-Implement-Brigadier-Mojang-API.patch b/Spigot-Server-Patches/0459-Implement-Brigadier-Mojang-API.patch similarity index 100% rename from Spigot-Server-Patches/0460-Implement-Brigadier-Mojang-API.patch rename to Spigot-Server-Patches/0459-Implement-Brigadier-Mojang-API.patch diff --git a/Spigot-Server-Patches/0461-Villager-Restocks-API.patch b/Spigot-Server-Patches/0460-Villager-Restocks-API.patch similarity index 100% rename from Spigot-Server-Patches/0461-Villager-Restocks-API.patch rename to Spigot-Server-Patches/0460-Villager-Restocks-API.patch diff --git a/Spigot-Server-Patches/0462-Validate-PickItem-Packet-and-kick-for-invalid.patch b/Spigot-Server-Patches/0461-Validate-PickItem-Packet-and-kick-for-invalid.patch similarity index 100% rename from Spigot-Server-Patches/0462-Validate-PickItem-Packet-and-kick-for-invalid.patch rename to Spigot-Server-Patches/0461-Validate-PickItem-Packet-and-kick-for-invalid.patch diff --git a/Spigot-Server-Patches/0463-Expose-game-version.patch b/Spigot-Server-Patches/0462-Expose-game-version.patch similarity index 100% rename from Spigot-Server-Patches/0463-Expose-game-version.patch rename to Spigot-Server-Patches/0462-Expose-game-version.patch diff --git a/Spigot-Server-Patches/0464-Optimize-Voxel-Shape-Merging.patch b/Spigot-Server-Patches/0463-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from Spigot-Server-Patches/0464-Optimize-Voxel-Shape-Merging.patch rename to Spigot-Server-Patches/0463-Optimize-Voxel-Shape-Merging.patch diff --git a/Spigot-Server-Patches/0465-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/Spigot-Server-Patches/0464-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 100% rename from Spigot-Server-Patches/0465-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to Spigot-Server-Patches/0464-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch diff --git a/Spigot-Server-Patches/0466-Implement-Mob-Goal-API.patch b/Spigot-Server-Patches/0465-Implement-Mob-Goal-API.patch similarity index 100% rename from Spigot-Server-Patches/0466-Implement-Mob-Goal-API.patch rename to Spigot-Server-Patches/0465-Implement-Mob-Goal-API.patch diff --git a/Spigot-Server-Patches/0467-Use-distance-map-to-optimise-entity-tracker.patch b/Spigot-Server-Patches/0466-Use-distance-map-to-optimise-entity-tracker.patch similarity index 100% rename from Spigot-Server-Patches/0467-Use-distance-map-to-optimise-entity-tracker.patch rename to Spigot-Server-Patches/0466-Use-distance-map-to-optimise-entity-tracker.patch diff --git a/Spigot-Server-Patches/0468-Optimize-isOutsideRange-to-use-distance-maps.patch b/Spigot-Server-Patches/0467-Optimize-isOutsideRange-to-use-distance-maps.patch similarity index 100% rename from Spigot-Server-Patches/0468-Optimize-isOutsideRange-to-use-distance-maps.patch rename to Spigot-Server-Patches/0467-Optimize-isOutsideRange-to-use-distance-maps.patch diff --git a/Spigot-Server-Patches/0469-Stop-copy-on-write-operations-for-updating-light-dat.patch b/Spigot-Server-Patches/0468-Stop-copy-on-write-operations-for-updating-light-dat.patch similarity index 100% rename from Spigot-Server-Patches/0469-Stop-copy-on-write-operations-for-updating-light-dat.patch rename to Spigot-Server-Patches/0468-Stop-copy-on-write-operations-for-updating-light-dat.patch diff --git a/Spigot-Server-Patches/0470-No-Tick-view-distance-implementation.patch b/Spigot-Server-Patches/0469-No-Tick-view-distance-implementation.patch similarity index 99% rename from Spigot-Server-Patches/0470-No-Tick-view-distance-implementation.patch rename to Spigot-Server-Patches/0469-No-Tick-view-distance-implementation.patch index c35e40dfb7..05c4b76cc4 100644 --- a/Spigot-Server-Patches/0470-No-Tick-view-distance-implementation.patch +++ b/Spigot-Server-Patches/0469-No-Tick-view-distance-implementation.patch @@ -576,7 +576,7 @@ index b4067657eefe6a418b76b599b4c8ffb8359c3f89..3e73ef8059139b09518075bb6dc89a67 } } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 7b20dd6d65288aca780f61bf2fc1acc47022af10..768adaa809e88412fcf8f7f60d6177667278f8fc 100644 +index 0f46aac9d021dc115718b1e36b8fbe28cbc820c6..b8ab8150b7dfe9e34910d35f565083e806c4fb0c 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -175,7 +175,7 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0471-Add-villager-reputation-API.patch b/Spigot-Server-Patches/0470-Add-villager-reputation-API.patch similarity index 100% rename from Spigot-Server-Patches/0471-Add-villager-reputation-API.patch rename to Spigot-Server-Patches/0470-Add-villager-reputation-API.patch diff --git a/Spigot-Server-Patches/0472-Fix-Light-Command.patch b/Spigot-Server-Patches/0471-Fix-Light-Command.patch similarity index 100% rename from Spigot-Server-Patches/0472-Fix-Light-Command.patch rename to Spigot-Server-Patches/0471-Fix-Light-Command.patch diff --git a/Spigot-Server-Patches/0473-Fix-PotionEffect-ignores-icon-flag.patch b/Spigot-Server-Patches/0472-Fix-PotionEffect-ignores-icon-flag.patch similarity index 100% rename from Spigot-Server-Patches/0473-Fix-PotionEffect-ignores-icon-flag.patch rename to Spigot-Server-Patches/0472-Fix-PotionEffect-ignores-icon-flag.patch diff --git a/Spigot-Server-Patches/0474-Optimize-brigadier-child-sorting-performance.patch b/Spigot-Server-Patches/0473-Optimize-brigadier-child-sorting-performance.patch similarity index 100% rename from Spigot-Server-Patches/0474-Optimize-brigadier-child-sorting-performance.patch rename to Spigot-Server-Patches/0473-Optimize-brigadier-child-sorting-performance.patch diff --git a/Spigot-Server-Patches/0475-Don-t-toString-block-unless-actually-showing-the-mes.patch b/Spigot-Server-Patches/0474-Don-t-toString-block-unless-actually-showing-the-mes.patch similarity index 100% rename from Spigot-Server-Patches/0475-Don-t-toString-block-unless-actually-showing-the-mes.patch rename to Spigot-Server-Patches/0474-Don-t-toString-block-unless-actually-showing-the-mes.patch diff --git a/Spigot-Server-Patches/0476-Potential-bed-API.patch b/Spigot-Server-Patches/0475-Potential-bed-API.patch similarity index 100% rename from Spigot-Server-Patches/0476-Potential-bed-API.patch rename to Spigot-Server-Patches/0475-Potential-bed-API.patch diff --git a/Spigot-Server-Patches/0477-Wait-for-Async-Tasks-during-shutdown.patch b/Spigot-Server-Patches/0476-Wait-for-Async-Tasks-during-shutdown.patch similarity index 100% rename from Spigot-Server-Patches/0477-Wait-for-Async-Tasks-during-shutdown.patch rename to Spigot-Server-Patches/0476-Wait-for-Async-Tasks-during-shutdown.patch diff --git a/Spigot-Server-Patches/0478-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/Spigot-Server-Patches/0477-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch similarity index 100% rename from Spigot-Server-Patches/0478-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch rename to Spigot-Server-Patches/0477-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch diff --git a/Spigot-Server-Patches/0479-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/Spigot-Server-Patches/0478-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 100% rename from Spigot-Server-Patches/0479-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to Spigot-Server-Patches/0478-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch diff --git a/Spigot-Server-Patches/0480-Optimize-NibbleArray-to-use-pooled-buffers.patch b/Spigot-Server-Patches/0479-Optimize-NibbleArray-to-use-pooled-buffers.patch similarity index 100% rename from Spigot-Server-Patches/0480-Optimize-NibbleArray-to-use-pooled-buffers.patch rename to Spigot-Server-Patches/0479-Optimize-NibbleArray-to-use-pooled-buffers.patch diff --git a/Spigot-Server-Patches/0481-Reduce-MutableInt-allocations-from-light-engine.patch b/Spigot-Server-Patches/0480-Reduce-MutableInt-allocations-from-light-engine.patch similarity index 100% rename from Spigot-Server-Patches/0481-Reduce-MutableInt-allocations-from-light-engine.patch rename to Spigot-Server-Patches/0480-Reduce-MutableInt-allocations-from-light-engine.patch diff --git a/Spigot-Server-Patches/0482-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/Spigot-Server-Patches/0481-Reduce-allocation-of-Vec3D-by-entity-tracker.patch similarity index 100% rename from Spigot-Server-Patches/0482-Reduce-allocation-of-Vec3D-by-entity-tracker.patch rename to Spigot-Server-Patches/0481-Reduce-allocation-of-Vec3D-by-entity-tracker.patch diff --git a/Spigot-Server-Patches/0483-Ensure-safe-gateway-teleport.patch b/Spigot-Server-Patches/0482-Ensure-safe-gateway-teleport.patch similarity index 100% rename from Spigot-Server-Patches/0483-Ensure-safe-gateway-teleport.patch rename to Spigot-Server-Patches/0482-Ensure-safe-gateway-teleport.patch diff --git a/Spigot-Server-Patches/0484-Add-option-for-console-having-all-permissions.patch b/Spigot-Server-Patches/0483-Add-option-for-console-having-all-permissions.patch similarity index 100% rename from Spigot-Server-Patches/0484-Add-option-for-console-having-all-permissions.patch rename to Spigot-Server-Patches/0483-Add-option-for-console-having-all-permissions.patch diff --git a/Spigot-Server-Patches/0485-Workaround-for-Client-Lag-Spikes-MC-162253.patch b/Spigot-Server-Patches/0484-Workaround-for-Client-Lag-Spikes-MC-162253.patch similarity index 100% rename from Spigot-Server-Patches/0485-Workaround-for-Client-Lag-Spikes-MC-162253.patch rename to Spigot-Server-Patches/0484-Workaround-for-Client-Lag-Spikes-MC-162253.patch diff --git a/Spigot-Server-Patches/0486-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/Spigot-Server-Patches/0485-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch similarity index 99% rename from Spigot-Server-Patches/0486-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch rename to Spigot-Server-Patches/0485-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch index cfe333220c..4e63dbfbd6 100644 --- a/Spigot-Server-Patches/0486-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch +++ b/Spigot-Server-Patches/0485-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch @@ -1158,7 +1158,7 @@ index 37b7925b0c6dea0920d67cacf3b1982e8034e202..99b9da1f8f214082fb30070f7e853447 } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 768adaa809e88412fcf8f7f60d6177667278f8fc..c975ca0b7443b732b93f9fe244926074792cc4fb 100644 +index b8ab8150b7dfe9e34910d35f565083e806c4fb0c..0c71059c10dbb840c5b2aca91bc377c8db53bf52 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -196,8 +196,8 @@ public abstract class PlayerList { @@ -1237,7 +1237,7 @@ index f35dda50fd9015a793708d214c648d75f9f87e2b..ae1f9dde6887988ca682f53cba316ce5 net.minecraft.server.Chunk chunk = (net.minecraft.server.Chunk) either.left().orElse(null); return CompletableFuture.completedFuture(chunk == null ? null : chunk.getBukkitChunk()); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a4c112844ce99e770d8ad2df5a096be39897c4ce..1fb88aefa052bc61a7421378a48bb7f0846d7fa9 100644 +index 708636e9ce98a8e83ffb3854e14912d135a58c1d..0697f39459ffb3905b68010541b1f200bc92ad90 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -766,6 +766,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0487-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch b/Spigot-Server-Patches/0486-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch similarity index 100% rename from Spigot-Server-Patches/0487-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch rename to Spigot-Server-Patches/0486-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch diff --git a/Spigot-Server-Patches/0488-Optimize-sending-packets-to-nearby-locations-sounds-.patch b/Spigot-Server-Patches/0487-Optimize-sending-packets-to-nearby-locations-sounds-.patch similarity index 97% rename from Spigot-Server-Patches/0488-Optimize-sending-packets-to-nearby-locations-sounds-.patch rename to Spigot-Server-Patches/0487-Optimize-sending-packets-to-nearby-locations-sounds-.patch index fc5a332f3f..332a991326 100644 --- a/Spigot-Server-Patches/0488-Optimize-sending-packets-to-nearby-locations-sounds-.patch +++ b/Spigot-Server-Patches/0487-Optimize-sending-packets-to-nearby-locations-sounds-.patch @@ -11,7 +11,7 @@ This will drastically cut down on packet sending cost for worlds with lots of players in them. diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index c975ca0b7443b732b93f9fe244926074792cc4fb..a7e3a89a25771e4650bf7d44fe006825f8e766ec 100644 +index 0c71059c10dbb840c5b2aca91bc377c8db53bf52..82e3ddc25f1b9f3cbf25a457227335df27ae5d0f 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1073,16 +1073,40 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0489-Improve-Chunk-Status-Transition-Speed.patch b/Spigot-Server-Patches/0488-Improve-Chunk-Status-Transition-Speed.patch similarity index 100% rename from Spigot-Server-Patches/0489-Improve-Chunk-Status-Transition-Speed.patch rename to Spigot-Server-Patches/0488-Improve-Chunk-Status-Transition-Speed.patch diff --git a/Spigot-Server-Patches/0490-Fix-villager-trading-demand-MC-163962.patch b/Spigot-Server-Patches/0489-Fix-villager-trading-demand-MC-163962.patch similarity index 100% rename from Spigot-Server-Patches/0490-Fix-villager-trading-demand-MC-163962.patch rename to Spigot-Server-Patches/0489-Fix-villager-trading-demand-MC-163962.patch diff --git a/Spigot-Server-Patches/0491-Maps-shouldn-t-load-chunks.patch b/Spigot-Server-Patches/0490-Maps-shouldn-t-load-chunks.patch similarity index 100% rename from Spigot-Server-Patches/0491-Maps-shouldn-t-load-chunks.patch rename to Spigot-Server-Patches/0490-Maps-shouldn-t-load-chunks.patch diff --git a/Spigot-Server-Patches/0492-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/Spigot-Server-Patches/0491-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch similarity index 94% rename from Spigot-Server-Patches/0492-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch rename to Spigot-Server-Patches/0491-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch index 6465c2e091..12467ab4ba 100644 --- a/Spigot-Server-Patches/0492-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch +++ b/Spigot-Server-Patches/0491-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch @@ -19,7 +19,7 @@ index 63b112b38a51873cf5769ad8506c3fdb9d52d42c..910d1b3788fa713cadf2c8a56f595282 } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 977a48bdd81d18992cacbd0ce6be2418fa9a103f..07264de4f33f9fcadb568c2fb3b95c9b1ba85212 100644 +index 00e88ddd3d41491db2508dba2a544df807703fb0..54de557dd5ff0cae168fc51a5c3cf3d3e4e0d64b 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -307,8 +307,8 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0493-Optimize-Bit-Operations-by-inlining.patch b/Spigot-Server-Patches/0492-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from Spigot-Server-Patches/0493-Optimize-Bit-Operations-by-inlining.patch rename to Spigot-Server-Patches/0492-Optimize-Bit-Operations-by-inlining.patch diff --git a/Spigot-Server-Patches/0494-Optimize-Light-Engine.patch b/Spigot-Server-Patches/0493-Optimize-Light-Engine.patch similarity index 99% rename from Spigot-Server-Patches/0494-Optimize-Light-Engine.patch rename to Spigot-Server-Patches/0493-Optimize-Light-Engine.patch index b491d277ed..f6220ab308 100644 --- a/Spigot-Server-Patches/0494-Optimize-Light-Engine.patch +++ b/Spigot-Server-Patches/0493-Optimize-Light-Engine.patch @@ -1400,7 +1400,7 @@ index b7af235dc2841dc9c8296805624f6ee763b86dfb..faf4745d368993ccdf0c017937efc5be this.a.a(t0); this.f(); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 07264de4f33f9fcadb568c2fb3b95c9b1ba85212..1642bb724032530f6ecbc849f449b93e7c450873 100644 +index 54de557dd5ff0cae168fc51a5c3cf3d3e4e0d64b..1f1ea5c64f325f54a56a3b060706db13c18aca61 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -714,6 +714,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0495-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0494-Delay-Chunk-Unloads-based-on-Player-Movement.patch similarity index 100% rename from Spigot-Server-Patches/0495-Delay-Chunk-Unloads-based-on-Player-Movement.patch rename to Spigot-Server-Patches/0494-Delay-Chunk-Unloads-based-on-Player-Movement.patch diff --git a/Spigot-Server-Patches/0496-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/Spigot-Server-Patches/0495-Add-Plugin-Tickets-to-API-Chunk-Methods.patch similarity index 100% rename from Spigot-Server-Patches/0496-Add-Plugin-Tickets-to-API-Chunk-Methods.patch rename to Spigot-Server-Patches/0495-Add-Plugin-Tickets-to-API-Chunk-Methods.patch diff --git a/Spigot-Server-Patches/0497-Fix-missing-chunks-due-to-integer-overflow.patch b/Spigot-Server-Patches/0496-Fix-missing-chunks-due-to-integer-overflow.patch similarity index 100% rename from Spigot-Server-Patches/0497-Fix-missing-chunks-due-to-integer-overflow.patch rename to Spigot-Server-Patches/0496-Fix-missing-chunks-due-to-integer-overflow.patch diff --git a/Spigot-Server-Patches/0498-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/Spigot-Server-Patches/0497-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 100% rename from Spigot-Server-Patches/0498-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to Spigot-Server-Patches/0497-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch diff --git a/Spigot-Server-Patches/0499-Fix-piston-physics-inconsistency-MC-188840.patch b/Spigot-Server-Patches/0498-Fix-piston-physics-inconsistency-MC-188840.patch similarity index 100% rename from Spigot-Server-Patches/0499-Fix-piston-physics-inconsistency-MC-188840.patch rename to Spigot-Server-Patches/0498-Fix-piston-physics-inconsistency-MC-188840.patch diff --git a/Spigot-Server-Patches/0500-Fix-sand-duping.patch b/Spigot-Server-Patches/0499-Fix-sand-duping.patch similarity index 100% rename from Spigot-Server-Patches/0500-Fix-sand-duping.patch rename to Spigot-Server-Patches/0499-Fix-sand-duping.patch diff --git a/Spigot-Server-Patches/0501-Prevent-position-desync-in-playerconnection-causing-.patch b/Spigot-Server-Patches/0500-Prevent-position-desync-in-playerconnection-causing-.patch similarity index 100% rename from Spigot-Server-Patches/0501-Prevent-position-desync-in-playerconnection-causing-.patch rename to Spigot-Server-Patches/0500-Prevent-position-desync-in-playerconnection-causing-.patch diff --git a/Spigot-Server-Patches/0502-Fix-enderdragon-exp-dupe.patch b/Spigot-Server-Patches/0501-Fix-enderdragon-exp-dupe.patch similarity index 100% rename from Spigot-Server-Patches/0502-Fix-enderdragon-exp-dupe.patch rename to Spigot-Server-Patches/0501-Fix-enderdragon-exp-dupe.patch diff --git a/Spigot-Server-Patches/0503-Inventory-getHolder-method-without-block-snapshot.patch b/Spigot-Server-Patches/0502-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from Spigot-Server-Patches/0503-Inventory-getHolder-method-without-block-snapshot.patch rename to Spigot-Server-Patches/0502-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/Spigot-Server-Patches/0504-Expose-Arrow-getItemStack.patch b/Spigot-Server-Patches/0503-Expose-Arrow-getItemStack.patch similarity index 100% rename from Spigot-Server-Patches/0504-Expose-Arrow-getItemStack.patch rename to Spigot-Server-Patches/0503-Expose-Arrow-getItemStack.patch diff --git a/Spigot-Server-Patches/0505-Add-and-implement-PlayerRecipeBookClickEvent.patch b/Spigot-Server-Patches/0504-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from Spigot-Server-Patches/0505-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to Spigot-Server-Patches/0504-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/Spigot-Server-Patches/0506-Hide-sync-chunk-writes-behind-flag.patch b/Spigot-Server-Patches/0505-Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from Spigot-Server-Patches/0506-Hide-sync-chunk-writes-behind-flag.patch rename to Spigot-Server-Patches/0505-Hide-sync-chunk-writes-behind-flag.patch diff --git a/Spigot-Server-Patches/0507-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0506-Limit-lightning-strike-effect-distance.patch similarity index 100% rename from Spigot-Server-Patches/0507-Limit-lightning-strike-effect-distance.patch rename to Spigot-Server-Patches/0506-Limit-lightning-strike-effect-distance.patch diff --git a/Spigot-Server-Patches/0508-Add-permission-for-command-blocks.patch b/Spigot-Server-Patches/0507-Add-permission-for-command-blocks.patch similarity index 100% rename from Spigot-Server-Patches/0508-Add-permission-for-command-blocks.patch rename to Spigot-Server-Patches/0507-Add-permission-for-command-blocks.patch diff --git a/Spigot-Server-Patches/0509-Ensure-Entity-AABB-s-are-never-invalid.patch b/Spigot-Server-Patches/0508-Ensure-Entity-AABB-s-are-never-invalid.patch similarity index 100% rename from Spigot-Server-Patches/0509-Ensure-Entity-AABB-s-are-never-invalid.patch rename to Spigot-Server-Patches/0508-Ensure-Entity-AABB-s-are-never-invalid.patch diff --git a/Spigot-Server-Patches/0510-Optimize-WorldBorder-collision-checks-and-air.patch b/Spigot-Server-Patches/0509-Optimize-WorldBorder-collision-checks-and-air.patch similarity index 100% rename from Spigot-Server-Patches/0510-Optimize-WorldBorder-collision-checks-and-air.patch rename to Spigot-Server-Patches/0509-Optimize-WorldBorder-collision-checks-and-air.patch diff --git a/Spigot-Server-Patches/0511-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/Spigot-Server-Patches/0510-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 100% rename from Spigot-Server-Patches/0511-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to Spigot-Server-Patches/0510-Fix-Per-World-Difficulty-Remembering-Difficulty.patch diff --git a/Spigot-Server-Patches/0512-Paper-dumpitem-command.patch b/Spigot-Server-Patches/0511-Paper-dumpitem-command.patch similarity index 100% rename from Spigot-Server-Patches/0512-Paper-dumpitem-command.patch rename to Spigot-Server-Patches/0511-Paper-dumpitem-command.patch diff --git a/Spigot-Server-Patches/0513-Don-t-allow-null-UUID-s-for-chat.patch b/Spigot-Server-Patches/0512-Don-t-allow-null-UUID-s-for-chat.patch similarity index 100% rename from Spigot-Server-Patches/0513-Don-t-allow-null-UUID-s-for-chat.patch rename to Spigot-Server-Patches/0512-Don-t-allow-null-UUID-s-for-chat.patch diff --git a/Spigot-Server-Patches/0514-Improve-Legacy-Component-serialization-size.patch b/Spigot-Server-Patches/0513-Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from Spigot-Server-Patches/0514-Improve-Legacy-Component-serialization-size.patch rename to Spigot-Server-Patches/0513-Improve-Legacy-Component-serialization-size.patch diff --git a/Spigot-Server-Patches/0515-Support-old-UUID-format-for-NBT.patch b/Spigot-Server-Patches/0514-Support-old-UUID-format-for-NBT.patch similarity index 100% rename from Spigot-Server-Patches/0515-Support-old-UUID-format-for-NBT.patch rename to Spigot-Server-Patches/0514-Support-old-UUID-format-for-NBT.patch diff --git a/Spigot-Server-Patches/0516-Clean-up-duplicated-GameProfile-Properties.patch b/Spigot-Server-Patches/0515-Clean-up-duplicated-GameProfile-Properties.patch similarity index 100% rename from Spigot-Server-Patches/0516-Clean-up-duplicated-GameProfile-Properties.patch rename to Spigot-Server-Patches/0515-Clean-up-duplicated-GameProfile-Properties.patch diff --git a/Spigot-Server-Patches/0517-Convert-legacy-attributes-in-Item-Meta.patch b/Spigot-Server-Patches/0516-Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from Spigot-Server-Patches/0517-Convert-legacy-attributes-in-Item-Meta.patch rename to Spigot-Server-Patches/0516-Convert-legacy-attributes-in-Item-Meta.patch diff --git a/Spigot-Server-Patches/0518-Remove-some-streams-from-structures.patch b/Spigot-Server-Patches/0517-Remove-some-streams-from-structures.patch similarity index 100% rename from Spigot-Server-Patches/0518-Remove-some-streams-from-structures.patch rename to Spigot-Server-Patches/0517-Remove-some-streams-from-structures.patch diff --git a/Spigot-Server-Patches/0519-Remove-streams-from-classes-related-villager-gossip.patch b/Spigot-Server-Patches/0518-Remove-streams-from-classes-related-villager-gossip.patch similarity index 100% rename from Spigot-Server-Patches/0519-Remove-streams-from-classes-related-villager-gossip.patch rename to Spigot-Server-Patches/0518-Remove-streams-from-classes-related-villager-gossip.patch diff --git a/Spigot-Server-Patches/0520-Support-components-in-ItemMeta.patch b/Spigot-Server-Patches/0519-Support-components-in-ItemMeta.patch similarity index 100% rename from Spigot-Server-Patches/0520-Support-components-in-ItemMeta.patch rename to Spigot-Server-Patches/0519-Support-components-in-ItemMeta.patch diff --git a/Spigot-Server-Patches/0521-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/Spigot-Server-Patches/0520-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch similarity index 100% rename from Spigot-Server-Patches/0521-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch rename to Spigot-Server-Patches/0520-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch diff --git a/Spigot-Server-Patches/0522-Add-entity-liquid-API.patch b/Spigot-Server-Patches/0521-Add-entity-liquid-API.patch similarity index 100% rename from Spigot-Server-Patches/0522-Add-entity-liquid-API.patch rename to Spigot-Server-Patches/0521-Add-entity-liquid-API.patch diff --git a/Spigot-Server-Patches/0523-Update-itemstack-legacy-name-and-lore.patch b/Spigot-Server-Patches/0522-Update-itemstack-legacy-name-and-lore.patch similarity index 100% rename from Spigot-Server-Patches/0523-Update-itemstack-legacy-name-and-lore.patch rename to Spigot-Server-Patches/0522-Update-itemstack-legacy-name-and-lore.patch diff --git a/Spigot-Server-Patches/0524-Spawn-player-in-correct-world-on-login.patch b/Spigot-Server-Patches/0523-Spawn-player-in-correct-world-on-login.patch similarity index 94% rename from Spigot-Server-Patches/0524-Spawn-player-in-correct-world-on-login.patch rename to Spigot-Server-Patches/0523-Spawn-player-in-correct-world-on-login.patch index 400d5108fd..bc68f3dca1 100644 --- a/Spigot-Server-Patches/0524-Spawn-player-in-correct-world-on-login.patch +++ b/Spigot-Server-Patches/0523-Spawn-player-in-correct-world-on-login.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Spawn player in correct world on login diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index a7e3a89a25771e4650bf7d44fe006825f8e766ec..52322b3e9963b9e1b899a84fbb95bbaf048f8ad6 100644 +index 82e3ddc25f1b9f3cbf25a457227335df27ae5d0f..4bbf55379a02ab21b8caac96f894dc920a083635 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -119,7 +119,18 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0525-Add-PrepareResultEvent.patch b/Spigot-Server-Patches/0524-Add-PrepareResultEvent.patch similarity index 100% rename from Spigot-Server-Patches/0525-Add-PrepareResultEvent.patch rename to Spigot-Server-Patches/0524-Add-PrepareResultEvent.patch diff --git a/Spigot-Server-Patches/0526-Allow-delegation-to-vanilla-chunk-gen.patch b/Spigot-Server-Patches/0525-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from Spigot-Server-Patches/0526-Allow-delegation-to-vanilla-chunk-gen.patch rename to Spigot-Server-Patches/0525-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/Spigot-Server-Patches/0527-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/Spigot-Server-Patches/0526-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 100% rename from Spigot-Server-Patches/0527-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to Spigot-Server-Patches/0526-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch diff --git a/Spigot-Server-Patches/0528-Optimize-NetworkManager-Exception-Handling.patch b/Spigot-Server-Patches/0527-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from Spigot-Server-Patches/0528-Optimize-NetworkManager-Exception-Handling.patch rename to Spigot-Server-Patches/0527-Optimize-NetworkManager-Exception-Handling.patch diff --git a/Spigot-Server-Patches/0529-Fix-Concurrency-issue-in-WeightedList.patch b/Spigot-Server-Patches/0528-Fix-Concurrency-issue-in-WeightedList.patch similarity index 100% rename from Spigot-Server-Patches/0529-Fix-Concurrency-issue-in-WeightedList.patch rename to Spigot-Server-Patches/0528-Fix-Concurrency-issue-in-WeightedList.patch diff --git a/Spigot-Server-Patches/0530-Optimize-the-advancement-data-player-iteration-to-be.patch b/Spigot-Server-Patches/0529-Optimize-the-advancement-data-player-iteration-to-be.patch similarity index 100% rename from Spigot-Server-Patches/0530-Optimize-the-advancement-data-player-iteration-to-be.patch rename to Spigot-Server-Patches/0529-Optimize-the-advancement-data-player-iteration-to-be.patch diff --git a/Spigot-Server-Patches/0531-Fix-arrows-never-despawning-MC-125757.patch b/Spigot-Server-Patches/0530-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from Spigot-Server-Patches/0531-Fix-arrows-never-despawning-MC-125757.patch rename to Spigot-Server-Patches/0530-Fix-arrows-never-despawning-MC-125757.patch diff --git a/Spigot-Server-Patches/0532-Thread-Safe-Vanilla-Command-permission-checking.patch b/Spigot-Server-Patches/0531-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from Spigot-Server-Patches/0532-Thread-Safe-Vanilla-Command-permission-checking.patch rename to Spigot-Server-Patches/0531-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/Spigot-Server-Patches/0533-Move-range-check-for-block-placing-up.patch b/Spigot-Server-Patches/0532-Move-range-check-for-block-placing-up.patch similarity index 100% rename from Spigot-Server-Patches/0533-Move-range-check-for-block-placing-up.patch rename to Spigot-Server-Patches/0532-Move-range-check-for-block-placing-up.patch diff --git a/Spigot-Server-Patches/0534-Fix-SPIGOT-5989.patch b/Spigot-Server-Patches/0533-Fix-SPIGOT-5989.patch similarity index 96% rename from Spigot-Server-Patches/0534-Fix-SPIGOT-5989.patch rename to Spigot-Server-Patches/0533-Fix-SPIGOT-5989.patch index a258007ad9..226d42d65b 100644 --- a/Spigot-Server-Patches/0534-Fix-SPIGOT-5989.patch +++ b/Spigot-Server-Patches/0533-Fix-SPIGOT-5989.patch @@ -10,7 +10,7 @@ This fixes that by checking if the modified spawn location is still at a respawn anchor. diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 52322b3e9963b9e1b899a84fbb95bbaf048f8ad6..41f55e575b26200809711637ded5c7cfd34b0d1f 100644 +index 4bbf55379a02ab21b8caac96f894dc920a083635..1f7ded35ee0586c27d8cceabcb20ccb2369e8c02 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -770,6 +770,7 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0535-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/Spigot-Server-Patches/0534-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from Spigot-Server-Patches/0535-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to Spigot-Server-Patches/0534-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/Spigot-Server-Patches/0536-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/Spigot-Server-Patches/0535-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from Spigot-Server-Patches/0536-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to Spigot-Server-Patches/0535-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/Spigot-Server-Patches/0537-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/Spigot-Server-Patches/0536-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from Spigot-Server-Patches/0537-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to Spigot-Server-Patches/0536-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/Spigot-Server-Patches/0538-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/Spigot-Server-Patches/0537-Add-missing-strikeLighting-call-to-World-spigot-stri.patch similarity index 100% rename from Spigot-Server-Patches/0538-Add-missing-strikeLighting-call-to-World-spigot-stri.patch rename to Spigot-Server-Patches/0537-Add-missing-strikeLighting-call-to-World-spigot-stri.patch diff --git a/Spigot-Server-Patches/0539-Fix-some-rails-connecting-improperly.patch b/Spigot-Server-Patches/0538-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from Spigot-Server-Patches/0539-Fix-some-rails-connecting-improperly.patch rename to Spigot-Server-Patches/0538-Fix-some-rails-connecting-improperly.patch diff --git a/Spigot-Server-Patches/0540-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/Spigot-Server-Patches/0539-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from Spigot-Server-Patches/0540-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to Spigot-Server-Patches/0539-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/Spigot-Server-Patches/0541-Incremental-player-saving.patch b/Spigot-Server-Patches/0540-Incremental-player-saving.patch similarity index 98% rename from Spigot-Server-Patches/0541-Incremental-player-saving.patch rename to Spigot-Server-Patches/0540-Incremental-player-saving.patch index c4321481eb..7aa18e20ea 100644 --- a/Spigot-Server-Patches/0541-Incremental-player-saving.patch +++ b/Spigot-Server-Patches/0540-Incremental-player-saving.patch @@ -59,7 +59,7 @@ index 1aabd16cd23a2bcdd6e29de63fca36226c05c428..c52de0ad2496888e462bef6c9f751d03 // Paper start for (WorldServer world : getWorlds()) { diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 41f55e575b26200809711637ded5c7cfd34b0d1f..eb247855f880049e85372ea8dfcc2bf10d756835 100644 +index 1f7ded35ee0586c27d8cceabcb20ccb2369e8c02..ad6207dfb9b524b6d85bf8d904527db04672661d 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -482,6 +482,7 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0542-Import-fastutil-classes.patch b/Spigot-Server-Patches/0541-Import-fastutil-classes.patch similarity index 100% rename from Spigot-Server-Patches/0542-Import-fastutil-classes.patch rename to Spigot-Server-Patches/0541-Import-fastutil-classes.patch diff --git a/Spigot-Server-Patches/0543-Don-t-mark-null-chunk-sections-for-block-updates.patch b/Spigot-Server-Patches/0542-Don-t-mark-null-chunk-sections-for-block-updates.patch similarity index 100% rename from Spigot-Server-Patches/0543-Don-t-mark-null-chunk-sections-for-block-updates.patch rename to Spigot-Server-Patches/0542-Don-t-mark-null-chunk-sections-for-block-updates.patch diff --git a/Spigot-Server-Patches/0544-Remove-armour-stand-double-add-to-world.patch b/Spigot-Server-Patches/0543-Remove-armour-stand-double-add-to-world.patch similarity index 100% rename from Spigot-Server-Patches/0544-Remove-armour-stand-double-add-to-world.patch rename to Spigot-Server-Patches/0543-Remove-armour-stand-double-add-to-world.patch diff --git a/Spigot-Server-Patches/0545-Fix-MC-187716-Use-configured-height.patch b/Spigot-Server-Patches/0544-Fix-MC-187716-Use-configured-height.patch similarity index 100% rename from Spigot-Server-Patches/0545-Fix-MC-187716-Use-configured-height.patch rename to Spigot-Server-Patches/0544-Fix-MC-187716-Use-configured-height.patch diff --git a/Spigot-Server-Patches/0546-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/Spigot-Server-Patches/0545-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from Spigot-Server-Patches/0546-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to Spigot-Server-Patches/0545-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/Spigot-Server-Patches/0547-Do-not-let-the-server-load-chunks-from-newer-version.patch b/Spigot-Server-Patches/0546-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from Spigot-Server-Patches/0547-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to Spigot-Server-Patches/0546-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/Spigot-Server-Patches/0548-Brand-support.patch b/Spigot-Server-Patches/0547-Brand-support.patch similarity index 97% rename from Spigot-Server-Patches/0548-Brand-support.patch rename to Spigot-Server-Patches/0547-Brand-support.patch index a18e346c30..3449320d04 100644 --- a/Spigot-Server-Patches/0548-Brand-support.patch +++ b/Spigot-Server-Patches/0547-Brand-support.patch @@ -65,7 +65,7 @@ index eae8ba055b0cd595a31ce4d99622366ce2cc9bb0..6cb6a6d2cdf25c7db0e3d2c79af2c100 return (!this.player.joining && !this.networkManager.isConnected()) || this.processedDisconnect; // Paper } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 1fb88aefa052bc61a7421378a48bb7f0846d7fa9..01b554c3caf4322cfc403db24433e3db70b9c579 100644 +index 0697f39459ffb3905b68010541b1f200bc92ad90..1a536de0397fdec40fe821ff45b2b10665cf807a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2190,6 +2190,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0549-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch b/Spigot-Server-Patches/0548-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch similarity index 100% rename from Spigot-Server-Patches/0549-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch rename to Spigot-Server-Patches/0548-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch diff --git a/Spigot-Server-Patches/0550-Fix-MC-197271.patch b/Spigot-Server-Patches/0549-Fix-MC-197271.patch similarity index 100% rename from Spigot-Server-Patches/0550-Fix-MC-197271.patch rename to Spigot-Server-Patches/0549-Fix-MC-197271.patch diff --git a/Spigot-Server-Patches/0551-MC-197883-Bandaid-decode-issue.patch b/Spigot-Server-Patches/0550-MC-197883-Bandaid-decode-issue.patch similarity index 100% rename from Spigot-Server-Patches/0551-MC-197883-Bandaid-decode-issue.patch rename to Spigot-Server-Patches/0550-MC-197883-Bandaid-decode-issue.patch diff --git a/Spigot-Server-Patches/0552-Add-setMaxPlayers-API.patch b/Spigot-Server-Patches/0551-Add-setMaxPlayers-API.patch similarity index 100% rename from Spigot-Server-Patches/0552-Add-setMaxPlayers-API.patch rename to Spigot-Server-Patches/0551-Add-setMaxPlayers-API.patch diff --git a/Spigot-Server-Patches/0553-Add-playPickupItemAnimation-to-LivingEntity.patch b/Spigot-Server-Patches/0552-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from Spigot-Server-Patches/0553-Add-playPickupItemAnimation-to-LivingEntity.patch rename to Spigot-Server-Patches/0552-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/Spigot-Server-Patches/0554-Don-t-require-FACING-data.patch b/Spigot-Server-Patches/0553-Don-t-require-FACING-data.patch similarity index 100% rename from Spigot-Server-Patches/0554-Don-t-require-FACING-data.patch rename to Spigot-Server-Patches/0553-Don-t-require-FACING-data.patch diff --git a/Spigot-Server-Patches/0555-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/Spigot-Server-Patches/0554-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 100% rename from Spigot-Server-Patches/0555-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to Spigot-Server-Patches/0554-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch diff --git a/Spigot-Server-Patches/0556-Add-moon-phase-API.patch b/Spigot-Server-Patches/0555-Add-moon-phase-API.patch similarity index 100% rename from Spigot-Server-Patches/0556-Add-moon-phase-API.patch rename to Spigot-Server-Patches/0555-Add-moon-phase-API.patch diff --git a/Spigot-Server-Patches/0557-Prevent-headless-pistons-from-being-created.patch b/Spigot-Server-Patches/0556-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from Spigot-Server-Patches/0557-Prevent-headless-pistons-from-being-created.patch rename to Spigot-Server-Patches/0556-Prevent-headless-pistons-from-being-created.patch diff --git a/Spigot-Server-Patches/0558-Brand-support.patch b/Spigot-Server-Patches/0557-Brand-support.patch similarity index 89% rename from Spigot-Server-Patches/0558-Brand-support.patch rename to Spigot-Server-Patches/0557-Brand-support.patch index 5faa477b9e..920c8ad403 100644 --- a/Spigot-Server-Patches/0558-Brand-support.patch +++ b/Spigot-Server-Patches/0557-Brand-support.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Brand support diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 01b554c3caf4322cfc403db24433e3db70b9c579..7f3275b89a6ab745091a42175be916d8997163df 100644 +index 1a536de0397fdec40fe821ff45b2b10665cf807a..16e9f6b263d6c625f159f5c01aa62d14394e6554 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2193,7 +2193,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0559-Add-BellRingEvent.patch b/Spigot-Server-Patches/0558-Add-BellRingEvent.patch similarity index 100% rename from Spigot-Server-Patches/0559-Add-BellRingEvent.patch rename to Spigot-Server-Patches/0558-Add-BellRingEvent.patch diff --git a/Spigot-Server-Patches/0560-Add-zombie-targets-turtle-egg-config.patch b/Spigot-Server-Patches/0559-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from Spigot-Server-Patches/0560-Add-zombie-targets-turtle-egg-config.patch rename to Spigot-Server-Patches/0559-Add-zombie-targets-turtle-egg-config.patch diff --git a/Spigot-Server-Patches/0561-Buffer-joins-to-world.patch b/Spigot-Server-Patches/0560-Buffer-joins-to-world.patch similarity index 100% rename from Spigot-Server-Patches/0561-Buffer-joins-to-world.patch rename to Spigot-Server-Patches/0560-Buffer-joins-to-world.patch diff --git a/Spigot-Server-Patches/0562-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0561-Optimize-redstone-algorithm.patch similarity index 100% rename from Spigot-Server-Patches/0562-Optimize-redstone-algorithm.patch rename to Spigot-Server-Patches/0561-Optimize-redstone-algorithm.patch diff --git a/Spigot-Server-Patches/0563-Fix-hex-colors-not-working-in-some-kick-messages.patch b/Spigot-Server-Patches/0562-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from Spigot-Server-Patches/0563-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to Spigot-Server-Patches/0562-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/Spigot-Server-Patches/0564-PortalCreateEvent-needs-to-know-its-entity.patch b/Spigot-Server-Patches/0563-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from Spigot-Server-Patches/0564-PortalCreateEvent-needs-to-know-its-entity.patch rename to Spigot-Server-Patches/0563-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/Spigot-Server-Patches/0565-Fix-CraftTeam-null-check.patch b/Spigot-Server-Patches/0564-Fix-CraftTeam-null-check.patch similarity index 100% rename from Spigot-Server-Patches/0565-Fix-CraftTeam-null-check.patch rename to Spigot-Server-Patches/0564-Fix-CraftTeam-null-check.patch diff --git a/Spigot-Server-Patches/0566-Add-more-Evoker-API.patch b/Spigot-Server-Patches/0565-Add-more-Evoker-API.patch similarity index 100% rename from Spigot-Server-Patches/0566-Add-more-Evoker-API.patch rename to Spigot-Server-Patches/0565-Add-more-Evoker-API.patch diff --git a/Spigot-Server-Patches/0567-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/Spigot-Server-Patches/0566-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch similarity index 100% rename from Spigot-Server-Patches/0567-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch rename to Spigot-Server-Patches/0566-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch diff --git a/Spigot-Server-Patches/0568-Create-HoverEvent-from-ItemStack-Entity.patch b/Spigot-Server-Patches/0567-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from Spigot-Server-Patches/0568-Create-HoverEvent-from-ItemStack-Entity.patch rename to Spigot-Server-Patches/0567-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/Spigot-Server-Patches/0569-Cache-block-data-strings.patch b/Spigot-Server-Patches/0568-Cache-block-data-strings.patch similarity index 100% rename from Spigot-Server-Patches/0569-Cache-block-data-strings.patch rename to Spigot-Server-Patches/0568-Cache-block-data-strings.patch diff --git a/Spigot-Server-Patches/0570-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/Spigot-Server-Patches/0569-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 100% rename from Spigot-Server-Patches/0570-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to Spigot-Server-Patches/0569-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch diff --git a/Spigot-Server-Patches/0571-Add-additional-open-container-api-to-HumanEntity.patch b/Spigot-Server-Patches/0570-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from Spigot-Server-Patches/0571-Add-additional-open-container-api-to-HumanEntity.patch rename to Spigot-Server-Patches/0570-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/Spigot-Server-Patches/0572-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/Spigot-Server-Patches/0571-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from Spigot-Server-Patches/0572-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to Spigot-Server-Patches/0571-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/Spigot-Server-Patches/0573-Extend-block-drop-capture-to-capture-all-items-added.patch b/Spigot-Server-Patches/0572-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 100% rename from Spigot-Server-Patches/0573-Extend-block-drop-capture-to-capture-all-items-added.patch rename to Spigot-Server-Patches/0572-Extend-block-drop-capture-to-capture-all-items-added.patch diff --git a/Spigot-Server-Patches/0574-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/Spigot-Server-Patches/0573-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch similarity index 100% rename from Spigot-Server-Patches/0574-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch rename to Spigot-Server-Patches/0573-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch diff --git a/Spigot-Server-Patches/0575-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/Spigot-Server-Patches/0574-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from Spigot-Server-Patches/0575-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to Spigot-Server-Patches/0574-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/Spigot-Server-Patches/0576-Lazily-track-plugin-scoreboards-by-default.patch b/Spigot-Server-Patches/0575-Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from Spigot-Server-Patches/0576-Lazily-track-plugin-scoreboards-by-default.patch rename to Spigot-Server-Patches/0575-Lazily-track-plugin-scoreboards-by-default.patch diff --git a/Spigot-Server-Patches/0577-Entity-isTicking.patch b/Spigot-Server-Patches/0576-Entity-isTicking.patch similarity index 100% rename from Spigot-Server-Patches/0577-Entity-isTicking.patch rename to Spigot-Server-Patches/0576-Entity-isTicking.patch diff --git a/Spigot-Server-Patches/0578-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/Spigot-Server-Patches/0577-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from Spigot-Server-Patches/0578-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to Spigot-Server-Patches/0577-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/Spigot-Server-Patches/0579-Fix-Not-a-string-Map-Conversion-spam.patch b/Spigot-Server-Patches/0578-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from Spigot-Server-Patches/0579-Fix-Not-a-string-Map-Conversion-spam.patch rename to Spigot-Server-Patches/0578-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/Spigot-Server-Patches/0580-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch b/Spigot-Server-Patches/0579-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch similarity index 100% rename from Spigot-Server-Patches/0580-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch rename to Spigot-Server-Patches/0579-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch diff --git a/Spigot-Server-Patches/0581-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch b/Spigot-Server-Patches/0580-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch similarity index 100% rename from Spigot-Server-Patches/0581-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch rename to Spigot-Server-Patches/0580-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch diff --git a/Spigot-Server-Patches/0582-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/Spigot-Server-Patches/0581-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from Spigot-Server-Patches/0582-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to Spigot-Server-Patches/0581-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/Spigot-Server-Patches/0583-Fix-for-large-move-vectors-crashing-server.patch b/Spigot-Server-Patches/0582-Fix-for-large-move-vectors-crashing-server.patch similarity index 100% rename from Spigot-Server-Patches/0583-Fix-for-large-move-vectors-crashing-server.patch rename to Spigot-Server-Patches/0582-Fix-for-large-move-vectors-crashing-server.patch diff --git a/Spigot-Server-Patches/0584-Optimise-getType-calls.patch b/Spigot-Server-Patches/0583-Optimise-getType-calls.patch similarity index 100% rename from Spigot-Server-Patches/0584-Optimise-getType-calls.patch rename to Spigot-Server-Patches/0583-Optimise-getType-calls.patch diff --git a/Spigot-Server-Patches/0585-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/Spigot-Server-Patches/0584-Improve-inlinig-for-some-hot-IBlockData-methods.patch similarity index 100% rename from Spigot-Server-Patches/0585-Improve-inlinig-for-some-hot-IBlockData-methods.patch rename to Spigot-Server-Patches/0584-Improve-inlinig-for-some-hot-IBlockData-methods.patch diff --git a/Spigot-Server-Patches/0586-Retain-block-place-order-when-capturing-blockstates.patch b/Spigot-Server-Patches/0585-Retain-block-place-order-when-capturing-blockstates.patch similarity index 100% rename from Spigot-Server-Patches/0586-Retain-block-place-order-when-capturing-blockstates.patch rename to Spigot-Server-Patches/0585-Retain-block-place-order-when-capturing-blockstates.patch diff --git a/Spigot-Server-Patches/0587-Reduce-blockpos-allocation-from-pathfinding.patch b/Spigot-Server-Patches/0586-Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from Spigot-Server-Patches/0587-Reduce-blockpos-allocation-from-pathfinding.patch rename to Spigot-Server-Patches/0586-Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/Spigot-Server-Patches/0588-Fix-item-locations-dropped-from-campfires.patch b/Spigot-Server-Patches/0587-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from Spigot-Server-Patches/0588-Fix-item-locations-dropped-from-campfires.patch rename to Spigot-Server-Patches/0587-Fix-item-locations-dropped-from-campfires.patch diff --git a/Spigot-Server-Patches/0589-Player-elytra-boost-API.patch b/Spigot-Server-Patches/0588-Player-elytra-boost-API.patch similarity index 93% rename from Spigot-Server-Patches/0589-Player-elytra-boost-API.patch rename to Spigot-Server-Patches/0588-Player-elytra-boost-API.patch index 7aeafcb766..e6f08b659a 100644 --- a/Spigot-Server-Patches/0589-Player-elytra-boost-API.patch +++ b/Spigot-Server-Patches/0588-Player-elytra-boost-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Player elytra boost API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 7f3275b89a6ab745091a42175be916d8997163df..f4f4e29f56ff8658395c2f5049478eb54aed47bf 100644 +index 16e9f6b263d6c625f159f5c01aa62d14394e6554..81a11c7112770cf748c5cad52ea9e0662edee0b2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2086,6 +2086,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0590-Fixed-TileEntityBell-memory-leak.patch b/Spigot-Server-Patches/0589-Fixed-TileEntityBell-memory-leak.patch similarity index 100% rename from Spigot-Server-Patches/0590-Fixed-TileEntityBell-memory-leak.patch rename to Spigot-Server-Patches/0589-Fixed-TileEntityBell-memory-leak.patch diff --git a/Spigot-Server-Patches/0591-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/Spigot-Server-Patches/0590-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 100% rename from Spigot-Server-Patches/0591-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to Spigot-Server-Patches/0590-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/Spigot-Server-Patches/0592-Add-getOfflinePlayerIfCached-String.patch b/Spigot-Server-Patches/0591-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from Spigot-Server-Patches/0592-Add-getOfflinePlayerIfCached-String.patch rename to Spigot-Server-Patches/0591-Add-getOfflinePlayerIfCached-String.patch diff --git a/Spigot-Server-Patches/0593-Add-ignore-discounts-API.patch b/Spigot-Server-Patches/0592-Add-ignore-discounts-API.patch similarity index 100% rename from Spigot-Server-Patches/0593-Add-ignore-discounts-API.patch rename to Spigot-Server-Patches/0592-Add-ignore-discounts-API.patch diff --git a/Spigot-Server-Patches/0594-Toggle-for-removing-existing-dragon.patch b/Spigot-Server-Patches/0593-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from Spigot-Server-Patches/0594-Toggle-for-removing-existing-dragon.patch rename to Spigot-Server-Patches/0593-Toggle-for-removing-existing-dragon.patch diff --git a/Spigot-Server-Patches/0595-Fix-client-lag-on-advancement-loading.patch b/Spigot-Server-Patches/0594-Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from Spigot-Server-Patches/0595-Fix-client-lag-on-advancement-loading.patch rename to Spigot-Server-Patches/0594-Fix-client-lag-on-advancement-loading.patch diff --git a/Spigot-Server-Patches/0596-Item-no-age-no-player-pickup.patch b/Spigot-Server-Patches/0595-Item-no-age-no-player-pickup.patch similarity index 100% rename from Spigot-Server-Patches/0596-Item-no-age-no-player-pickup.patch rename to Spigot-Server-Patches/0595-Item-no-age-no-player-pickup.patch diff --git a/Spigot-Server-Patches/0597-Beacon-API-custom-effect-ranges.patch b/Spigot-Server-Patches/0596-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from Spigot-Server-Patches/0597-Beacon-API-custom-effect-ranges.patch rename to Spigot-Server-Patches/0596-Beacon-API-custom-effect-ranges.patch diff --git a/Spigot-Server-Patches/0598-Add-API-for-quit-reason.patch b/Spigot-Server-Patches/0597-Add-API-for-quit-reason.patch similarity index 100% rename from Spigot-Server-Patches/0598-Add-API-for-quit-reason.patch rename to Spigot-Server-Patches/0597-Add-API-for-quit-reason.patch diff --git a/Spigot-Server-Patches/0599-Seed-based-feature-search.patch b/Spigot-Server-Patches/0598-Seed-based-feature-search.patch similarity index 100% rename from Spigot-Server-Patches/0599-Seed-based-feature-search.patch rename to Spigot-Server-Patches/0598-Seed-based-feature-search.patch