diff --git a/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch index 912e4c6277..d2902a8edc 100644 --- a/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch +++ b/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses Change Javadoc to be accurate diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 6b951d5adf9a665fd8bf8560a3fd7deb14897b34..39423f3a689a69de666537603e97d50244827f64 100644 +index b46222ed2822fea563585462e43ee73ba2bb9b37..7b1978a258cbf74983dc2512092653ed4ff64e98 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -274,6 +274,26 @@ public final class Bukkit { @@ -37,7 +37,7 @@ index 6b951d5adf9a665fd8bf8560a3fd7deb14897b34..39423f3a689a69de666537603e97d502 * Gets the name of the update folder. The update folder is used to safely * update plugins at the right moment on a plugin load. diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index af21bb1aa133c6ab119f23c098d17a5bc4e9cd47..b09d010853a67db16787d9e764f1e2949cb33050 100644 +index d3c498ad0e7681422ef2117be41c6603ebce0e0a..e3385abec44c603201aa37e3b3180cf88d378b52 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -225,6 +225,26 @@ public interface Server extends PluginMessageRecipient { diff --git a/Spigot-API-Patches/0046-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-API-Patches/0046-Provide-E-TE-Chunk-count-stat-methods.patch index 6632e4ba1a..ca1b41a18b 100644 --- a/Spigot-API-Patches/0046-Provide-E-TE-Chunk-count-stat-methods.patch +++ b/Spigot-API-Patches/0046-Provide-E-TE-Chunk-count-stat-methods.patch @@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size() which creates copy of the collections. diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 9c7c74eb30d2f54843f5e103530f5b2592e8414e..75d62402181934d316582023fdc012ea3c74306a 100644 +index c79e083a97b849f9cdd3f9646c4f2892976b2a55..480386b2405953c3a06958a9728b38371d75662b 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -40,6 +40,33 @@ import org.jetbrains.annotations.Nullable; diff --git a/Spigot-API-Patches/0094-Additional-world.getNearbyEntities-API-s.patch b/Spigot-API-Patches/0094-Additional-world.getNearbyEntities-API-s.patch index b3278c8a90..ef34a0f2af 100644 --- a/Spigot-API-Patches/0094-Additional-world.getNearbyEntities-API-s.patch +++ b/Spigot-API-Patches/0094-Additional-world.getNearbyEntities-API-s.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Additional world.getNearbyEntities API's Provides more methods to get nearby entities, and filter by types and predicates diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index a636956c4772f4e38eaa71553d3dfbd7ef36f0cd..3150f7d81c87b57944231bd95bb2e49af51f7eca 100644 +index 55d114e3a17ea623ecc0d9fa87b14c3ffc65e6be..c422cfa1b599bc4c158dea178e5677c4b4545d99 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -1,6 +1,9 @@ diff --git a/Spigot-API-Patches/0111-Expand-Explosions-API.patch b/Spigot-API-Patches/0111-Expand-Explosions-API.patch index 11871fe62c..f5574a6e8c 100644 --- a/Spigot-API-Patches/0111-Expand-Explosions-API.patch +++ b/Spigot-API-Patches/0111-Expand-Explosions-API.patch @@ -106,7 +106,7 @@ index 4cf22afc3c1f1cc19b6e5350043431215908a612..ac3c8eef58872c2de840a4b7ba7d77c2 * Returns a list of entities within a bounding box centered around a Location. * diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index c478db22ade86ca58551ba94043dd1c2fd08004e..42129f705a3e821872538183ec38bbd179a4cfae 100644 +index 6e311dd8f1105c28be7259855e0b19ae182badfd..4cbea0cc7b2594ebbc555edb00a86dac6d293f91 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -1354,6 +1354,88 @@ public interface World extends PluginMessageRecipient, Metadatable { diff --git a/Spigot-API-Patches/0115-Add-World.getEntity-UUID-API.patch b/Spigot-API-Patches/0115-Add-World.getEntity-UUID-API.patch index cf2bc25a7e..121bb131ba 100644 --- a/Spigot-API-Patches/0115-Add-World.getEntity-UUID-API.patch +++ b/Spigot-API-Patches/0115-Add-World.getEntity-UUID-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add World.getEntity(UUID) API diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 42129f705a3e821872538183ec38bbd179a4cfae..f321f7a3b7afc3969edf2675a7872ffe31fb657f 100644 +index 4cbea0cc7b2594ebbc555edb00a86dac6d293f91..2e52059cdf2431baac09db521b02fbc4c594eb60 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -914,6 +914,17 @@ public interface World extends PluginMessageRecipient, Metadatable { diff --git a/Spigot-API-Patches/0131-Provide-Chunk-Coordinates-as-a-Long-API.patch b/Spigot-API-Patches/0131-Provide-Chunk-Coordinates-as-a-Long-API.patch index 4f42606789..0e7fd480ef 100644 --- a/Spigot-API-Patches/0131-Provide-Chunk-Coordinates-as-a-Long-API.patch +++ b/Spigot-API-Patches/0131-Provide-Chunk-Coordinates-as-a-Long-API.patch @@ -44,7 +44,7 @@ index 95e485eea693e7648e63d198c8591d89e02e6755..0bbef14a9fc2a3ec03b4db59c8d8e1ee * Gets the world containing this chunk * diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index f321f7a3b7afc3969edf2675a7872ffe31fb657f..008fb638b5b0601109c72c322caa7669403ae273 100644 +index 2e52059cdf2431baac09db521b02fbc4c594eb60..fe8b255aeb46e30d0a954dcd0e3e6ac29b4fd33d 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -207,6 +207,22 @@ public interface World extends PluginMessageRecipient, Metadatable { diff --git a/Spigot-API-Patches/0132-Async-Chunks-API.patch b/Spigot-API-Patches/0132-Async-Chunks-API.patch index c9e79329ad..9ad138ffec 100644 --- a/Spigot-API-Patches/0132-Async-Chunks-API.patch +++ b/Spigot-API-Patches/0132-Async-Chunks-API.patch @@ -8,7 +8,7 @@ Adds API's to load or generate chunks asynchronously. Also adds utility methods to Entity to teleport asynchronously. diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 008fb638b5b0601109c72c322caa7669403ae273..fbd9546731aaf5673603646136c668dbc59821b1 100644 +index fe8b255aeb46e30d0a954dcd0e3e6ac29b4fd33d..eef7750fdebb4fbd156d729e4cc87f7b3d0a2ad4 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -221,6 +221,467 @@ public interface World extends PluginMessageRecipient, Metadatable { diff --git a/Spigot-API-Patches/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/Spigot-API-Patches/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch index 2ac345f8a0..5ed1265989 100644 --- a/Spigot-API-Patches/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch +++ b/Spigot-API-Patches/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch @@ -48,7 +48,7 @@ index f87ecd0a753b0f730ee33c0dd699b7388e8c6697..07e532cde37255ffb2db368453bb69ee * @return A new location where X/Y/Z are the center of the block */ diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index fbd9546731aaf5673603646136c668dbc59821b1..85bd7d8926d313a313f17c5dea644615daf72c62 100644 +index eef7750fdebb4fbd156d729e4cc87f7b3d0a2ad4..656615290c3378a853ea298d0a3b5f8d28c6a177 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -90,6 +90,38 @@ public interface World extends PluginMessageRecipient, Metadatable { diff --git a/Spigot-API-Patches/0138-isChunkGenerated-API.patch b/Spigot-API-Patches/0138-isChunkGenerated-API.patch index 69599faeb2..5733dadbe9 100644 --- a/Spigot-API-Patches/0138-isChunkGenerated-API.patch +++ b/Spigot-API-Patches/0138-isChunkGenerated-API.patch @@ -34,7 +34,7 @@ index 07e532cde37255ffb2db368453bb69ee0a410931..6e1a1124a6e528c1a94ccb1d09bc5dcc /** * Sets the position of this Location and returns itself diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 85bd7d8926d313a313f17c5dea644615daf72c62..933f2729276b37b4c82cda986e39292cc2e86c4e 100644 +index 656615290c3378a853ea298d0a3b5f8d28c6a177..40dd88b538e9d9f7684f65415cf18e9b416e28de 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -254,6 +254,17 @@ public interface World extends PluginMessageRecipient, Metadatable { diff --git a/Spigot-API-Patches/0157-Add-sun-related-API.patch b/Spigot-API-Patches/0157-Add-sun-related-API.patch index 14fe94f7f4..8fda90ee4c 100644 --- a/Spigot-API-Patches/0157-Add-sun-related-API.patch +++ b/Spigot-API-Patches/0157-Add-sun-related-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add sun related API diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 933f2729276b37b4c82cda986e39292cc2e86c4e..e3d4da353e5f876f0456106b350838917f492051 100644 +index 40dd88b538e9d9f7684f65415cf18e9b416e28de..8d951577c0797d299951f7fd2448121710f07e6b 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -1755,6 +1755,16 @@ public interface World extends PluginMessageRecipient, Metadatable { diff --git a/Spigot-API-Patches/0180-Add-Heightmap-API.patch b/Spigot-API-Patches/0180-Add-Heightmap-API.patch index f270b314cb..65fbbc79ef 100644 --- a/Spigot-API-Patches/0180-Add-Heightmap-API.patch +++ b/Spigot-API-Patches/0180-Add-Heightmap-API.patch @@ -89,7 +89,7 @@ index 77d9cd0a1f54b5eb233eddbcff1bfa76bc182e9a..5904750329a5c7061de6e4fe32335b0d * Creates explosion at this location with given power * diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index e3d4da353e5f876f0456106b350838917f492051..143fcbcdbfad551cd4392f54cf189fe3bee41706 100644 +index 8d951577c0797d299951f7fd2448121710f07e6b..90e41bead6a51ab1f272af806c396d8411a96eb7 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -160,6 +160,87 @@ public interface World extends PluginMessageRecipient, Metadatable { diff --git a/Spigot-API-Patches/0200-Expose-game-version.patch b/Spigot-API-Patches/0200-Expose-game-version.patch index c2e98ecdc8..50ff8c84fa 100644 --- a/Spigot-API-Patches/0200-Expose-game-version.patch +++ b/Spigot-API-Patches/0200-Expose-game-version.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose game version diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index ea3e5d6fa56a7ff259a9ce55a8e31d3921768b8b..95ad0122605b40e28352fa6205528eeb5c453a50 100644 +index 600334831293793840511992048c43bff1febc24..c0421b5a09c25ad4f23387b8b0e035871a9d367b 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -118,6 +118,18 @@ public final class Bukkit { @@ -28,7 +28,7 @@ index ea3e5d6fa56a7ff259a9ce55a8e31d3921768b8b..95ad0122605b40e28352fa6205528eeb * Gets a view of all currently logged in players. This {@linkplain * Collections#unmodifiableCollection(Collection) view} is a reused diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 9ceaac0e859e347b07fa9f4c6507a73deb280670..c3fb1c27187b5283e2fd5c2b894bbc889a48544d 100644 +index f44a582e954625a12b19d4e142865e5d3154edd5..0ad848c42039eeed64cc0b8372d3a9331e61d286 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -97,6 +97,16 @@ public interface Server extends PluginMessageRecipient { diff --git a/Spigot-API-Patches/0205-Spawn-Reason-API.patch b/Spigot-API-Patches/0205-Spawn-Reason-API.patch index b3dd53923a..5be9eb6a70 100644 --- a/Spigot-API-Patches/0205-Spawn-Reason-API.patch +++ b/Spigot-API-Patches/0205-Spawn-Reason-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Spawn Reason API diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index ec719d5c0741f3489884709169fee93ef02244bb..920f3eb82f1492bd59896e03b65a4df2e46c854d 100644 +index 71c1e93ea15f0a926a9ad822d09a076f8b800988..75c9225bd07b4c4b6dcd702c52294a7637eb6884 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -1,6 +1,8 @@ diff --git a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch index 039465e80f..2297b9c636 100644 --- a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch +++ b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch @@ -32,7 +32,7 @@ index fc92fbb05e442d453d6d5dd4e36143a576f55b6b..1fcdbbbc7b60edd1e87bab5f1c5d19a6 public CrashReport b(CrashReport crashreport) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 36e44309d5c8467c79da981ea957c17ebabe9595..0f49da25bb6a1aaad18cbd57d0d312769fe50c3e 100644 +index 0094d9251251845fbacff6d458443385627ca0c8..3e2328079f5f98f3f10cc1badd1059a3703eb2d7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -224,7 +224,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException; diff --git a/Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch b/Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch index eacd5dd137..887372cc14 100644 --- a/Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch +++ b/Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch @@ -192,7 +192,7 @@ index 0000000000000000000000000000000000000000..aac3f66cb23d260729c2a48d8710a9de + } +} diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 4cf4ef11ce295aec3b7d0bf07b64a1ecdca3c39a..b091db5901d75769e406c454b205f102c82ca021 100644 +index 9cba62efdb051c9850bbf28b0be17a7e00ed83c9..ce285b97cbdc9d74504d073fc659c295300dd720 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -156,6 +156,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer diff --git a/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch index 0d87ba3ad8..eecc42f3de 100644 --- a/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch @@ -119,7 +119,7 @@ index 4f7dc23d67e97f9a2b8983750299fc43b0ed6db9..a4a48dbee002e96a5644d9a033f9f233 public void c() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 51782a02c0882acca208b71bbd75946f6396dcce..d5d9022e05cd0a93bde89962f4291ad92ac0b3d2 100644 +index 661c8b3c81be46ef2c9488bb52d1963c7f0e89e2..032b1ac672a604691c625e43008927e3a68d2160 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1669,7 +1669,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch index 1f728ac664..56f24685d9 100644 --- a/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch +++ b/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Only refresh abilities if needed diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index f6da0875d944d89d047bb44c47b51337b15f91a7..5697c624148cf654e68153f08b688842eff3a207 100644 +index 032b1ac672a604691c625e43008927e3a68d2160..a39b11bb15e15c17e4617d3ef212845f8fe87a38 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1355,12 +1355,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0025-Entity-Origin-API.patch b/Spigot-Server-Patches/0025-Entity-Origin-API.patch index c3f4dc7b4c..4098e0b825 100644 --- a/Spigot-Server-Patches/0025-Entity-Origin-API.patch +++ b/Spigot-Server-Patches/0025-Entity-Origin-API.patch @@ -101,7 +101,7 @@ index ad8a506bb430b26fe147a657a2f826daf9bf4d45..ad4807e0bdd6409bd798f995da8f43ce if (i >= 0 && i < this.list.size()) { NBTBase nbtbase = (NBTBase) this.list.get(i); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 2b39fb903c1cf6ded8aa170f5bd25f4fadb1195a..db3b35eac5584b8319fc0d4cbb28408b2d0f620b 100644 +index dd02f7b8c0c0055a506bceab68cec98faf4a7641..eb53a8232371433aabe300af5629cf1735ff18fb 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1088,6 +1088,11 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0034-Disable-thunder.patch b/Spigot-Server-Patches/0034-Disable-thunder.patch index de52bd4656..17b96b8f9b 100644 --- a/Spigot-Server-Patches/0034-Disable-thunder.patch +++ b/Spigot-Server-Patches/0034-Disable-thunder.patch @@ -19,7 +19,7 @@ index 25e0717186366af580e512eedfd403b8efc64a75..41436a4ead736dc925ca77d4cabf925f + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index db3b35eac5584b8319fc0d4cbb28408b2d0f620b..0ec10ad5caa86b5c5e84084aeec0ccb0113b3f10 100644 +index eb53a8232371433aabe300af5629cf1735ff18fb..8c33ad47feeb1ab25e656d3171a829b149198322 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -471,7 +471,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch b/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch index 5270b0f064..04b37519ed 100644 --- a/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch +++ b/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch @@ -19,7 +19,7 @@ index 41436a4ead736dc925ca77d4cabf925f4e492d68..f53d8b96757cbedc5fbb16195952a7da + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 0ec10ad5caa86b5c5e84084aeec0ccb0113b3f10..ac66ee26861ffa4795a00f328deefab5962fad88 100644 +index 8c33ad47feeb1ab25e656d3171a829b149198322..9eec2ec61777222c1290ad3112b003409001e51a 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -495,7 +495,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch b/Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch index 6cfac5dd48..4f50672d2c 100644 --- a/Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch +++ b/Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch @@ -20,7 +20,7 @@ index a4da22ea65d5fdba38f8dc331919088f9ca99aed..345ac63e281bb3372b2ae879d587d658 + } } diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java -index 1441d096d44ea653539ba20ccda94eb62ffc32df..eddf67805ad472cfdd45c1f3c6068b0530cae97d 100644 +index b9d0d2d42850c3a5d093429cd0d02ac47848f04b..44b9bfcdc7f2cbf4dc6e28c258506d9f84783b0e 100644 --- a/src/main/java/net/minecraft/server/BlockChest.java +++ b/src/main/java/net/minecraft/server/BlockChest.java @@ -268,6 +268,11 @@ public class BlockChest extends BlockChestAbstract implements I diff --git a/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch index fb01eaf978..6e574907f6 100644 --- a/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch +++ b/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch @@ -48,7 +48,7 @@ index 890b0fc7baf51ed6896d979021b3956c5c279c40..b468182266c39b9defa1aa287290f75f } else if (this.player.getChatFlags() == EnumChatVisibility.SYSTEM) { // Do nothing, this is coming from a plugin diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 9cf0d095db124976c7777ff78a6a1f1f46f4a363..35f0527f6dbd06660a1ca4ce528ac1e8c056bb16 100644 +index 0f5af8365abe99971a815285703a3b598f130a0d..5ff0456b781b6a6fbc674e2c532b73f3245f5fd5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -752,6 +752,29 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch index 09675053d0..85a52b1a18 100644 --- a/Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch +++ b/Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch @@ -52,7 +52,7 @@ index 3a6e780007bc1b1fa799166daa01d3a9e15c7ab0..535056c64ef866e645b1bfbd149b50c5 if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 5697c624148cf654e68153f08b688842eff3a207..682dd0d53f393c326e3da9b99fbff21953535161 100644 +index a39b11bb15e15c17e4617d3ef212845f8fe87a38..d4c919288d6f926938fb67a2085eabb635907cda 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1,5 +1,6 @@ diff --git a/Spigot-Server-Patches/0050-Change-implementation-of-tile-entity-removal-list.patch b/Spigot-Server-Patches/0050-Change-implementation-of-tile-entity-removal-list.patch index c213db22c9..57470af925 100644 --- a/Spigot-Server-Patches/0050-Change-implementation-of-tile-entity-removal-list.patch +++ b/Spigot-Server-Patches/0050-Change-implementation-of-tile-entity-removal-list.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Change implementation of (tile)entity removal list use sets for faster removal diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 54143a64c4c41d7bdc3476f676ea45143b3e98ca..5197cdb3219638b499f0eb2a25f35e789983a3e8 100644 +index 864df4fbcb0f4a09fc12b270955c36d779aeb7d4..a1e1dc72cd6a556505a6f0d7feee2527947c00dd 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -37,7 +37,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0052-Add-velocity-warnings.patch b/Spigot-Server-Patches/0052-Add-velocity-warnings.patch index 91454078aa..561eb5c866 100644 --- a/Spigot-Server-Patches/0052-Add-velocity-warnings.patch +++ b/Spigot-Server-Patches/0052-Add-velocity-warnings.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add velocity warnings diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 3768215d57f4025bdb83913e45b12119d53e1002..1de3ac4242f388f2331c5a02e17b1709491dcbc7 100644 +index 3a0e0139db61405e8307abb3d17d1836f45bd8a3..0188028d62015691575eea68f58e4b2acbcbb4a9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -260,6 +260,7 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch b/Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch index b4466a814e..3879aa458b 100644 --- a/Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch +++ b/Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch @@ -30,7 +30,7 @@ index cd47a4ca069df26969de3051c2aac80540093818..abbf59bb91021821876a8960e8f77fac + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 682dd0d53f393c326e3da9b99fbff21953535161..15312df00ea7d88ca1733b5b8a5dd8f204728811 100644 +index d4c919288d6f926938fb67a2085eabb635907cda..e89de0309c7e9fa406a9507785dcfcb6ba0167d7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -762,7 +762,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch index 93c04ef6dc..e2044f436c 100644 --- a/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch +++ b/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch @@ -22,7 +22,7 @@ index b468182266c39b9defa1aa287290f75f7db44b9a..a0806ddc407d21340c82fe4d00bb7ad1 // CraftBukkit end diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b63cf312a9e9ea4b0659a799abfe21f6f1d98fdb..8a2523e56c74d9d3b75501cef10f3495d460f36d 100644 +index e89de0309c7e9fa406a9507785dcfcb6ba0167d7..1476ea7fde24bbc659b7cd7e0b8244306ab6b24a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -136,6 +136,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0060-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0060-Default-loading-permissions.yml-before-plugins.patch index c36ea2c9f0..91714aa1e6 100644 --- a/Spigot-Server-Patches/0060-Default-loading-permissions.yml-before-plugins.patch +++ b/Spigot-Server-Patches/0060-Default-loading-permissions.yml-before-plugins.patch @@ -30,7 +30,7 @@ index a62f4bbb973b9cb6d1ee53f56a0897d70ae176af..f207abbe757ad403a29a7a012903aaa8 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 1de3ac4242f388f2331c5a02e17b1709491dcbc7..228106442d8f6d425a0d15c816532223749e03be 100644 +index 0188028d62015691575eea68f58e4b2acbcbb4a9..30701934a3b7cc7d2a502fe7c3c251a9f268a9bc 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -397,6 +397,7 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch index 707acd3c59..f90a119904 100644 --- a/Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch +++ b/Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch @@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive This will remove metadata on reload so it does not crash everything if a plugin uses it. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 73f140771bac6bfda57bbd402a1603cedf8c38b5..2bb31a684906044b159e959dd8acd85efc660b02 100644 +index 72fb341e77b73ace8555cfc1bfdb3bbab726f1e6..9fdceeeeece358b2456cd66bc585821b7252691e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -863,8 +863,18 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch index e1b9ccac8c..2e333e5054 100644 --- a/Spigot-Server-Patches/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch +++ b/Spigot-Server-Patches/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch @@ -44,7 +44,7 @@ index f1080e7d10d5105e3f4010489393f6150c7c4a75..374e4a3dcb656d6a84e05bb9260d3198 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 8a2523e56c74d9d3b75501cef10f3495d460f36d..93690040efd7de5223cd81415cfa9aeb4bec30ef 100644 +index 1476ea7fde24bbc659b7cd7e0b8244306ab6b24a..9f358b46e5d34ad288205f1155c6183b457a3225 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1590,6 +1590,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0071-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0071-Configurable-spawn-chances-for-skeleton-horses.patch index a8b4c0db91..9949e7e988 100644 --- a/Spigot-Server-Patches/0071-Configurable-spawn-chances-for-skeleton-horses.patch +++ b/Spigot-Server-Patches/0071-Configurable-spawn-chances-for-skeleton-horses.patch @@ -22,7 +22,7 @@ index 7de7b74ff69bba1cbad24623d7eeff6c79812bab..6ef0e1399e9ff260712db1a044068c12 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index ac66ee26861ffa4795a00f328deefab5962fad88..9e8f22f41889c8592033925c180f46413cfaec14 100644 +index 4548a38464fac65a88da26e95660542eeb482ccb..20200408da6cae15576926f79de22b955781201d 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -475,7 +475,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0085-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0085-Workaround-for-setting-passengers-on-players.patch index 54bfd5eeb9..14d58ffd60 100644 --- a/Spigot-Server-Patches/0085-Workaround-for-setting-passengers-on-players.patch +++ b/Spigot-Server-Patches/0085-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 5b3c8cc669eef72cec04d36de156405421cd21e5..cff5600687d88e3eab06a00bdd7810fa35f3c7cc 100644 +index 9f358b46e5d34ad288205f1155c6183b457a3225..41a73db6040af29c9e087ac2ca425f5d28d0142a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -771,6 +771,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0092-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0092-Implement-PlayerLocaleChangeEvent.patch index 849f610454..81c3758344 100644 --- a/Spigot-Server-Patches/0092-Implement-PlayerLocaleChangeEvent.patch +++ b/Spigot-Server-Patches/0092-Implement-PlayerLocaleChangeEvent.patch @@ -40,7 +40,7 @@ index d4673ac51ffc720362e849ec2da17daaceded4ca..898ac661042381b99b98991f493538c0 this.cg = packetplayinsettings.e(); this.getDataWatcher().set(EntityPlayer.bp, (byte) packetplayinsettings.f()); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 81bd6bd8ef63f99e6a6b9a114e7f4cbe02a3c05c..7c8adeb5c3394bebbcb85c285ca63251c0ffaf0c 100644 +index 41a73db6040af29c9e087ac2ca425f5d28d0142a..43b50d56f87a1ac52eae1529875834ab85733aa4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1776,8 +1776,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0107-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0107-Fix-Old-Sign-Conversion.patch index 2f5a4b5477..02c51f9ac9 100644 --- a/Spigot-Server-Patches/0107-Fix-Old-Sign-Conversion.patch +++ b/Spigot-Server-Patches/0107-Fix-Old-Sign-Conversion.patch @@ -25,7 +25,7 @@ index 637632b1324e2cdc80cecc4a5a94dc9379312f30..05aae52e662f7effbfb358a5fa6e33c3 } diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index ab0f9a9d69c801e47002039c41c7c3393fc2f403..967aec7ce9a7fbbb42b51d1ed281db005e107c2c 100644 +index 534295965ee701611b5e12a10f14a69e8226376a..5e5bb5aaa3d8f4e8f4b00ba8bee059ec79f82b43 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -20,6 +20,7 @@ public abstract class TileEntity implements KeyedObject { // Paper diff --git a/Spigot-Server-Patches/0127-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0127-Bound-Treasure-Maps-to-World-Border.patch index c10ce5e97c..230f55e10f 100644 --- a/Spigot-Server-Patches/0127-Bound-Treasure-Maps-to-World-Border.patch +++ b/Spigot-Server-Patches/0127-Bound-Treasure-Maps-to-World-Border.patch @@ -11,7 +11,7 @@ that is outside happens to be closer, but unreachable, yet another reachable one is in border that would of been missed. diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java -index 68510457b527e61bf60bf1e7dfd664578172c00a..3880559505af742f1ab36f7959dc7fbd1e5da1b3 100644 +index eefad79a01de61eff5e0bd3f709bfda030ebe20d..6eb81504146af614a806add6e5effe0c2b111c8a 100644 --- a/src/main/java/net/minecraft/server/StructureGenerator.java +++ b/src/main/java/net/minecraft/server/StructureGenerator.java @@ -138,6 +138,7 @@ public abstract class StructureGenerator diff --git a/Spigot-Server-Patches/0132-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0132-String-based-Action-Bar-API.patch index 5d436e4b05..4f04a64c28 100644 --- a/Spigot-Server-Patches/0132-String-based-Action-Bar-API.patch +++ b/Spigot-Server-Patches/0132-String-based-Action-Bar-API.patch @@ -18,7 +18,7 @@ index 275c1d2d1eb2649de9a9b5aece6e88c21362efba..d72ba7f76c42fd525a5b59a999a0c08e 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 20cb63419a049ce9dcaf2f0c99274501ebf9aa8c..2118f7a8ea87191fd6fb5324c3c29f8beb43f3f3 100644 +index 43b50d56f87a1ac52eae1529875834ab85733aa4..a490d6330474a77d81a0e25ac74ea36c183e7cf0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -219,6 +219,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0149-Item-canEntityPickup.patch b/Spigot-Server-Patches/0149-Item-canEntityPickup.patch index 2f36a0331f..60f3a133e4 100644 --- a/Spigot-Server-Patches/0149-Item-canEntityPickup.patch +++ b/Spigot-Server-Patches/0149-Item-canEntityPickup.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Item#canEntityPickup diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index f2cd6824790d7e76f8f10e2630bcd5ebbf2a4238..3997dc6d979bf5a027861397b948aa4e8486fc58 100644 +index 2f85d9799d67d3fb1d340179d8dbd03771467329..e434e23bf5b22a623ed7b915711bdb31b7e90b61 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -539,6 +539,11 @@ public abstract class EntityInsentient extends EntityLiving { diff --git a/Spigot-Server-Patches/0152-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0152-Add-UnknownCommandEvent.patch index 3be84e12c0..fba9b708c9 100644 --- a/Spigot-Server-Patches/0152-Add-UnknownCommandEvent.patch +++ b/Spigot-Server-Patches/0152-Add-UnknownCommandEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add UnknownCommandEvent diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 1c9b5c376c0750974f52d526414d094fcf3a3e11..71f2a8cfc2e077ce7c576957fd1d36f6612a4ebf 100644 +index db41896b45f1608fbeb962d3ffe25d9608b36cc4..60a44992a962e15686f89247823389d3757d8b8c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -105,6 +105,7 @@ import net.minecraft.server.WorldNBTStorage; diff --git a/Spigot-Server-Patches/0168-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch b/Spigot-Server-Patches/0168-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch index ff1195fa4c..18f2ba9a85 100644 --- a/Spigot-Server-Patches/0168-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch +++ b/Spigot-Server-Patches/0168-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch @@ -28,7 +28,7 @@ index 2acc2a98bd8df6d81b5865b768265a210597b57b..55cdd9061b2c70abe8458de497dd61e1 org.ow2.asm asm diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 49b5c226dcbd4ef7d2a3418ef2c7e98bb689ccfb..f6544e4fb0eacce7f3579998e8ec0743b7f46c65 100644 +index af839f432d410601fbbe06b665e4e0fad801c17d..13ae03d48a2a838ee9eb016072f3486d3c7192ef 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -131,8 +131,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer diff --git a/Spigot-Server-Patches/0174-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0174-Expose-client-protocol-version-and-virtual-host.patch index 887cc01a21..67bef8099a 100644 --- a/Spigot-Server-Patches/0174-Expose-client-protocol-version-and-virtual-host.patch +++ b/Spigot-Server-Patches/0174-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 527c116c23a505eead00e73a39ce9f932eb4ad8d..09ac19363ecfdebe2b124fdf68a95265ae085cfe 100644 +index a490d6330474a77d81a0e25ac74ea36c183e7cf0..626ef32032eb6327baa92c363ce6bb4705b6b5f1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -186,6 +186,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0181-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0181-API-to-get-a-BlockState-without-a-snapshot.patch index 321d2d8401..063fe2ea56 100644 --- a/Spigot-Server-Patches/0181-API-to-get-a-BlockState-without-a-snapshot.patch +++ b/Spigot-Server-Patches/0181-API-to-get-a-BlockState-without-a-snapshot.patch @@ -13,7 +13,7 @@ also Avoid NPE during CraftBlockEntityState load if could not get TE If Tile Entity was null, correct Sign to return empty lines instead of null diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 967aec7ce9a7fbbb42b51d1ed281db005e107c2c..54285237ed5a096b2e46cabd78f7dcd5128133a8 100644 +index 5e5bb5aaa3d8f4e8f4b00ba8bee059ec79f82b43..2b06c95b4fac97513e706ef073fdd7418e1f092c 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -231,7 +231,12 @@ public abstract class TileEntity implements KeyedObject { // Paper diff --git a/Spigot-Server-Patches/0186-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0186-Ability-to-apply-mending-to-XP-API.patch index 26b317150a..1c4c46e459 100644 --- a/Spigot-Server-Patches/0186-Ability-to-apply-mending-to-XP-API.patch +++ b/Spigot-Server-Patches/0186-Ability-to-apply-mending-to-XP-API.patch @@ -43,7 +43,7 @@ index e7fb982913f391bafd608c4626086cd9cab7fad7..7f2d8de12473c5413bbfc10ea0947d6a 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 09ac19363ecfdebe2b124fdf68a95265ae085cfe..734274db8f8c53d7e5310f2c16b1c64a42a6277c 100644 +index 626ef32032eb6327baa92c363ce6bb4705b6b5f1..f27fb59e752d25807859396560b213162870998e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1058,8 +1058,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0203-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0203-Player.setPlayerProfile-API.patch index fb09bf9179..5569d1e292 100644 --- a/Spigot-Server-Patches/0203-Player.setPlayerProfile-API.patch +++ b/Spigot-Server-Patches/0203-Player.setPlayerProfile-API.patch @@ -48,7 +48,7 @@ index 80a21dbc05ed3007f2e827f7a320131244c3044b..e0f0a1e91a037f93b239e779aa8fd92b 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 734274db8f8c53d7e5310f2c16b1c64a42a6277c..44850b387f84aa9a3d1ec47555026b6088fc167e 100644 +index f27fb59e752d25807859396560b213162870998e..53c52e4922538f1dd50764d8cbaa178d1f0692f9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1,6 +1,8 @@ diff --git a/Spigot-Server-Patches/0209-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0209-Flag-to-disable-the-channel-limit.patch index 1eea3b243a..761f9e2e23 100644 --- a/Spigot-Server-Patches/0209-Flag-to-disable-the-channel-limit.patch +++ b/Spigot-Server-Patches/0209-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 44850b387f84aa9a3d1ec47555026b6088fc167e..ac621e2a6e7a2eaba5acc1dabca5d0bef4c8b2b3 100644 +index 53c52e4922538f1dd50764d8cbaa178d1f0692f9..b5d2ce40431247112baaded01e860c1832bf8fd8 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/0211-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0211-Configurable-sprint-interruption-on-attack.patch index b50568c135..4055fbd39f 100644 --- a/Spigot-Server-Patches/0211-Configurable-sprint-interruption-on-attack.patch +++ b/Spigot-Server-Patches/0211-Configurable-sprint-interruption-on-attack.patch @@ -20,7 +20,7 @@ index 77cdbfadf9c3eddb6a02460c321fa816d1bab8ac..171c8e3031cf4bf4da062663089cc0cb + } } diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index a781ac0cf8766e915c10ebd3823cbe5b0d1c5230..59f7fced6213c218cd19863be99964eb496b6fe6 100644 +index 74950d74e6a11d5552369e830f9fdd63c4306221..e05e56f464c643925abfdf04bd745e3932ca001d 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1091,7 +1091,11 @@ public abstract class EntityHuman extends EntityLiving { diff --git a/Spigot-Server-Patches/0230-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0230-PlayerReadyArrowEvent.patch index 686dbb752d..a5613c4683 100644 --- a/Spigot-Server-Patches/0230-PlayerReadyArrowEvent.patch +++ b/Spigot-Server-Patches/0230-PlayerReadyArrowEvent.patch @@ -7,7 +7,7 @@ Called when a player is firing a bow and the server is choosing an arrow to use. Plugins can skip selection of certain arrows and control which is used. diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 59f7fced6213c218cd19863be99964eb496b6fe6..4893daca7ea64504731cfab455e09b0a11c65857 100644 +index e05e56f464c643925abfdf04bd745e3932ca001d..a1cfa610eb3cc368b9641feeab709a4f5985ffbe 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -2045,6 +2045,17 @@ public abstract class EntityHuman extends EntityLiving { diff --git a/Spigot-Server-Patches/0234-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0234-LivingEntity-Hand-Raised-Item-Use-API.patch index 3a3ca0adfb..a39fa8287f 100644 --- a/Spigot-Server-Patches/0234-LivingEntity-Hand-Raised-Item-Use-API.patch +++ b/Spigot-Server-Patches/0234-LivingEntity-Hand-Raised-Item-Use-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API How long an entity has raised hands to charge an attack or use an item diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index d0a389e6dc73202a3fa7c82eace1c92dece2982e..b80068b184b32256f1944b9863454726852cd502 100644 +index a62f769ab509edd30717cfca785449acecdf295e..92fcaf425b5ef398fcac6ecf115502a5cf657ebb 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -118,7 +118,7 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0247-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0247-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch index 634e4ac662..c4b3220ef3 100644 --- a/Spigot-Server-Patches/0247-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch +++ b/Spigot-Server-Patches/0247-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch @@ -40,7 +40,7 @@ index 4ae3e91677ecf9c2104a229b4e8b229d18b87aa4..458802dc4b1f923b159168efff0546bb protected void g() { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 8d9dcdce1f395025ce7f644ba25212a83a438be4..3f91ae81cf87b5455a79fa94111cecae77b9986c 100644 +index 324967c892ff8878326af4229668fcbde37ef202..5540fc6eee8115400774b7a792b9d3b45eb01e34 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -68,6 +68,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0256-EntityTransformedEvent.patch b/Spigot-Server-Patches/0256-EntityTransformedEvent.patch index 222965c2e8..7ecaec4d42 100644 --- a/Spigot-Server-Patches/0256-EntityTransformedEvent.patch +++ b/Spigot-Server-Patches/0256-EntityTransformedEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] EntityTransformedEvent diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 3997dc6d979bf5a027861397b948aa4e8486fc58..a38a1f3447accd51dcd295fb28c4108cb87ad832 100644 +index 424157dcf536527e80faf5428f18f7e66d4216b6..c23e634dca6aab051b432a5fee2756afa80fb776 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -1244,6 +1244,7 @@ public abstract class EntityInsentient extends EntityLiving { diff --git a/Spigot-Server-Patches/0268-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0268-Add-Early-Warning-Feature-to-WatchDog.patch index ae46ccf04c..48e36efc08 100644 --- a/Spigot-Server-Patches/0268-Add-Early-Warning-Feature-to-WatchDog.patch +++ b/Spigot-Server-Patches/0268-Add-Early-Warning-Feature-to-WatchDog.patch @@ -48,7 +48,7 @@ index 30d04825b8a65e0af66f3591ee6baaa433893b54..3a7e2d1b2a11edbf430333bb8f4788c0 long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop lastTick = start - TICK_TIME; // Paper diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ce3d5e9fd1853ab9519da93ce297ca0bceb9acf8..c38224cfef7d3f8d3586398b2514d2b1527b868e 100644 +index 499e7d6fecc6223df057fa644f8c449fda910f0b..ddb4dd94ccc2fe3d85e84f5f80f8362cc5bf90ef 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -803,6 +803,7 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0271-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0271-Use-a-Queue-for-Queueing-Commands.patch index 2eddd0e535..e805d87b65 100644 --- a/Spigot-Server-Patches/0271-Use-a-Queue-for-Queueing-Commands.patch +++ b/Spigot-Server-Patches/0271-Use-a-Queue-for-Queueing-Commands.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Use a Queue for Queueing Commands Lists are bad as Queues mmmkay. diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index f6544e4fb0eacce7f3579998e8ec0743b7f46c65..715063432bb3a18421f7ac00723f6695f8a56a8c 100644 +index 13ae03d48a2a838ee9eb016072f3486d3c7192ef..e923835634f7440e5b88a9d5c62a70fcec8b688a 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -38,7 +38,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer diff --git a/Spigot-Server-Patches/0273-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0273-Allow-disabling-armour-stand-ticking.patch index 5e88bdb174..233fcd1150 100644 --- a/Spigot-Server-Patches/0273-Allow-disabling-armour-stand-ticking.patch +++ b/Spigot-Server-Patches/0273-Allow-disabling-armour-stand-ticking.patch @@ -142,7 +142,7 @@ index a70b1a17fe884980ef7c3c0a36e567a0e69ef7f0..d5c09152acc93b25d626284071599afd public Vector3f r() { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index b80068b184b32256f1944b9863454726852cd502..f65a0b943843ea365384825c5a848305f303d8f9 100644 +index 92fcaf425b5ef398fcac6ecf115502a5cf657ebb..f2604e867321ca5d84fe0cd7aeed7cf6e5741919 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2503,6 +2503,7 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0285-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0285-Add-ray-tracing-methods-to-LivingEntity.patch index 30b898d441..e9dee421a8 100644 --- a/Spigot-Server-Patches/0285-Add-ray-tracing-methods-to-LivingEntity.patch +++ b/Spigot-Server-Patches/0285-Add-ray-tracing-methods-to-LivingEntity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index f65a0b943843ea365384825c5a848305f303d8f9..c3f3a392f2b15a806c706b1e518282225b45bbc3 100644 +index f2604e867321ca5d84fe0cd7aeed7cf6e5741919..4b249a644c680a7cc64b0d31cf453f94ff2b6a0c 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -3442,6 +3442,23 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0286-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0286-Expose-attack-cooldown-methods-for-Player.patch index 936f79eab8..e5b310871a 100644 --- a/Spigot-Server-Patches/0286-Expose-attack-cooldown-methods-for-Player.patch +++ b/Spigot-Server-Patches/0286-Expose-attack-cooldown-methods-for-Player.patch @@ -27,7 +27,7 @@ index d9e5d71a87140c90b79902887bd2f481f02956dc..afc665bfe9d527ca8d19f3ab9df0900d this.aA = 0; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 5bcdcde0ac3b82a85662a5671d1db414b39a8e34..014eac2f7c6f5023ba7f935fe99fc06db0736d82 100644 +index bb6635be243a270752e1c47a9646a13ea6707baf..5412e83e0c531d477e6df99eae8fea645044b1f3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1949,6 +1949,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0287-Improve-death-events.patch b/Spigot-Server-Patches/0287-Improve-death-events.patch index db3b1c1ba2..3f3c7958c4 100644 --- a/Spigot-Server-Patches/0287-Improve-death-events.patch +++ b/Spigot-Server-Patches/0287-Improve-death-events.patch @@ -357,7 +357,7 @@ index 7b565ddfffd0b9c78392ee115ef9c20ab89a3380..d78b9fd608da691220f1edeff506b36e 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 014eac2f7c6f5023ba7f935fe99fc06db0736d82..a9360c76f720ad64f21b46ca68e2caa24f0a8839 100644 +index 5412e83e0c531d477e6df99eae8fea645044b1f3..8ac369d5edf139b2457fa1da03e3473b907976f6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1740,7 +1740,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0288-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0288-Allow-chests-to-be-placed-with-NBT-data.patch index 230ef63e3b..9ed2eeb582 100644 --- a/Spigot-Server-Patches/0288-Allow-chests-to-be-placed-with-NBT-data.patch +++ b/Spigot-Server-Patches/0288-Allow-chests-to-be-placed-with-NBT-data.patch @@ -17,7 +17,7 @@ index 95e801a9a7ca405ff7e80c920fa78493d0ef5374..a075a41d954836864a5186b383e967a9 for (BlockState blockstate : blocks) { blockstate.update(true, false); diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java -index cc15686573f3a54ff0145b3486679b772157d191..aaa40c8a8013806f41f15fcc4682e1ca4d44e956 100644 +index a016d97be93c4218136f803cc9a7f986d70309d2..f6f2743892b5b933e6ba0cc25b24e0d471b305c9 100644 --- a/src/main/java/net/minecraft/server/TileEntityChest.java +++ b/src/main/java/net/minecraft/server/TileEntityChest.java @@ -292,7 +292,7 @@ public class TileEntityChest extends TileEntityLootable { // Paper - Remove ITic diff --git a/Spigot-Server-Patches/0304-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0304-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch index 32df6d42f5..b9d23093d8 100644 --- a/Spigot-Server-Patches/0304-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch +++ b/Spigot-Server-Patches/0304-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch @@ -11,7 +11,7 @@ If the projectile fails to find the shooter in the current world, check other worlds. diff --git a/src/main/java/net/minecraft/server/IProjectile.java b/src/main/java/net/minecraft/server/IProjectile.java -index f85d80d7bb3e4e92bb8d281dfe577f663ebe9da1..ceecb0520a63d2eff5f4cadf45fa49f56eaea8dd 100644 +index ea5f5845a8d202e62da3ae1bfb1e4dbd7f5e185e..ef7e036943bfbd869bd5d71bcb2ecc6c35c18294 100644 --- a/src/main/java/net/minecraft/server/IProjectile.java +++ b/src/main/java/net/minecraft/server/IProjectile.java @@ -29,7 +29,18 @@ public abstract class IProjectile extends Entity { diff --git a/Spigot-Server-Patches/0306-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0306-Add-Velocity-IP-Forwarding-Support.patch index 84d2f46778..13d96d6178 100644 --- a/Spigot-Server-Patches/0306-Add-Velocity-IP-Forwarding-Support.patch +++ b/Spigot-Server-Patches/0306-Add-Velocity-IP-Forwarding-Support.patch @@ -289,7 +289,7 @@ index ae74dc9e183e66062455cf2a18ab43ae87976046..7eb230f1b27eddf48f1b12fc78877a36 public void a(PacketDataSerializer packetdataserializer) throws IOException { this.a = packetdataserializer.i(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c38224cfef7d3f8d3586398b2514d2b1527b868e..02395d71bc8b457240720cc76a481f9ea1613d79 100644 +index ddb4dd94ccc2fe3d85e84f5f80f8362cc5bf90ef..02dc825a40bc8f289cd4b93ba2e88ee534784730 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -675,7 +675,7 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0323-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0323-force-entity-dismount-during-teleportation.patch index 740c3bde4d..ba780e95be 100644 --- a/Spigot-Server-Patches/0323-force-entity-dismount-during-teleportation.patch +++ b/Spigot-Server-Patches/0323-force-entity-dismount-during-teleportation.patch @@ -72,7 +72,7 @@ index 41c14d367e0b51e109001167d3c7b40676f364b8..505ba8e298a825ce69cc60c76cb040ed if (event.isCancelled()) { return false; diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index af554396fdb25719c158a81ccab76e91f5df2ff5..5ef91da9733fd9276e7bd819a11a0548e01b17f0 100644 +index afc665bfe9d527ca8d19f3ab9df0900d87f2d3f2..7916421fe1dd8eadfd1c9bd15c4bbbb7331faca6 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -942,9 +942,11 @@ public abstract class EntityHuman extends EntityLiving { @@ -91,7 +91,7 @@ index af554396fdb25719c158a81ccab76e91f5df2ff5..5ef91da9733fd9276e7bd819a11a0548 } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index f5f043f0a5bafb7e432a541f9ef6db0956a52f31..ed001440151078e20a449ba073d71e873ff0ad9a 100644 +index d6a98bb7fc107649c179cded2d37c06a41146a89..84de18a6c207612ec3d3cca61749934b1d421155 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2892,11 +2892,13 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0327-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0327-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch index b93257f141..a5d669d660 100644 --- a/Spigot-Server-Patches/0327-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch +++ b/Spigot-Server-Patches/0327-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch @@ -28,7 +28,7 @@ index 80a9faf3b02c51efc1f55beebce173309628b9ab..ccf1a64d33038a73360f68a814bd4602 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 e9e6e89145cc3d6b2b497132030c47515bfee5ab..a6f0b39717164d6b3ab15843b13ef52a24dde5d6 100644 +index 2acea235633fb6b48c68711bc1cec5b61e7bf140..f436f30c1e07ac42e35a007cde5a92cc0568e7ff 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 0e1f5c75b6ab37ce3cfbeaecdc3dd64e8c05e18e..13636096a166150e1e3c0d88a31badf202f702d7 100644 +index 8ac369d5edf139b2457fa1da03e3473b907976f6..4266884ba7790f673704937305d787d19a61401a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -143,6 +143,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0331-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0331-Block-Entity-remove-from-being-called-on-Players.patch index 1f104f395b..a62d38fb8d 100644 --- a/Spigot-Server-Patches/0331-Block-Entity-remove-from-being-called-on-Players.patch +++ b/Spigot-Server-Patches/0331-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 e32a9794c73bd35050819bc61e746cce5a7e453a..06b4eafd8337dc8fe2da0de72e501cba7aca0785 100644 +index 4266884ba7790f673704937305d787d19a61401a..f05f7cbdb0f42601faab8c68a4c75247bd964823 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1994,6 +1994,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0343-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0343-Add-LivingEntity-getTargetEntity.patch index 82e2cdcb00..ad1d8b6d13 100644 --- a/Spigot-Server-Patches/0343-Add-LivingEntity-getTargetEntity.patch +++ b/Spigot-Server-Patches/0343-Add-LivingEntity-getTargetEntity.patch @@ -66,7 +66,7 @@ index 505ba8e298a825ce69cc60c76cb040edeb0acdbd..e87fa15250a57c9b7ed4f4b530289b7b return 0.0F; } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index ed001440151078e20a449ba073d71e873ff0ad9a..f74e9ffda092ef4a2e30c316e682af154921b5df 100644 +index 84de18a6c207612ec3d3cca61749934b1d421155..eeca12bd7c6e59b872303fda1378a69d03dcf783 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -3495,6 +3495,37 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0355-Per-Player-View-Distance-API-placeholders.patch b/Spigot-Server-Patches/0355-Per-Player-View-Distance-API-placeholders.patch index 1a67d68e43..3988c22a7d 100644 --- a/Spigot-Server-Patches/0355-Per-Player-View-Distance-API-placeholders.patch +++ b/Spigot-Server-Patches/0355-Per-Player-View-Distance-API-placeholders.patch @@ -40,7 +40,7 @@ index 9331f96f68f121b41ce74904d624520291b7c72e..1074995e8c8a83f6cdb94019123fbffa 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 06b4eafd8337dc8fe2da0de72e501cba7aca0785..8ffef87f77d137622e656c3ffd5a0ecb6cd4ab68 100644 +index f05f7cbdb0f42601faab8c68a4c75247bd964823..cafa091b84caa6b24078962552b6bb34aca284c3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2003,6 +2003,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0373-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/Spigot-Server-Patches/0373-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch index 134323c6db..6e939e4efb 100644 --- a/Spigot-Server-Patches/0373-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch +++ b/Spigot-Server-Patches/0373-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch @@ -38,7 +38,7 @@ index 43925ed1e5c210399ba9fedb7bf890a6bd617e4a..16727e92f591725c8f8cefb250b7ab8c 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 32d45b54fc4e67555a7f016ac72787a8ad4818f3..86e906361ed998ba94ff6e1cbe21860a88626c3b 100644 +index 6426f67afb3cc3522ff79b1c8515c1f97cd2f0c1..8130e14b5d6c3e8b0a1234668d5c855e82f3a5dc 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/0374-Configurable-projectile-relative-velocity.patch b/Spigot-Server-Patches/0374-Configurable-projectile-relative-velocity.patch index 5f2519a433..76dd42a186 100644 --- a/Spigot-Server-Patches/0374-Configurable-projectile-relative-velocity.patch +++ b/Spigot-Server-Patches/0374-Configurable-projectile-relative-velocity.patch @@ -39,7 +39,7 @@ index 16727e92f591725c8f8cefb250b7ab8c64a19472..a6e68b2ab8890d9d2a842ca0a6b565a1 + } } diff --git a/src/main/java/net/minecraft/server/IProjectile.java b/src/main/java/net/minecraft/server/IProjectile.java -index ceecb0520a63d2eff5f4cadf45fa49f56eaea8dd..ecdc717b3013749ed2384a143d6b6eef07f6f642 100644 +index ef7e036943bfbd869bd5d71bcb2ecc6c35c18294..a961f5d5d4f56cc43d883862e50e3430a2138968 100644 --- a/src/main/java/net/minecraft/server/IProjectile.java +++ b/src/main/java/net/minecraft/server/IProjectile.java @@ -114,7 +114,7 @@ public abstract class IProjectile extends Entity { diff --git a/Spigot-Server-Patches/0441-Don-t-move-existing-players-to-world-spawn.patch b/Spigot-Server-Patches/0441-Don-t-move-existing-players-to-world-spawn.patch index 613c53abca..79407d403e 100644 --- a/Spigot-Server-Patches/0441-Don-t-move-existing-players-to-world-spawn.patch +++ b/Spigot-Server-Patches/0441-Don-t-move-existing-players-to-world-spawn.patch @@ -40,7 +40,7 @@ index 52b5c47452a46cd6e61e1dd7c135620e36472c73..62f6e507586560355269b54a6c392129 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 870b5352528384b0bb612cd5379683ee142fb99f..0524370c393dff4794abc0dfb28630c533a39ce1 100644 +index 4189c315176415b121c6e8f8d3c9682caded2189..29b802b9b1435479ca2a4b57267967f848162424 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/0459-Implement-Player-Client-Options-API.patch b/Spigot-Server-Patches/0459-Implement-Player-Client-Options-API.patch index c55903d29f..a2fdb0c7b6 100644 --- a/Spigot-Server-Patches/0459-Implement-Player-Client-Options-API.patch +++ b/Spigot-Server-Patches/0459-Implement-Player-Client-Options-API.patch @@ -158,7 +158,7 @@ index dbc3552d50c4129e1844c8a379ab5ba396645f52..be97a0b01b3272e01ece90172f283e3f 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 8ffef87f77d137622e656c3ffd5a0ecb6cd4ab68..f553647b4351b2684f522b40b1e533511efc8ae9 100644 +index cafa091b84caa6b24078962552b6bb34aca284c3..9e26a15746fcdf80b581b81f836d9df51759f601 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/0474-Expose-game-version.patch b/Spigot-Server-Patches/0474-Expose-game-version.patch index d899b34e55..37b208deb0 100644 --- a/Spigot-Server-Patches/0474-Expose-game-version.patch +++ b/Spigot-Server-Patches/0474-Expose-game-version.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose game version diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 604723d6f93b694f59f9844486d2b0c8f24a39af..893088011b8e15449c3c9003e52a884b61221acc 100644 +index bae1c62cb5c440ec9f915f602d58635bfbfa361c..666ed0e87379a5bb9ea95cd95c23eca2df02610f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -516,6 +516,13 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0489-Wait-for-Async-Tasks-during-shutdown.patch b/Spigot-Server-Patches/0489-Wait-for-Async-Tasks-during-shutdown.patch index d1a927254d..da052fc7bc 100644 --- a/Spigot-Server-Patches/0489-Wait-for-Async-Tasks-during-shutdown.patch +++ b/Spigot-Server-Patches/0489-Wait-for-Async-Tasks-during-shutdown.patch @@ -22,7 +22,7 @@ index 735beaf6fa6e6ccf2137b64a0b5179ada2907011..b474f45b6d551e45f8894b3971baade3 // CraftBukkit end if (this.getServerConnection() != null) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 1cae2af41e866c22a4f7524250cccdd9f99f6cb9..d7b56da8a910026006dc08306e92a11e407659ce 100644 +index 2b17f2143ee9259c988f65c4db6e82b14dd70876..40e6b8c8a90d6939cbacb088b9bc27dedd511b7d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -932,6 +932,35 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0508-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/Spigot-Server-Patches/0508-Add-Plugin-Tickets-to-API-Chunk-Methods.patch index bad1994720..2a8f4861f6 100644 --- a/Spigot-Server-Patches/0508-Add-Plugin-Tickets-to-API-Chunk-Methods.patch +++ b/Spigot-Server-Patches/0508-Add-Plugin-Tickets-to-API-Chunk-Methods.patch @@ -22,7 +22,7 @@ wants it to collect even faster, they can restore that setting back to 1 instead Not adding it to .getType() though to keep behavior consistent with vanilla for performance reasons. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index d7b56da8a910026006dc08306e92a11e407659ce..a62ca5f24c0a49af6b42c473cbaced86cfe39d3c 100644 +index 40e6b8c8a90d6939cbacb088b9bc27dedd511b7d..0c6bc282652840536695c019f9a2b9a7391a1168 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -344,7 +344,7 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0521-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0521-Limit-lightning-strike-effect-distance.patch index 01281d012f..4d2af37153 100644 --- a/Spigot-Server-Patches/0521-Limit-lightning-strike-effect-distance.patch +++ b/Spigot-Server-Patches/0521-Limit-lightning-strike-effect-distance.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Limit lightning strike effect distance diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 0f4fca90fd6c3788a5762c96c344899cb1665466..4a59d42b778e681e93f1243ecd16c5cf46160b97 100644 +index 0f4fca90fd6c3788a5762c96c344899cb1665466..708448a72503c5878070d3aef710aa8f6b118be1 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -648,4 +648,26 @@ public class PaperWorldConfig { @@ -36,7 +36,7 @@ index 0f4fca90fd6c3788a5762c96c344899cb1665466..4a59d42b778e681e93f1243ecd16c5cf + } } diff --git a/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java -index 6f979e5f1f1567b140e9689298aff85de34f7413..ebcb9f48f47d1ab1e972bed1bc7cb0ee305a29f2 100644 +index 6f979e5f1f1567b140e9689298aff85de34f7413..b1b8748fa95aab25562c2f5397cb6454737fa508 100644 --- a/src/main/java/net/minecraft/server/EntityLightning.java +++ b/src/main/java/net/minecraft/server/EntityLightning.java @@ -56,6 +56,17 @@ public class EntityLightning extends Entity { diff --git a/work/CraftBukkit b/work/CraftBukkit index d424351010..983305bb4a 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit d4243510102530684b860dbe927311bf47c488db +Subproject commit 983305bb4a8601367e31f44b691f6e598bde9d0c