From d37d04a52fbbffbdd7f6d852992c05b0eb380648 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 3 Sep 2018 12:31:32 -0400 Subject: [PATCH] [CI-SKIP] [Auto] Rebuild Patches A recent commit has been made that caused patches to be out of order, rebuilding --- ...=> 0334-Allow-disabling-armour-stand-ticking.patch} | 2 +- ...hunks-are-always-loaded-on-hard-position-set.patch} | 4 ++-- ...> 0336-Optimize-BlockPosition-helper-methods.patch} | 2 +- ...rby-packets-from-world-player-list-not-serve.patch} | 2 +- ...patch => 0338-Cache-World-Entity-Type-counts.patch} | 2 +- ... 0339-Restore-vanlla-default-mob-spawn-range.patch} | 2 +- ...imize-Hoppers.patch => 0340-Optimize-Hoppers.patch} | 2 +- ...tch => 0341-Optimize-CraftBlockData-Creation.patch} | 2 +- ...43-Fix-MC-124320.patch => 0342-Fix-MC-124320.patch} | 2 +- ...Events.patch => 0343-Slime-Pathfinder-Events.patch} | 2 +- ...rated-API.patch => 0344-isChunkGenerated-API.patch} | 4 ++-- ...> 0345-Add-source-block-to-BlockPhysicsEvent.patch} | 4 ++-- .../{0347-Anti-Xray.patch => 0346-Anti-Xray.patch} | 2 +- ...nfigurable-speed-for-water-flowing-over-lava.patch} | 2 +- ...als.patch => 0348-Optimize-RegistryMaterials.patch} | 2 +- ...Event.patch => 0349-Add-PhantomPreSpawnEvent.patch} | 2 +- ...eeper-API.patch => 0350-Add-More-Creeper-API.patch} | 6 +++--- ...k-getPos.patch => 0351-Optimize-Chunk-getPos.patch} | 2 +- ...=> 0352-Use-an-EnumMap-for-Chunk-Height-Maps.patch} | 2 +- ...tch => 0353-Implement-Force-Loaded-Chunk-API.patch} | 10 +++++----- ...ot.patch => 0354-Inventory-removeItemAnySlot.patch} | 2 +- ...=> 0355-Optimize-getChunkIfLoaded-type-calls.patch} | 2 +- ...tch => 0356-Don-t-double-add-golems-to-world.patch} | 2 +- ... => 0357-fix-newlines-in-spigot-tab-list-API.patch} | 2 +- ...ftWorld-loadChunk-int-int-false-load-unconve.patch} | 2 +- 25 files changed, 34 insertions(+), 34 deletions(-) rename Spigot-Server-Patches/{0335-Allow-disabling-armour-stand-ticking.patch => 0334-Allow-disabling-armour-stand-ticking.patch} (97%) rename Spigot-Server-Patches/{0336-Ensure-chunks-are-always-loaded-on-hard-position-set.patch => 0335-Ensure-chunks-are-always-loaded-on-hard-position-set.patch} (92%) rename Spigot-Server-Patches/{0337-Optimize-BlockPosition-helper-methods.patch => 0336-Optimize-BlockPosition-helper-methods.patch} (98%) rename Spigot-Server-Patches/{0338-Send-nearby-packets-from-world-player-list-not-serve.patch => 0337-Send-nearby-packets-from-world-player-list-not-serve.patch} (99%) rename Spigot-Server-Patches/{0339-Cache-World-Entity-Type-counts.patch => 0338-Cache-World-Entity-Type-counts.patch} (99%) rename Spigot-Server-Patches/{0340-Restore-vanlla-default-mob-spawn-range.patch => 0339-Restore-vanlla-default-mob-spawn-range.patch} (92%) rename Spigot-Server-Patches/{0341-Optimize-Hoppers.patch => 0340-Optimize-Hoppers.patch} (99%) rename Spigot-Server-Patches/{0342-Optimize-CraftBlockData-Creation.patch => 0341-Optimize-CraftBlockData-Creation.patch} (98%) rename Spigot-Server-Patches/{0343-Fix-MC-124320.patch => 0342-Fix-MC-124320.patch} (97%) rename Spigot-Server-Patches/{0344-Slime-Pathfinder-Events.patch => 0343-Slime-Pathfinder-Events.patch} (98%) rename Spigot-Server-Patches/{0345-isChunkGenerated-API.patch => 0344-isChunkGenerated-API.patch} (94%) rename Spigot-Server-Patches/{0346-Add-source-block-to-BlockPhysicsEvent.patch => 0345-Add-source-block-to-BlockPhysicsEvent.patch} (92%) rename Spigot-Server-Patches/{0347-Anti-Xray.patch => 0346-Anti-Xray.patch} (99%) rename Spigot-Server-Patches/{0348-Configurable-speed-for-water-flowing-over-lava.patch => 0347-Configurable-speed-for-water-flowing-over-lava.patch} (98%) rename Spigot-Server-Patches/{0349-Optimize-RegistryMaterials.patch => 0348-Optimize-RegistryMaterials.patch} (94%) rename Spigot-Server-Patches/{0350-Add-PhantomPreSpawnEvent.patch => 0349-Add-PhantomPreSpawnEvent.patch} (98%) rename Spigot-Server-Patches/{0351-Add-More-Creeper-API.patch => 0350-Add-More-Creeper-API.patch} (97%) rename Spigot-Server-Patches/{0352-Optimize-Chunk-getPos.patch => 0351-Optimize-Chunk-getPos.patch} (94%) rename Spigot-Server-Patches/{0353-Use-an-EnumMap-for-Chunk-Height-Maps.patch => 0352-Use-an-EnumMap-for-Chunk-Height-Maps.patch} (92%) rename Spigot-Server-Patches/{0354-Implement-Force-Loaded-Chunk-API.patch => 0353-Implement-Force-Loaded-Chunk-API.patch} (92%) rename Spigot-Server-Patches/{0355-Inventory-removeItemAnySlot.patch => 0354-Inventory-removeItemAnySlot.patch} (97%) rename Spigot-Server-Patches/{0356-Optimize-getChunkIfLoaded-type-calls.patch => 0355-Optimize-getChunkIfLoaded-type-calls.patch} (98%) rename Spigot-Server-Patches/{0357-Don-t-double-add-golems-to-world.patch => 0356-Don-t-double-add-golems-to-world.patch} (93%) rename Spigot-Server-Patches/{0358-fix-newlines-in-spigot-tab-list-API.patch => 0357-fix-newlines-in-spigot-tab-list-API.patch} (97%) rename Spigot-Server-Patches/{0359-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch => 0358-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} (93%) diff --git a/Spigot-Server-Patches/0335-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0334-Allow-disabling-armour-stand-ticking.patch similarity index 97% rename from Spigot-Server-Patches/0335-Allow-disabling-armour-stand-ticking.patch rename to Spigot-Server-Patches/0334-Allow-disabling-armour-stand-ticking.patch index 5077227ca1..a3facb0def 100644 --- a/Spigot-Server-Patches/0335-Allow-disabling-armour-stand-ticking.patch +++ b/Spigot-Server-Patches/0334-Allow-disabling-armour-stand-ticking.patch @@ -1,4 +1,4 @@ -From 00c82216240081350df85a95ed50e9c6368029bc Mon Sep 17 00:00:00 2001 +From 2e26c681872c7a75274d912ea43d844faf0c39bc Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 15 Aug 2018 01:26:09 -0700 Subject: [PATCH] Allow disabling armour stand ticking diff --git a/Spigot-Server-Patches/0336-Ensure-chunks-are-always-loaded-on-hard-position-set.patch b/Spigot-Server-Patches/0335-Ensure-chunks-are-always-loaded-on-hard-position-set.patch similarity index 92% rename from Spigot-Server-Patches/0336-Ensure-chunks-are-always-loaded-on-hard-position-set.patch rename to Spigot-Server-Patches/0335-Ensure-chunks-are-always-loaded-on-hard-position-set.patch index da240f9315..51c2cb9168 100644 --- a/Spigot-Server-Patches/0336-Ensure-chunks-are-always-loaded-on-hard-position-set.patch +++ b/Spigot-Server-Patches/0335-Ensure-chunks-are-always-loaded-on-hard-position-set.patch @@ -1,4 +1,4 @@ -From 5d6a52b580d179bcd59043c97967d4e500819a61 Mon Sep 17 00:00:00 2001 +From 19265f90b53f78867e779c8cea4b237694e462d3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 16 Aug 2018 17:36:41 -0400 Subject: [PATCH] Ensure chunks are always loaded on hard position sets @@ -17,7 +17,7 @@ guaranteeing that the entity will be properly registered into its new home comfortably. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 7b07fe1990..de34a70e9b 100644 +index 2f87439c47..4252e8c02a 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1364,6 +1364,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0337-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0336-Optimize-BlockPosition-helper-methods.patch similarity index 98% rename from Spigot-Server-Patches/0337-Optimize-BlockPosition-helper-methods.patch rename to Spigot-Server-Patches/0336-Optimize-BlockPosition-helper-methods.patch index 648e7bd79a..3719481811 100644 --- a/Spigot-Server-Patches/0337-Optimize-BlockPosition-helper-methods.patch +++ b/Spigot-Server-Patches/0336-Optimize-BlockPosition-helper-methods.patch @@ -1,4 +1,4 @@ -From fa8038c2779fe4080fd5ad15be4128adee1ddcc1 Mon Sep 17 00:00:00 2001 +From 3c8e36e09accde296da36b77e7e82967d7dc80f1 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Wed, 15 Aug 2018 12:05:12 -0700 Subject: [PATCH] Optimize BlockPosition helper methods diff --git a/Spigot-Server-Patches/0338-Send-nearby-packets-from-world-player-list-not-serve.patch b/Spigot-Server-Patches/0337-Send-nearby-packets-from-world-player-list-not-serve.patch similarity index 99% rename from Spigot-Server-Patches/0338-Send-nearby-packets-from-world-player-list-not-serve.patch rename to Spigot-Server-Patches/0337-Send-nearby-packets-from-world-player-list-not-serve.patch index e1b2c10254..fe437a7401 100644 --- a/Spigot-Server-Patches/0338-Send-nearby-packets-from-world-player-list-not-serve.patch +++ b/Spigot-Server-Patches/0337-Send-nearby-packets-from-world-player-list-not-serve.patch @@ -1,4 +1,4 @@ -From 7832ef53a12cd1129da407349dd935f12f05d1fb Mon Sep 17 00:00:00 2001 +From 6b92f447cc46cd7d22d28407b1e0e9e530ddffa5 Mon Sep 17 00:00:00 2001 From: Mystiflow Date: Fri, 6 Jul 2018 13:21:30 +0100 Subject: [PATCH] Send nearby packets from world player list not server list diff --git a/Spigot-Server-Patches/0339-Cache-World-Entity-Type-counts.patch b/Spigot-Server-Patches/0338-Cache-World-Entity-Type-counts.patch similarity index 99% rename from Spigot-Server-Patches/0339-Cache-World-Entity-Type-counts.patch rename to Spigot-Server-Patches/0338-Cache-World-Entity-Type-counts.patch index c01caf011e..abacbf2c79 100644 --- a/Spigot-Server-Patches/0339-Cache-World-Entity-Type-counts.patch +++ b/Spigot-Server-Patches/0338-Cache-World-Entity-Type-counts.patch @@ -1,4 +1,4 @@ -From f5d3a976a51d35831486560b52f70aba7285ba67 Mon Sep 17 00:00:00 2001 +From cfe60b56f90e65e48b707b3a0d3d81615f036454 Mon Sep 17 00:00:00 2001 From: Colin Godsey Date: Wed, 8 Aug 2018 10:10:06 -0600 Subject: [PATCH] Cache World Entity Type counts diff --git a/Spigot-Server-Patches/0340-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0339-Restore-vanlla-default-mob-spawn-range.patch similarity index 92% rename from Spigot-Server-Patches/0340-Restore-vanlla-default-mob-spawn-range.patch rename to Spigot-Server-Patches/0339-Restore-vanlla-default-mob-spawn-range.patch index 2a91fdc684..c2a6109c4c 100644 --- a/Spigot-Server-Patches/0340-Restore-vanlla-default-mob-spawn-range.patch +++ b/Spigot-Server-Patches/0339-Restore-vanlla-default-mob-spawn-range.patch @@ -1,4 +1,4 @@ -From e2792cb439fa463c11c4f2419034debd8a9019b5 Mon Sep 17 00:00:00 2001 +From c9a8b3125c4f51af38c75e34f3913eab6bcf1e5e Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Aug 2018 12:43:16 -0400 Subject: [PATCH] Restore vanlla default mob-spawn-range diff --git a/Spigot-Server-Patches/0341-Optimize-Hoppers.patch b/Spigot-Server-Patches/0340-Optimize-Hoppers.patch similarity index 99% rename from Spigot-Server-Patches/0341-Optimize-Hoppers.patch rename to Spigot-Server-Patches/0340-Optimize-Hoppers.patch index 5f6d6444c1..592eea1508 100644 --- a/Spigot-Server-Patches/0341-Optimize-Hoppers.patch +++ b/Spigot-Server-Patches/0340-Optimize-Hoppers.patch @@ -1,4 +1,4 @@ -From 96715633ee7969f4452cfe39f33ab4534a02725b Mon Sep 17 00:00:00 2001 +From 7391cd02aec8f6b76a4bf6d64ac5213431bec17c Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Apr 2016 22:09:52 -0400 Subject: [PATCH] Optimize Hoppers diff --git a/Spigot-Server-Patches/0342-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0341-Optimize-CraftBlockData-Creation.patch similarity index 98% rename from Spigot-Server-Patches/0342-Optimize-CraftBlockData-Creation.patch rename to Spigot-Server-Patches/0341-Optimize-CraftBlockData-Creation.patch index 2b6a24e403..3ec2c05ead 100644 --- a/Spigot-Server-Patches/0342-Optimize-CraftBlockData-Creation.patch +++ b/Spigot-Server-Patches/0341-Optimize-CraftBlockData-Creation.patch @@ -1,4 +1,4 @@ -From 328689b5cc58e53615c8fde2642e9f0d096f2a75 Mon Sep 17 00:00:00 2001 +From 753b7c381064ecb7032ce34071112dd871ddbc6b Mon Sep 17 00:00:00 2001 From: miclebrick Date: Thu, 23 Aug 2018 11:45:32 -0400 Subject: [PATCH] Optimize CraftBlockData Creation diff --git a/Spigot-Server-Patches/0343-Fix-MC-124320.patch b/Spigot-Server-Patches/0342-Fix-MC-124320.patch similarity index 97% rename from Spigot-Server-Patches/0343-Fix-MC-124320.patch rename to Spigot-Server-Patches/0342-Fix-MC-124320.patch index 7c528eadf5..8318821e7d 100644 --- a/Spigot-Server-Patches/0343-Fix-MC-124320.patch +++ b/Spigot-Server-Patches/0342-Fix-MC-124320.patch @@ -1,4 +1,4 @@ -From c7d0c523d9cd4e4d524b76b6418b3321524276ef Mon Sep 17 00:00:00 2001 +From b8b28dd95e1878ec15ffca803089743c286a8636 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Thu, 23 Aug 2018 09:25:30 -0500 Subject: [PATCH] Fix MC-124320 diff --git a/Spigot-Server-Patches/0344-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0343-Slime-Pathfinder-Events.patch similarity index 98% rename from Spigot-Server-Patches/0344-Slime-Pathfinder-Events.patch rename to Spigot-Server-Patches/0343-Slime-Pathfinder-Events.patch index dd6b36ef91..46b7374742 100644 --- a/Spigot-Server-Patches/0344-Slime-Pathfinder-Events.patch +++ b/Spigot-Server-Patches/0343-Slime-Pathfinder-Events.patch @@ -1,4 +1,4 @@ -From a68f2567d3a973df7563af421acec948f7e19251 Mon Sep 17 00:00:00 2001 +From 7c02c49425ecd113d16d1bcb93a0efc80f407877 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 24 Aug 2018 08:18:42 -0500 Subject: [PATCH] Slime Pathfinder Events diff --git a/Spigot-Server-Patches/0345-isChunkGenerated-API.patch b/Spigot-Server-Patches/0344-isChunkGenerated-API.patch similarity index 94% rename from Spigot-Server-Patches/0345-isChunkGenerated-API.patch rename to Spigot-Server-Patches/0344-isChunkGenerated-API.patch index 7de089cf52..73ee531681 100644 --- a/Spigot-Server-Patches/0345-isChunkGenerated-API.patch +++ b/Spigot-Server-Patches/0344-isChunkGenerated-API.patch @@ -1,4 +1,4 @@ -From 007fad111fa8eb2e98ae7de91d7e2c2020b883f5 Mon Sep 17 00:00:00 2001 +From c1aeede6736d16c3a1b61fee9caaf09e2fca2d5b Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 21 Aug 2018 19:44:10 -0700 Subject: [PATCH] isChunkGenerated API @@ -6,7 +6,7 @@ Subject: [PATCH] isChunkGenerated API Resolves #1329 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 5e8a20fdd6..5eaef413a6 100644 +index 0ca071b879..96d49b469a 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -34,6 +34,9 @@ public class ChunkProviderServer implements IChunkProvider { diff --git a/Spigot-Server-Patches/0346-Add-source-block-to-BlockPhysicsEvent.patch b/Spigot-Server-Patches/0345-Add-source-block-to-BlockPhysicsEvent.patch similarity index 92% rename from Spigot-Server-Patches/0346-Add-source-block-to-BlockPhysicsEvent.patch rename to Spigot-Server-Patches/0345-Add-source-block-to-BlockPhysicsEvent.patch index a7b2e457ab..686d27047a 100644 --- a/Spigot-Server-Patches/0346-Add-source-block-to-BlockPhysicsEvent.patch +++ b/Spigot-Server-Patches/0345-Add-source-block-to-BlockPhysicsEvent.patch @@ -1,11 +1,11 @@ -From 7b67e82d351a4ed6eae20287a100ce6e76bc3e82 Mon Sep 17 00:00:00 2001 +From e951f400f5d3718775c296babb9daa0b8d565e0b Mon Sep 17 00:00:00 2001 From: Sotr Date: Thu, 23 Aug 2018 16:14:12 +0800 Subject: [PATCH] Add source block to BlockPhysicsEvent diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index abf3796d91..2a7abae942 100644 +index c479828d49..20bead54bf 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -623,7 +623,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc diff --git a/Spigot-Server-Patches/0347-Anti-Xray.patch b/Spigot-Server-Patches/0346-Anti-Xray.patch similarity index 99% rename from Spigot-Server-Patches/0347-Anti-Xray.patch rename to Spigot-Server-Patches/0346-Anti-Xray.patch index bbf072915f..26345ba5a3 100644 --- a/Spigot-Server-Patches/0347-Anti-Xray.patch +++ b/Spigot-Server-Patches/0346-Anti-Xray.patch @@ -1,4 +1,4 @@ -From 3ce5c28b7988c4e38e9ffcfdd295bd4d52fe6289 Mon Sep 17 00:00:00 2001 +From 6d63204aaeb5b73f788fbda5473db22b3c576c21 Mon Sep 17 00:00:00 2001 From: stonar96 Date: Mon, 20 Aug 2018 03:03:58 +0200 Subject: [PATCH] Anti-Xray diff --git a/Spigot-Server-Patches/0348-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0347-Configurable-speed-for-water-flowing-over-lava.patch similarity index 98% rename from Spigot-Server-Patches/0348-Configurable-speed-for-water-flowing-over-lava.patch rename to Spigot-Server-Patches/0347-Configurable-speed-for-water-flowing-over-lava.patch index 50f17abc47..4dfdc2e8a8 100644 --- a/Spigot-Server-Patches/0348-Configurable-speed-for-water-flowing-over-lava.patch +++ b/Spigot-Server-Patches/0347-Configurable-speed-for-water-flowing-over-lava.patch @@ -1,4 +1,4 @@ -From d95c11e875b62bed044078961d8a8529a2f5e258 Mon Sep 17 00:00:00 2001 +From f6bd802467ab06a881f604a02270f992fb5d5bac Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 8 Aug 2018 16:33:21 -0600 Subject: [PATCH] Configurable speed for water flowing over lava diff --git a/Spigot-Server-Patches/0349-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0348-Optimize-RegistryMaterials.patch similarity index 94% rename from Spigot-Server-Patches/0349-Optimize-RegistryMaterials.patch rename to Spigot-Server-Patches/0348-Optimize-RegistryMaterials.patch index 84592e3d19..21eac8355a 100644 --- a/Spigot-Server-Patches/0349-Optimize-RegistryMaterials.patch +++ b/Spigot-Server-Patches/0348-Optimize-RegistryMaterials.patch @@ -1,4 +1,4 @@ -From 825b7b20507d171d3c14a620f650f33ae97d89cc Mon Sep 17 00:00:00 2001 +From a7e784f0f94bb0e29e0b4f9bd7d155c866b913c4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 26 Aug 2018 20:49:50 -0400 Subject: [PATCH] Optimize RegistryMaterials diff --git a/Spigot-Server-Patches/0350-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0349-Add-PhantomPreSpawnEvent.patch similarity index 98% rename from Spigot-Server-Patches/0350-Add-PhantomPreSpawnEvent.patch rename to Spigot-Server-Patches/0349-Add-PhantomPreSpawnEvent.patch index c5a7967d75..94b4a3f855 100644 --- a/Spigot-Server-Patches/0350-Add-PhantomPreSpawnEvent.patch +++ b/Spigot-Server-Patches/0349-Add-PhantomPreSpawnEvent.patch @@ -1,4 +1,4 @@ -From d3e097f190c84d5d109bd328c4e32c349ead4a25 Mon Sep 17 00:00:00 2001 +From b0103cefc4681ecee343d74439e248db5ed62cbd Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 25 Aug 2018 19:56:51 -0500 Subject: [PATCH] Add PhantomPreSpawnEvent diff --git a/Spigot-Server-Patches/0351-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0350-Add-More-Creeper-API.patch similarity index 97% rename from Spigot-Server-Patches/0351-Add-More-Creeper-API.patch rename to Spigot-Server-Patches/0350-Add-More-Creeper-API.patch index a2b7a96c1e..a88fe20f0c 100644 --- a/Spigot-Server-Patches/0351-Add-More-Creeper-API.patch +++ b/Spigot-Server-Patches/0350-Add-More-Creeper-API.patch @@ -1,11 +1,11 @@ -From b68ac5de0a95fe88718aaaf7e2c4621543a836da Mon Sep 17 00:00:00 2001 +From 981e33a97c8acb8e99d2fbeb790fe432b77ac87a Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 24 Aug 2018 11:50:26 -0500 Subject: [PATCH] Add More Creeper API diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index 19022b6e2..321e00cef 100644 +index 19022b6e24..e070e7b2d2 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -14,7 +14,7 @@ public class EntityCreeper extends EntityMonster { @@ -91,7 +91,7 @@ index 19022b6e2..321e00cef 100644 public boolean canCauseHeadDrop() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java -index ffebb54ca..ab2b20a0d 100644 +index ffebb54caa..ab2b20a0d4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java @@ -76,4 +76,22 @@ public class CraftCreeper extends CraftMonster implements Creeper { diff --git a/Spigot-Server-Patches/0352-Optimize-Chunk-getPos.patch b/Spigot-Server-Patches/0351-Optimize-Chunk-getPos.patch similarity index 94% rename from Spigot-Server-Patches/0352-Optimize-Chunk-getPos.patch rename to Spigot-Server-Patches/0351-Optimize-Chunk-getPos.patch index 377cf4f09c..dd6fe92ea8 100644 --- a/Spigot-Server-Patches/0352-Optimize-Chunk-getPos.patch +++ b/Spigot-Server-Patches/0351-Optimize-Chunk-getPos.patch @@ -1,4 +1,4 @@ -From bd27b410c06aa3d5b0d4b93db276d478a3f1ff02 Mon Sep 17 00:00:00 2001 +From 50e2779593afd189a4d80cf496965d48b0cac746 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 28 Aug 2018 21:35:05 -0400 Subject: [PATCH] Optimize Chunk#getPos diff --git a/Spigot-Server-Patches/0353-Use-an-EnumMap-for-Chunk-Height-Maps.patch b/Spigot-Server-Patches/0352-Use-an-EnumMap-for-Chunk-Height-Maps.patch similarity index 92% rename from Spigot-Server-Patches/0353-Use-an-EnumMap-for-Chunk-Height-Maps.patch rename to Spigot-Server-Patches/0352-Use-an-EnumMap-for-Chunk-Height-Maps.patch index 58a5c93ae6..1fb6f45523 100644 --- a/Spigot-Server-Patches/0353-Use-an-EnumMap-for-Chunk-Height-Maps.patch +++ b/Spigot-Server-Patches/0352-Use-an-EnumMap-for-Chunk-Height-Maps.patch @@ -1,4 +1,4 @@ -From a3fb16787b296fde8ee82cb76d3a305233d8e5cf Mon Sep 17 00:00:00 2001 +From 98da4abc6afd89a1c6188ba96bb6a61f830b691b Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 28 Aug 2018 22:11:13 -0400 Subject: [PATCH] Use an EnumMap for Chunk Height Maps diff --git a/Spigot-Server-Patches/0354-Implement-Force-Loaded-Chunk-API.patch b/Spigot-Server-Patches/0353-Implement-Force-Loaded-Chunk-API.patch similarity index 92% rename from Spigot-Server-Patches/0354-Implement-Force-Loaded-Chunk-API.patch rename to Spigot-Server-Patches/0353-Implement-Force-Loaded-Chunk-API.patch index 08b15d5787..2531a8c14d 100644 --- a/Spigot-Server-Patches/0354-Implement-Force-Loaded-Chunk-API.patch +++ b/Spigot-Server-Patches/0353-Implement-Force-Loaded-Chunk-API.patch @@ -1,11 +1,11 @@ -From 64a7e90d6fc4c9d64a49ea15cb90268f662086e0 Mon Sep 17 00:00:00 2001 +From 9f558a69347dfbaaf71ff2d963e7f27d8b972aae Mon Sep 17 00:00:00 2001 From: willies952002 Date: Wed, 29 Aug 2018 00:37:42 -0400 Subject: [PATCH] Implement Force-Loaded Chunk API diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 49809372d..2b5b0c4df 100644 +index 49809372d8..2b5b0c4df6 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -3010,6 +3010,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -17,7 +17,7 @@ index 49809372d..2b5b0c4df 100644 String s = "chunks"; ForcedChunk forcedchunk = (ForcedChunk) this.a(this.worldProvider.getDimensionManager(), ForcedChunk::new, "chunks"); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -index 12c6d850d..55394e0c1 100644 +index 12c6d850d2..55394e0c15 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java @@ -289,6 +289,18 @@ public class CraftChunk implements Chunk { @@ -40,7 +40,7 @@ index 12c6d850d..55394e0c1 100644 Arrays.fill(emptySkyLight, (byte) 0xFF); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 1ccf2a760..755d2632f 100644 +index 1ccf2a7609..755d2632fd 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -609,6 +609,10 @@ public class CraftWorld implements World { @@ -55,5 +55,5 @@ index 1ccf2a760..755d2632f 100644 public ChunkGenerator getGenerator() { -- -2.19.0.rc1 +2.18.0 diff --git a/Spigot-Server-Patches/0355-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0354-Inventory-removeItemAnySlot.patch similarity index 97% rename from Spigot-Server-Patches/0355-Inventory-removeItemAnySlot.patch rename to Spigot-Server-Patches/0354-Inventory-removeItemAnySlot.patch index 0af8c2d57d..e1fd2568c5 100644 --- a/Spigot-Server-Patches/0355-Inventory-removeItemAnySlot.patch +++ b/Spigot-Server-Patches/0354-Inventory-removeItemAnySlot.patch @@ -1,4 +1,4 @@ -From e01493d9b51364dc5d48c6ba22ddb19cba25f3d9 Mon Sep 17 00:00:00 2001 +From 9b8351eca28bc9eb698984166a7ea89e0eb8c322 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 28 Aug 2018 23:04:15 -0400 Subject: [PATCH] Inventory#removeItemAnySlot diff --git a/Spigot-Server-Patches/0356-Optimize-getChunkIfLoaded-type-calls.patch b/Spigot-Server-Patches/0355-Optimize-getChunkIfLoaded-type-calls.patch similarity index 98% rename from Spigot-Server-Patches/0356-Optimize-getChunkIfLoaded-type-calls.patch rename to Spigot-Server-Patches/0355-Optimize-getChunkIfLoaded-type-calls.patch index 84b63b2a24..d79d8367a1 100644 --- a/Spigot-Server-Patches/0356-Optimize-getChunkIfLoaded-type-calls.patch +++ b/Spigot-Server-Patches/0355-Optimize-getChunkIfLoaded-type-calls.patch @@ -1,4 +1,4 @@ -From 7dc2f28d7234646faf52d0f4c7c66e1fd4a6b7ae Mon Sep 17 00:00:00 2001 +From 8680a88f33ba22fdceb70ffd3a876f4284244a4b Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 29 Aug 2018 21:59:22 -0400 Subject: [PATCH] Optimize getChunkIfLoaded type calls diff --git a/Spigot-Server-Patches/0357-Don-t-double-add-golems-to-world.patch b/Spigot-Server-Patches/0356-Don-t-double-add-golems-to-world.patch similarity index 93% rename from Spigot-Server-Patches/0357-Don-t-double-add-golems-to-world.patch rename to Spigot-Server-Patches/0356-Don-t-double-add-golems-to-world.patch index 432941beef..c6953de840 100644 --- a/Spigot-Server-Patches/0357-Don-t-double-add-golems-to-world.patch +++ b/Spigot-Server-Patches/0356-Don-t-double-add-golems-to-world.patch @@ -1,4 +1,4 @@ -From 916e4d1edfde6390f74dcf4245fc9a6f5a2c9731 Mon Sep 17 00:00:00 2001 +From e882964f631dce6c71f4733d3d354d01fa94d8ca Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 30 Aug 2018 20:56:26 -0400 Subject: [PATCH] Don't double add golems to world diff --git a/Spigot-Server-Patches/0358-fix-newlines-in-spigot-tab-list-API.patch b/Spigot-Server-Patches/0357-fix-newlines-in-spigot-tab-list-API.patch similarity index 97% rename from Spigot-Server-Patches/0358-fix-newlines-in-spigot-tab-list-API.patch rename to Spigot-Server-Patches/0357-fix-newlines-in-spigot-tab-list-API.patch index 85ca0ebc1a..38aa7445b5 100644 --- a/Spigot-Server-Patches/0358-fix-newlines-in-spigot-tab-list-API.patch +++ b/Spigot-Server-Patches/0357-fix-newlines-in-spigot-tab-list-API.patch @@ -1,4 +1,4 @@ -From d53683a29cf68210c2222eec64a5849ea8382b3a Mon Sep 17 00:00:00 2001 +From 1292c431b99d5f7240fe68b46cdc37a30a8e3e14 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 1 Sep 2018 11:29:52 +0100 Subject: [PATCH] fix newlines in spigot tab list API diff --git a/Spigot-Server-Patches/0359-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0358-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch similarity index 93% rename from Spigot-Server-Patches/0359-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch rename to Spigot-Server-Patches/0358-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch index f0d0a1ae0e..8a4e568be5 100644 --- a/Spigot-Server-Patches/0359-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch +++ b/Spigot-Server-Patches/0358-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch @@ -1,4 +1,4 @@ -From 9248fae968af8978811a695b5bf6c030499376a8 Mon Sep 17 00:00:00 2001 +From 420efcfbfe29045088fac0365c997a4ac120eca4 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 2 Sep 2018 19:34:33 -0700 Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted