diff --git a/Spigot-API-Patches/0190-Entity-Jump-API.patch b/Spigot-API-Patches/0191-Entity-Jump-API.patch similarity index 97% rename from Spigot-API-Patches/0190-Entity-Jump-API.patch rename to Spigot-API-Patches/0191-Entity-Jump-API.patch index 77ec10ef3f..41ca4939f7 100644 --- a/Spigot-API-Patches/0190-Entity-Jump-API.patch +++ b/Spigot-API-Patches/0191-Entity-Jump-API.patch @@ -1,4 +1,4 @@ -From a8b56634a5ca81cad0a7290711a6054000a28f7c Mon Sep 17 00:00:00 2001 +From 282dc16c61aeacfab2e8ab1f38b75a6975f7701f Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 8 Feb 2020 23:26:18 -0600 Subject: [PATCH] Entity Jump API diff --git a/Spigot-Server-Patches/0324-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0323-Don-t-sleep-after-profile-lookups-if-not-needed.patch similarity index 95% rename from Spigot-Server-Patches/0324-Don-t-sleep-after-profile-lookups-if-not-needed.patch rename to Spigot-Server-Patches/0323-Don-t-sleep-after-profile-lookups-if-not-needed.patch index 92ce3e6ba1..7e63b710c0 100644 --- a/Spigot-Server-Patches/0324-Don-t-sleep-after-profile-lookups-if-not-needed.patch +++ b/Spigot-Server-Patches/0323-Don-t-sleep-after-profile-lookups-if-not-needed.patch @@ -1,4 +1,4 @@ -From 1d9adc37ea04e2f598d16e86c670524b6bedb27c Mon Sep 17 00:00:00 2001 +From abdac842cad2aefea0af10435e422918867fbffc Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 23 Oct 2018 20:25:05 -0400 Subject: [PATCH] Don't sleep after profile lookups if not needed @@ -32,5 +32,5 @@ index 71e48e87b..23f1447cf 100644 try { Thread.sleep(DELAY_BETWEEN_PAGES); -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0323-Strip-private-area-unicode-characters-from-signs.patch b/Spigot-Server-Patches/0323-Strip-private-area-unicode-characters-from-signs.patch deleted file mode 100644 index 5c8fd9a303..0000000000 --- a/Spigot-Server-Patches/0323-Strip-private-area-unicode-characters-from-signs.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 5509fa75cffe5764dab30e4ad1745d5bd8e95c5d Mon Sep 17 00:00:00 2001 -From: Zach Brown -Date: Tue, 23 Oct 2018 20:53:43 -0400 -Subject: [PATCH] Strip private area unicode characters from signs - -It is not immediately clear how these characters ended up on signs in -previous versions. It is clear, however, that they now render as empty -unicode boxes in 1.13, whereas previously they rendered as invisible -characters. - -When these signs are loaded in versions after this commit, these -characters from the private use area of the Unicode block will be -stripped. The sign will then be marked to ensure this conversion only -runs once. - -There is a flag -DPaper.keepInvalidUnicode=true that can be used if you -do not want us to strip these characters from your signs, though I can -think of no reason to use it. - -Fixes GH-1571 - -diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index 03f6ddf00..4c2273497 100644 ---- a/src/main/java/net/minecraft/server/TileEntitySign.java -+++ b/src/main/java/net/minecraft/server/TileEntitySign.java -@@ -11,6 +11,11 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // - private final String[] g = new String[4]; - private EnumColor color; - -+ // Paper start - Strip invalid unicode from signs on load -+ private static final boolean keepInvalidUnicode = Boolean.getBoolean("Paper.keepInvalidUnicode"); // Allow people to keep their bad unicode if they really want it -+ private boolean privateUnicodeRemoved = false; -+ // Paper end -+ - public TileEntitySign() { - super(TileEntityTypes.SIGN); - this.color = EnumColor.BLACK; -@@ -33,6 +38,12 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // - // CraftBukkit end - - nbttagcompound.setString("Color", this.color.b()); -+ // Paper start - Only remove private area unicode once // TODO - this doesn't need to run for every sign, check data ver -+ if (this.privateUnicodeRemoved) { -+ nbttagcompound.setBoolean("Paper.RemovedPrivateUnicode", true); -+ } -+ // Paper end -+ - return nbttagcompound; - } - -@@ -42,6 +53,11 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // - super.load(nbttagcompound); - this.color = EnumColor.a(nbttagcompound.getString("Color"), EnumColor.BLACK); - -+ // Paper start - Keep track, only do it once per sign -+ this.privateUnicodeRemoved = nbttagcompound.getBoolean("Paper.RemovedPrivateUnicode"); -+ boolean ranUnicodeRemoval = false; -+ // Paper end -+ - // CraftBukkit start - Add an option to convert signs correctly - // This is done with a flag instead of all the time because - // we have no way to tell whether a sign is from 1.7.10 or 1.8 -@@ -54,6 +70,19 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // - s = "\"\""; - } - -+ // Paper start - Strip private use area unicode from signs -+ if (s != null && !keepInvalidUnicode && !this.privateUnicodeRemoved) { -+ StringBuilder builder = new StringBuilder(); -+ for (char character : s.toCharArray()) { -+ if (Character.UnicodeBlock.of(character) != Character.UnicodeBlock.PRIVATE_USE_AREA) { -+ builder.append(character); -+ } -+ } -+ s = builder.toString(); -+ ranUnicodeRemoval = true; -+ } -+ // Paper end -+ - try { - //IChatBaseComponent ichatbasecomponent = IChatBaseComponent.ChatSerializer.a(s.isEmpty() ? "\"\"" : s); // Paper - move down - the old format might throw a json error - -@@ -80,6 +109,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // - this.g[i] = null; - } - -+ if (ranUnicodeRemoval) this.privateUnicodeRemoved = true; // Paper - Flag to write NBT - } - - public void a(int i, IChatBaseComponent ichatbasecomponent) { --- -2.25.0.windows.1 - diff --git a/Spigot-Server-Patches/0325-Use-more-reasonable-thread-count-default-for-bootstr.patch b/Spigot-Server-Patches/0324-Use-more-reasonable-thread-count-default-for-bootstr.patch similarity index 91% rename from Spigot-Server-Patches/0325-Use-more-reasonable-thread-count-default-for-bootstr.patch rename to Spigot-Server-Patches/0324-Use-more-reasonable-thread-count-default-for-bootstr.patch index e4b2789dfe..7847c46134 100644 --- a/Spigot-Server-Patches/0325-Use-more-reasonable-thread-count-default-for-bootstr.patch +++ b/Spigot-Server-Patches/0324-Use-more-reasonable-thread-count-default-for-bootstr.patch @@ -1,4 +1,4 @@ -From 7ffab5b21a1c24feab0808bbb7728f5df73a9eb7 Mon Sep 17 00:00:00 2001 +From 94ad20a66877884fc46b2f8348839fac269eb3cb Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 23 Oct 2018 23:14:38 -0400 Subject: [PATCH] Use more reasonable thread count default for bootstrap @@ -18,5 +18,5 @@ index 7e224ebef..dc6d03062 100644 if (i <= 0) { -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0326-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0325-Optimize-World-Time-Updates.patch similarity index 96% rename from Spigot-Server-Patches/0326-Optimize-World-Time-Updates.patch rename to Spigot-Server-Patches/0325-Optimize-World-Time-Updates.patch index 124a7de1ce..9ecd138a6c 100644 --- a/Spigot-Server-Patches/0326-Optimize-World-Time-Updates.patch +++ b/Spigot-Server-Patches/0325-Optimize-World-Time-Updates.patch @@ -1,4 +1,4 @@ -From 7f0e35030a5992c50655cd6285e0858020839d28 Mon Sep 17 00:00:00 2001 +From 7b6875067185e9004af4496d92c394fad7ccccb2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 2 Nov 2018 23:11:51 -0400 Subject: [PATCH] Optimize World Time Updates @@ -41,5 +41,5 @@ index a3156d003..2a01e609c 100644 while (iterator.hasNext()) { -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0327-Restore-custom-InventoryHolder-support.patch b/Spigot-Server-Patches/0326-Restore-custom-InventoryHolder-support.patch similarity index 96% rename from Spigot-Server-Patches/0327-Restore-custom-InventoryHolder-support.patch rename to Spigot-Server-Patches/0326-Restore-custom-InventoryHolder-support.patch index 862da9a503..cd577f8a39 100644 --- a/Spigot-Server-Patches/0327-Restore-custom-InventoryHolder-support.patch +++ b/Spigot-Server-Patches/0326-Restore-custom-InventoryHolder-support.patch @@ -1,4 +1,4 @@ -From a6050bc7b6a19c1829256c4c3580e15097a5818a Mon Sep 17 00:00:00 2001 +From 69055d2af5fb73621a58b66e9e65620504934a66 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 5 Nov 2018 04:23:51 +0000 Subject: [PATCH] Restore custom InventoryHolder support @@ -42,5 +42,5 @@ index 9957ed040..ae280dd40 100644 } -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0328-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0327-Use-Vanilla-Minecart-Speeds.patch similarity index 90% rename from Spigot-Server-Patches/0328-Use-Vanilla-Minecart-Speeds.patch rename to Spigot-Server-Patches/0327-Use-Vanilla-Minecart-Speeds.patch index 65773c9383..c1533fde27 100644 --- a/Spigot-Server-Patches/0328-Use-Vanilla-Minecart-Speeds.patch +++ b/Spigot-Server-Patches/0327-Use-Vanilla-Minecart-Speeds.patch @@ -1,4 +1,4 @@ -From 900913a4710ef3d90da72e6bc35f342204901239 Mon Sep 17 00:00:00 2001 +From d4a7cfb80c410ba7686baa9226f3d530d358bd17 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 8 Nov 2018 21:33:09 -0500 Subject: [PATCH] Use Vanilla Minecart Speeds @@ -6,7 +6,7 @@ Subject: [PATCH] Use Vanilla Minecart Speeds CraftBukkit changed the values on flying speed, restore back to vanilla diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java -index 1b64ad824..4388186db 100644 +index c2843d5d6..665bbe07f 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java @@ -59,9 +59,9 @@ public abstract class EntityMinecartAbstract extends Entity { @@ -23,5 +23,5 @@ index 1b64ad824..4388186db 100644 // CraftBukkit end -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0329-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0328-Fix-SpongeAbsortEvent-handling.patch similarity index 96% rename from Spigot-Server-Patches/0329-Fix-SpongeAbsortEvent-handling.patch rename to Spigot-Server-Patches/0328-Fix-SpongeAbsortEvent-handling.patch index c943c39e72..32c2bfa431 100644 --- a/Spigot-Server-Patches/0329-Fix-SpongeAbsortEvent-handling.patch +++ b/Spigot-Server-Patches/0328-Fix-SpongeAbsortEvent-handling.patch @@ -1,4 +1,4 @@ -From b48305003dc34450a7cc81c77ad40499a3ef44b5 Mon Sep 17 00:00:00 2001 +From 6d5624204ccf8343905c51628233fc07f6ded851 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 10 Nov 2018 05:15:21 +0000 Subject: [PATCH] Fix SpongeAbsortEvent handling @@ -37,5 +37,5 @@ index 685a30f3f..9edf937a6 100644 } world.setTypeAndData(blockposition2, block.getHandle(), block.getFlag()); -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0330-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0329-Don-t-allow-digging-into-unloaded-chunks.patch similarity index 94% rename from Spigot-Server-Patches/0330-Don-t-allow-digging-into-unloaded-chunks.patch rename to Spigot-Server-Patches/0329-Don-t-allow-digging-into-unloaded-chunks.patch index 9576121d5d..9fb1affe75 100644 --- a/Spigot-Server-Patches/0330-Don-t-allow-digging-into-unloaded-chunks.patch +++ b/Spigot-Server-Patches/0329-Don-t-allow-digging-into-unloaded-chunks.patch @@ -1,4 +1,4 @@ -From 36762affd06ca9e30d8f94f1d18cd066ca36f1bf Mon Sep 17 00:00:00 2001 +From 451cf4b95cae005f0afc654ebfa95bffadf834d1 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 11 Nov 2018 21:01:09 +0000 Subject: [PATCH] Don't allow digging into unloaded chunks diff --git a/Spigot-Server-Patches/0331-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0330-Optimize-redstone-algorithm.patch similarity index 99% rename from Spigot-Server-Patches/0331-Optimize-redstone-algorithm.patch rename to Spigot-Server-Patches/0330-Optimize-redstone-algorithm.patch index 25010b1145..259657c3fe 100644 --- a/Spigot-Server-Patches/0331-Optimize-redstone-algorithm.patch +++ b/Spigot-Server-Patches/0330-Optimize-redstone-algorithm.patch @@ -1,4 +1,4 @@ -From 49f6b5e50f8bb65c54272dda0b98f7afa6b8ad18 Mon Sep 17 00:00:00 2001 +From cf388f5b3b29afa40f7eb756e618a883d4da0ac7 Mon Sep 17 00:00:00 2001 From: theosib Date: Thu, 27 Sep 2018 01:43:35 -0600 Subject: [PATCH] Optimize redstone algorithm @@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee Just added Bukkit's event system and took a few liberties with dead code and comment misspellings. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 0862a1d629..4ba72275b9 100644 +index 0862a1d62..4ba72275b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -432,4 +432,14 @@ public class PaperWorldConfig { @@ -39,7 +39,7 @@ index 0862a1d629..4ba72275b9 100644 } diff --git a/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java new file mode 100644 -index 0000000000..b69803cbf2 +index 000000000..b69803cbf --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java @@ -0,0 +1,915 @@ @@ -959,7 +959,7 @@ index 0000000000..b69803cbf2 + } +} diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java -index 5bf2fc0b3f..52a4982ecd 100644 +index 5bf2fc0b3..52a4982ec 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java @@ -1,5 +1,7 @@ @@ -1127,7 +1127,7 @@ index 5bf2fc0b3f..52a4982ecd 100644 c(iblockdata, world, blockposition); world.a(blockposition, false); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index c7b4734e94..2a1359f7d9 100644 +index 4ef619118..8f0b516e8 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -516,6 +516,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0332-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0331-force-entity-dismount-during-teleportation.patch similarity index 98% rename from Spigot-Server-Patches/0332-force-entity-dismount-during-teleportation.patch rename to Spigot-Server-Patches/0331-force-entity-dismount-during-teleportation.patch index cab9e657c8..d4e7a14d20 100644 --- a/Spigot-Server-Patches/0332-force-entity-dismount-during-teleportation.patch +++ b/Spigot-Server-Patches/0331-force-entity-dismount-during-teleportation.patch @@ -1,4 +1,4 @@ -From 07e962c0cdaba87e8ad7cd0f076486975cf1519f Mon Sep 17 00:00:00 2001 +From af29b30adfb228cf9c8d849cbb086acd5101b7b8 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 15 Nov 2018 13:38:37 +0000 Subject: [PATCH] force entity dismount during teleportation @@ -20,7 +20,7 @@ this is going to be the best soultion all around. Improvements/suggestions welcome! diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 7ce0ed251..508093063 100644 +index 166c1295d..ec4cac942 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2028,12 +2028,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0333-Book-Size-Limits.patch b/Spigot-Server-Patches/0332-Book-Size-Limits.patch similarity index 96% rename from Spigot-Server-Patches/0333-Book-Size-Limits.patch rename to Spigot-Server-Patches/0332-Book-Size-Limits.patch index b46198355d..d76d048df8 100644 --- a/Spigot-Server-Patches/0333-Book-Size-Limits.patch +++ b/Spigot-Server-Patches/0332-Book-Size-Limits.patch @@ -1,4 +1,4 @@ -From 0ae11b28c737c06f42585a00b5575d9d1295756c Mon Sep 17 00:00:00 2001 +From 01b52b8dcfb26b5c86ddd4f0c91cced2842842da Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 16 Nov 2018 23:08:50 -0500 Subject: [PATCH] Book Size Limits @@ -22,7 +22,7 @@ index 7e85a0224..30f35304a 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index d263897da..e5db2de26 100644 +index b21fca9e5..784f0a3f2 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -14,6 +14,7 @@ import java.util.Iterator; @@ -77,5 +77,5 @@ index d263897da..e5db2de26 100644 // CraftBukkit start if (this.lastBookTick + 20 > MinecraftServer.currentTick) { -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0334-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0333-Make-the-default-permission-message-configurable.patch similarity index 97% rename from Spigot-Server-Patches/0334-Make-the-default-permission-message-configurable.patch rename to Spigot-Server-Patches/0333-Make-the-default-permission-message-configurable.patch index 7a7ac44237..e378803f5e 100644 --- a/Spigot-Server-Patches/0334-Make-the-default-permission-message-configurable.patch +++ b/Spigot-Server-Patches/0333-Make-the-default-permission-message-configurable.patch @@ -1,4 +1,4 @@ -From 0bf0bd67f3507c512927515bebeab0feb189e130 Mon Sep 17 00:00:00 2001 +From 1d243236fe21e749143cdef0907a886204199bf8 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 18 Nov 2018 19:49:56 +0000 Subject: [PATCH] Make the default permission message configurable diff --git a/Spigot-Server-Patches/0335-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0334-Add-more-Zombie-API.patch similarity index 98% rename from Spigot-Server-Patches/0335-Add-more-Zombie-API.patch rename to Spigot-Server-Patches/0334-Add-more-Zombie-API.patch index a091f81b5e..865a10e81f 100644 --- a/Spigot-Server-Patches/0335-Add-more-Zombie-API.patch +++ b/Spigot-Server-Patches/0334-Add-more-Zombie-API.patch @@ -1,4 +1,4 @@ -From 22ccb629e66047a72d7e4aa0eb8f0df176e67c05 Mon Sep 17 00:00:00 2001 +From cee59d11ce246afef56fc7024f45d0b7823a1450 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 04:29:59 -0500 Subject: [PATCH] Add more Zombie API diff --git a/Spigot-Server-Patches/0336-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0335-Prevent-rayTrace-from-loading-chunks.patch similarity index 94% rename from Spigot-Server-Patches/0336-Prevent-rayTrace-from-loading-chunks.patch rename to Spigot-Server-Patches/0335-Prevent-rayTrace-from-loading-chunks.patch index f7829634a6..a11b4c863b 100644 --- a/Spigot-Server-Patches/0336-Prevent-rayTrace-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0335-Prevent-rayTrace-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From 7444bc82fcaedad8178f68ad68e376a0de198e7d Mon Sep 17 00:00:00 2001 +From 19946c7d62fd0ac3092ee6aea28b51e7651640e5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 26 Nov 2018 19:21:58 -0500 Subject: [PATCH] Prevent rayTrace from loading chunks @@ -28,5 +28,5 @@ index 0dff02352..29cdc0087 100644 Vec3D vec3d = raytrace1.b(); Vec3D vec3d1 = raytrace1.a(); -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0337-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0336-Handle-Large-Packets-disconnecting-client.patch similarity index 98% rename from Spigot-Server-Patches/0337-Handle-Large-Packets-disconnecting-client.patch rename to Spigot-Server-Patches/0336-Handle-Large-Packets-disconnecting-client.patch index 117fc6d112..114e8e6961 100644 --- a/Spigot-Server-Patches/0337-Handle-Large-Packets-disconnecting-client.patch +++ b/Spigot-Server-Patches/0336-Handle-Large-Packets-disconnecting-client.patch @@ -1,4 +1,4 @@ -From e727be3702ab097173ba79d5128dc0de8ad7263b Mon Sep 17 00:00:00 2001 +From a3a1da7bb34c3864cf7153eb8aa544cfa5847f35 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 27 Nov 2018 21:18:06 -0500 Subject: [PATCH] Handle Large Packets disconnecting client @@ -113,5 +113,5 @@ index f7c365567..631234324 100644 public PacketPlayOutWindowItems(int i, NonNullList nonnulllist) { -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0338-Lazy-init-world-storage-in-CraftOfflinePlayer.patch b/Spigot-Server-Patches/0337-Lazy-init-world-storage-in-CraftOfflinePlayer.patch similarity index 97% rename from Spigot-Server-Patches/0338-Lazy-init-world-storage-in-CraftOfflinePlayer.patch rename to Spigot-Server-Patches/0337-Lazy-init-world-storage-in-CraftOfflinePlayer.patch index 148ed7eca2..b767a9e06c 100644 --- a/Spigot-Server-Patches/0338-Lazy-init-world-storage-in-CraftOfflinePlayer.patch +++ b/Spigot-Server-Patches/0337-Lazy-init-world-storage-in-CraftOfflinePlayer.patch @@ -1,4 +1,4 @@ -From d2e75b109c8f840b3062f7a34c1a23b53b6b8b2e Mon Sep 17 00:00:00 2001 +From 4afc291af96ba13e98030b2622aefe7e97a8e425 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 11 Dec 2018 22:25:07 -0500 Subject: [PATCH] Lazy init world storage in CraftOfflinePlayer @@ -61,5 +61,5 @@ index 6a448c02e..c1ef1c950 100644 @Override -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0339-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0338-Add-PlayerConnectionCloseEvent.patch similarity index 98% rename from Spigot-Server-Patches/0339-Add-PlayerConnectionCloseEvent.patch rename to Spigot-Server-Patches/0338-Add-PlayerConnectionCloseEvent.patch index 518afa2fc3..c355c871ec 100644 --- a/Spigot-Server-Patches/0339-Add-PlayerConnectionCloseEvent.patch +++ b/Spigot-Server-Patches/0338-Add-PlayerConnectionCloseEvent.patch @@ -1,4 +1,4 @@ -From be2fcdbbab552651193f0614e8fa38dcaa4e124f Mon Sep 17 00:00:00 2001 +From e0bdb755f23684a0d0a220f69157116f778e31e2 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 7 Oct 2018 12:05:28 -0700 Subject: [PATCH] Add PlayerConnectionCloseEvent @@ -81,5 +81,5 @@ index d4aad8a5b..b1dededc1 100644 } -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0340-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0339-Prevent-Enderman-from-loading-chunks.patch similarity index 94% rename from Spigot-Server-Patches/0340-Prevent-Enderman-from-loading-chunks.patch rename to Spigot-Server-Patches/0339-Prevent-Enderman-from-loading-chunks.patch index 448854782f..d04b30ecf4 100644 --- a/Spigot-Server-Patches/0340-Prevent-Enderman-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0339-Prevent-Enderman-from-loading-chunks.patch @@ -1,11 +1,11 @@ -From 03d71a4815f4f0fbcdf63b6894e9551bdb81e683 Mon Sep 17 00:00:00 2001 +From c4fba36fff9ad6592c8ccefe7b9b7f51338db9da Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 18 Dec 2018 02:15:08 +0000 Subject: [PATCH] Prevent Enderman from loading chunks diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index 149de2c57..8741df83b 100644 +index d86f76f30..212636dcb 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -344,7 +344,8 @@ public class EntityEnderman extends EntityMonster { @@ -29,5 +29,5 @@ index 149de2c57..8741df83b 100644 IBlockData iblockdata1 = world.getType(blockposition1); IBlockData iblockdata2 = Block.getValidBlockForPosition(getEnderman().getCarried(), getEnderman().world, blockposition); // Paper - Fix MC-124320 -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0341-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0340-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 98% rename from Spigot-Server-Patches/0341-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to Spigot-Server-Patches/0340-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch index f06ceb33bc..86fcc698f5 100644 --- a/Spigot-Server-Patches/0341-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch +++ b/Spigot-Server-Patches/0340-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch @@ -1,4 +1,4 @@ -From 6aa4fec87fd7c60b506da07812490eaee027ca79 Mon Sep 17 00:00:00 2001 +From b7b5a52cd71c7cdbc1f5efe09f6f0162a6b81bd0 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Jan 2019 00:35:43 -0600 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed @@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and documented as to their purpose. diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 83b7ac459..f51893892 100644 +index 68e12cf98..d3bfb72e3 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -75,6 +75,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -163,5 +163,5 @@ index a2bda708c..37fce38df 100644 @Override -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0342-Fix-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0341-Fix-PlayerEditBookEvent.patch similarity index 93% rename from Spigot-Server-Patches/0342-Fix-PlayerEditBookEvent.patch rename to Spigot-Server-Patches/0341-Fix-PlayerEditBookEvent.patch index 29679f8d07..48fe3497e0 100644 --- a/Spigot-Server-Patches/0342-Fix-PlayerEditBookEvent.patch +++ b/Spigot-Server-Patches/0341-Fix-PlayerEditBookEvent.patch @@ -1,4 +1,4 @@ -From 0c5b2fe41394e0d3f410bb5cfe1d5ec114c77e0d Mon Sep 17 00:00:00 2001 +From f8d28cd4dd37cac6018bb748c41b9655bb1e7d02 Mon Sep 17 00:00:00 2001 From: Michael Himing Date: Sun, 16 Dec 2018 13:07:33 +1100 Subject: [PATCH] Fix PlayerEditBookEvent @@ -10,7 +10,7 @@ it impossible to properly cancel the event or modify the book meta cancelled writing diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index e5db2de26..c3feccbd6 100644 +index 784f0a3f2..4b3ddfd99 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -871,9 +871,11 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -29,5 +29,5 @@ index e5db2de26..c3feccbd6 100644 } -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0343-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0342-Workaround-for-vehicle-tracking-issue-on-disconnect.patch similarity index 88% rename from Spigot-Server-Patches/0343-Workaround-for-vehicle-tracking-issue-on-disconnect.patch rename to Spigot-Server-Patches/0342-Workaround-for-vehicle-tracking-issue-on-disconnect.patch index bd17a0bcc2..e3b4eba066 100644 --- a/Spigot-Server-Patches/0343-Workaround-for-vehicle-tracking-issue-on-disconnect.patch +++ b/Spigot-Server-Patches/0342-Workaround-for-vehicle-tracking-issue-on-disconnect.patch @@ -1,11 +1,11 @@ -From 2e30cfa761e3ef1b77286c72cdfc389d699dd8df Mon Sep 17 00:00:00 2001 +From df342c57c5f870ab82a077275a9192b5ac728f20 Mon Sep 17 00:00:00 2001 From: connorhartley Date: Mon, 7 Jan 2019 14:43:48 -0600 Subject: [PATCH] Workaround for vehicle tracking issue on disconnect diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index d3bfb72e39..4d614b9ef1 100644 +index d3bfb72e3..4d614b9ef 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1294,6 +1294,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -23,5 +23,5 @@ index d3bfb72e39..4d614b9ef1 100644 this.wakeup(true, false); } -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0344-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/Spigot-Server-Patches/0343-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch similarity index 96% rename from Spigot-Server-Patches/0344-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch rename to Spigot-Server-Patches/0343-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch index 259c90cd0e..0e4fe1ec7a 100644 --- a/Spigot-Server-Patches/0344-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch +++ b/Spigot-Server-Patches/0343-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch @@ -1,4 +1,4 @@ -From 498b07609e956990f12baa28189933e4a96559a7 Mon Sep 17 00:00:00 2001 +From 7f025f9a2047f99a28264d23b93d3a9b750939b4 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 31 Jan 2019 16:33:36 -0500 Subject: [PATCH] Fire BlockPistonRetractEvent for all empty pistons @@ -46,5 +46,5 @@ index 1170a2810..b29525c40 100644 // CraftBukkit end world.playBlockAction(blockposition, this, b0, enumdirection.b()); -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0345-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0344-Block-Entity-remove-from-being-called-on-Players.patch similarity index 94% rename from Spigot-Server-Patches/0345-Block-Entity-remove-from-being-called-on-Players.patch rename to Spigot-Server-Patches/0344-Block-Entity-remove-from-being-called-on-Players.patch index 4b6aec346c..02065c23b6 100644 --- a/Spigot-Server-Patches/0345-Block-Entity-remove-from-being-called-on-Players.patch +++ b/Spigot-Server-Patches/0344-Block-Entity-remove-from-being-called-on-Players.patch @@ -1,4 +1,4 @@ -From e8fe700e11b56be17d29eae6d05e824e8857844e Mon Sep 17 00:00:00 2001 +From 10eeb187755c706820e20adce87370123cf0d928 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 4 Feb 2019 23:33:24 -0500 Subject: [PATCH] Block Entity#remove from being called on Players @@ -32,5 +32,5 @@ index 37fce38df..90c251c90 100644 // Spigot start -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0346-BlockDestroyEvent.patch b/Spigot-Server-Patches/0345-BlockDestroyEvent.patch similarity index 95% rename from Spigot-Server-Patches/0346-BlockDestroyEvent.patch rename to Spigot-Server-Patches/0345-BlockDestroyEvent.patch index 8353fb6175..b7fe205bfc 100644 --- a/Spigot-Server-Patches/0346-BlockDestroyEvent.patch +++ b/Spigot-Server-Patches/0345-BlockDestroyEvent.patch @@ -1,4 +1,4 @@ -From e6732167512195d5173b8bea486fa770551ad295 Mon Sep 17 00:00:00 2001 +From 914e683bde8be673f9f9066808ea7c734b8fbda9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 6 Feb 2019 00:20:33 -0500 Subject: [PATCH] BlockDestroyEvent @@ -11,7 +11,7 @@ floating in the air. This can replace many uses of BlockPhysicsEvent diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 2a1359f7d9..0409d62e71 100644 +index 8f0b516e8..69f1494ab 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -446,8 +446,20 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0347-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/Spigot-Server-Patches/0346-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch similarity index 97% rename from Spigot-Server-Patches/0347-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch rename to Spigot-Server-Patches/0346-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch index b91213c2ce..5d4a5fcf41 100644 --- a/Spigot-Server-Patches/0347-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch +++ b/Spigot-Server-Patches/0346-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch @@ -1,4 +1,4 @@ -From 20e1b2bdda860cd130c7599e3d9ad4eb391f64e9 Mon Sep 17 00:00:00 2001 +From 74807d3a016b4c2d8c0d9adee8b17d0ace5afa78 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Jan 2019 00:08:15 -0500 Subject: [PATCH] Fix Custom Shapeless Custom Crafting Recipes @@ -64,5 +64,5 @@ index fe03a35cc..fb481e658 100644 public ItemStack a(InventoryCrafting inventorycrafting) { -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0348-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0347-Fix-sign-edit-memory-leak.patch similarity index 75% rename from Spigot-Server-Patches/0348-Fix-sign-edit-memory-leak.patch rename to Spigot-Server-Patches/0347-Fix-sign-edit-memory-leak.patch index 1ad71e41e6..07122fdd24 100644 --- a/Spigot-Server-Patches/0348-Fix-sign-edit-memory-leak.patch +++ b/Spigot-Server-Patches/0347-Fix-sign-edit-memory-leak.patch @@ -1,4 +1,4 @@ -From 1905f86c9162ccd1280286a679e3bf6ef72f59f5 Mon Sep 17 00:00:00 2001 +From 8033d3043d7ab058ea3b264c207e68288b40f786 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 Feb 2019 00:15:28 -0500 Subject: [PATCH] Fix sign edit memory leak @@ -19,18 +19,18 @@ index 4b3ddfd99..2c94ca6a8 100644 this.sendPacket(tileentity.getUpdatePacket()); // CraftBukkit return; diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index 4c2273497..f051f2d3c 100644 +index 03f6ddf00..a93402019 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java -@@ -14,6 +14,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // - // Paper start - Strip invalid unicode from signs on load - private static final boolean keepInvalidUnicode = Boolean.getBoolean("Paper.keepInvalidUnicode"); // Allow people to keep their bad unicode if they really want it - private boolean privateUnicodeRemoved = false; -+ public java.util.UUID signEditor; - // Paper end +@@ -10,6 +10,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // + private EntityHuman c; + private final String[] g = new String[4]; + private EnumColor color; ++ public java.util.UUID signEditor; // Paper public TileEntitySign() { -@@ -138,7 +139,10 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // + super(TileEntityTypes.SIGN); +@@ -108,7 +109,10 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // } public void a(EntityHuman entityhuman) { diff --git a/Spigot-Server-Patches/0349-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0348-Limit-Client-Sign-length-more.patch similarity index 97% rename from Spigot-Server-Patches/0349-Limit-Client-Sign-length-more.patch rename to Spigot-Server-Patches/0348-Limit-Client-Sign-length-more.patch index 8de95991d5..99ac1afc8a 100644 --- a/Spigot-Server-Patches/0349-Limit-Client-Sign-length-more.patch +++ b/Spigot-Server-Patches/0348-Limit-Client-Sign-length-more.patch @@ -1,4 +1,4 @@ -From bbd5e016b89420f8e365f75a0ce7a1d083333c95 Mon Sep 17 00:00:00 2001 +From 7c5b507ebee799691ed56446b1a3379a37afffaf Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Feb 2019 22:18:40 -0500 Subject: [PATCH] Limit Client Sign length more diff --git a/Spigot-Server-Patches/0350-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/Spigot-Server-Patches/0349-Don-t-check-ConvertSigns-boolean-every-sign-save.patch similarity index 61% rename from Spigot-Server-Patches/0350-Don-t-check-ConvertSigns-boolean-every-sign-save.patch rename to Spigot-Server-Patches/0349-Don-t-check-ConvertSigns-boolean-every-sign-save.patch index ce2f21100f..8e2dbc03bc 100644 --- a/Spigot-Server-Patches/0350-Don-t-check-ConvertSigns-boolean-every-sign-save.patch +++ b/Spigot-Server-Patches/0349-Don-t-check-ConvertSigns-boolean-every-sign-save.patch @@ -1,4 +1,4 @@ -From 91445890bcd96fd7a6e34c28d4af6d4a5b4660c1 Mon Sep 17 00:00:00 2001 +From 772930536a82a47d4a6dda82e42aca2a60c48f30 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 2 Mar 2019 11:11:29 -0500 Subject: [PATCH] Don't check ConvertSigns boolean every sign save @@ -7,18 +7,18 @@ property lookups arent super cheap. they synchronize, validate and check security managers. diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index f051f2d3c..5eb86c434 100644 +index a93402019..0e9a90b70 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java -@@ -15,6 +15,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // - private static final boolean keepInvalidUnicode = Boolean.getBoolean("Paper.keepInvalidUnicode"); // Allow people to keep their bad unicode if they really want it - private boolean privateUnicodeRemoved = false; - public java.util.UUID signEditor; -+ private static final boolean CONVERT_LEGACY_SIGNS = Boolean.getBoolean("convertLegacySigns"); - // Paper end +@@ -11,6 +11,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // + private final String[] g = new String[4]; + private EnumColor color; + public java.util.UUID signEditor; // Paper ++ private static final boolean CONVERT_LEGACY_SIGNS = Boolean.getBoolean("convertLegacySigns"); // Paper public TileEntitySign() { -@@ -33,7 +34,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // + super(TileEntityTypes.SIGN); +@@ -28,7 +29,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // } // CraftBukkit start @@ -28,5 +28,5 @@ index f051f2d3c..5eb86c434 100644 } // CraftBukkit end -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0351-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch b/Spigot-Server-Patches/0350-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch similarity index 97% rename from Spigot-Server-Patches/0351-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch rename to Spigot-Server-Patches/0350-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch index ee253b312d..6d0a05aa58 100644 --- a/Spigot-Server-Patches/0351-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch +++ b/Spigot-Server-Patches/0350-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch @@ -1,4 +1,4 @@ -From 09031375ee4d1d4c32f09bded9d72434d7ac4f78 Mon Sep 17 00:00:00 2001 +From fc7555197054cc6c7781cf4588abefd8c07baf09 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 2 Mar 2019 14:55:01 -0500 Subject: [PATCH] Handle Excessive Signs in Chunks creating too large of @@ -86,5 +86,5 @@ index a0b87f89d..47710067a 100644 if (tileentity instanceof TileEntitySkull) { TileEntitySkull.sanitizeTileEntityUUID(nbttagcompound); } // Paper -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0352-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0351-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch similarity index 97% rename from Spigot-Server-Patches/0352-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch rename to Spigot-Server-Patches/0351-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch index c87c7004e1..66b734005f 100644 --- a/Spigot-Server-Patches/0352-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch +++ b/Spigot-Server-Patches/0351-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch @@ -1,4 +1,4 @@ -From e2e6747239ab66f8720d21bc24c032f9d96ea8fb Mon Sep 17 00:00:00 2001 +From 767871c0aa479b831004fdd0c1f14c49a358805f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 2 Mar 2019 16:12:35 -0500 Subject: [PATCH] MC-145260: Fix Whitelist On/Off inconsistency @@ -62,5 +62,5 @@ index 659ce2181..62d807597 100644 public List b(String s) { -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0353-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0352-Set-Zombie-last-tick-at-start-of-drowning-process.patch similarity index 91% rename from Spigot-Server-Patches/0353-Set-Zombie-last-tick-at-start-of-drowning-process.patch rename to Spigot-Server-Patches/0352-Set-Zombie-last-tick-at-start-of-drowning-process.patch index 06d6677e9f..abf7387766 100644 --- a/Spigot-Server-Patches/0353-Set-Zombie-last-tick-at-start-of-drowning-process.patch +++ b/Spigot-Server-Patches/0352-Set-Zombie-last-tick-at-start-of-drowning-process.patch @@ -1,4 +1,4 @@ -From fc7ebe181eda2807ffc2252305fe942896de26d9 Mon Sep 17 00:00:00 2001 +From 164bc359bbeea1c88810d9d1c101ce7e800e1e63 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 4 Mar 2019 02:23:28 -0500 Subject: [PATCH] Set Zombie last tick at start of drowning process @@ -18,5 +18,5 @@ index 2d4f8aac8..8635d4f40 100644 } else { this.bC = -1; -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0354-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0353-Allow-Saving-of-Oversized-Chunks.patch similarity index 99% rename from Spigot-Server-Patches/0354-Allow-Saving-of-Oversized-Chunks.patch rename to Spigot-Server-Patches/0353-Allow-Saving-of-Oversized-Chunks.patch index e3697c545a..93330cab5b 100644 --- a/Spigot-Server-Patches/0354-Allow-Saving-of-Oversized-Chunks.patch +++ b/Spigot-Server-Patches/0353-Allow-Saving-of-Oversized-Chunks.patch @@ -1,4 +1,4 @@ -From 39af57e6f34618cb97c1c26bf83de1fd195d47aa Mon Sep 17 00:00:00 2001 +From a4fb267df68aecae17893dac15b94498f4a3671a Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 15 Feb 2019 01:08:19 -0500 Subject: [PATCH] Allow Saving of Oversized Chunks @@ -253,5 +253,5 @@ index 57ce53cfd..b3d1bb5fd 100644 throwable = throwable1; throw throwable1; -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0355-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0354-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch similarity index 89% rename from Spigot-Server-Patches/0355-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch rename to Spigot-Server-Patches/0354-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch index fd76546749..10d6728c46 100644 --- a/Spigot-Server-Patches/0355-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch +++ b/Spigot-Server-Patches/0354-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch @@ -1,4 +1,4 @@ -From b35f238180840e93a9d516db9201c85fdc650403 Mon Sep 17 00:00:00 2001 +From bcf06c353bbf329f1b8b36cefbbb2b3da2005756 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 13 Mar 2019 20:08:09 +0200 Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled @@ -17,5 +17,5 @@ index 62d807597..9d715d891 100644 } -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0356-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0355-Add-LivingEntity-getTargetEntity.patch similarity index 98% rename from Spigot-Server-Patches/0356-Add-LivingEntity-getTargetEntity.patch rename to Spigot-Server-Patches/0355-Add-LivingEntity-getTargetEntity.patch index a6a46dbadf..82e3788d41 100644 --- a/Spigot-Server-Patches/0356-Add-LivingEntity-getTargetEntity.patch +++ b/Spigot-Server-Patches/0355-Add-LivingEntity-getTargetEntity.patch @@ -1,4 +1,4 @@ -From f5470980c9f9279e6275054101ebf91913431fc6 Mon Sep 17 00:00:00 2001 +From 27017af9067b30b625870a4026a4d1a74380de86 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 22 Sep 2018 00:33:08 -0500 Subject: [PATCH] Add LivingEntity#getTargetEntity @@ -46,7 +46,7 @@ index 4f60b931a..c950139c0 100644 double[] adouble = new double[]{1.0D}; double d0 = vec3d1.x - vec3d.x; diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 508093063..0c50a1d54 100644 +index ec4cac942..7d27c08b9 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1476,6 +1476,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0357-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/Spigot-Server-Patches/0356-Use-proper-max-length-when-serialising-BungeeCord-te.patch similarity index 95% rename from Spigot-Server-Patches/0357-Use-proper-max-length-when-serialising-BungeeCord-te.patch rename to Spigot-Server-Patches/0356-Use-proper-max-length-when-serialising-BungeeCord-te.patch index b0eebbad84..dc19f1b347 100644 --- a/Spigot-Server-Patches/0357-Use-proper-max-length-when-serialising-BungeeCord-te.patch +++ b/Spigot-Server-Patches/0356-Use-proper-max-length-when-serialising-BungeeCord-te.patch @@ -1,4 +1,4 @@ -From 63ea01d82c450a8342f1b745e1cc1406ca4929d8 Mon Sep 17 00:00:00 2001 +From 45fa275c98843b29ed25bc19970dc4f4de202980 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 20 Mar 2019 21:19:29 -0700 Subject: [PATCH] Use proper max length when serialising BungeeCord text @@ -31,5 +31,5 @@ index 0ab611564..f7b2095bb 100644 // Paper end } else { -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0358-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0357-Entity-getEntitySpawnReason.patch similarity index 98% rename from Spigot-Server-Patches/0358-Entity-getEntitySpawnReason.patch rename to Spigot-Server-Patches/0357-Entity-getEntitySpawnReason.patch index 3a602f9ac9..dde526a90c 100644 --- a/Spigot-Server-Patches/0358-Entity-getEntitySpawnReason.patch +++ b/Spigot-Server-Patches/0357-Entity-getEntitySpawnReason.patch @@ -1,4 +1,4 @@ -From 7fdf85614bf47fe7605cc1d7a1c31c1b6646c71e Mon Sep 17 00:00:00 2001 +From 96be0f0fb1cf946e1484e2f54d246668c81e5669 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 00:24:52 -0400 Subject: [PATCH] Entity#getEntitySpawnReason @@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners, or DEFAULT since data was not stored. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 0c50a1d54..c440c2863 100644 +index 7d27c08b9..dd17967c6 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -72,6 +72,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0359-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0358-Update-entity-Metadata-for-all-tracked-players.patch similarity index 96% rename from Spigot-Server-Patches/0359-Update-entity-Metadata-for-all-tracked-players.patch rename to Spigot-Server-Patches/0358-Update-entity-Metadata-for-all-tracked-players.patch index 4e6ac2720f..f598a7de18 100644 --- a/Spigot-Server-Patches/0359-Update-entity-Metadata-for-all-tracked-players.patch +++ b/Spigot-Server-Patches/0358-Update-entity-Metadata-for-all-tracked-players.patch @@ -1,4 +1,4 @@ -From 7f1f0a3fd0c347eabb6f3dfbb56b47b98e4932ba Mon Sep 17 00:00:00 2001 +From 2d9292d911e8a38b20a04360c0b47da90522c419 Mon Sep 17 00:00:00 2001 From: AgentTroll Date: Fri, 22 Mar 2019 22:24:03 -0700 Subject: [PATCH] Update entity Metadata for all tracked players diff --git a/Spigot-Server-Patches/0360-Fire-event-on-GS4-query.patch b/Spigot-Server-Patches/0359-Fire-event-on-GS4-query.patch similarity index 99% rename from Spigot-Server-Patches/0360-Fire-event-on-GS4-query.patch rename to Spigot-Server-Patches/0359-Fire-event-on-GS4-query.patch index 0d799264f6..780269b55e 100644 --- a/Spigot-Server-Patches/0360-Fire-event-on-GS4-query.patch +++ b/Spigot-Server-Patches/0359-Fire-event-on-GS4-query.patch @@ -1,4 +1,4 @@ -From bdf8afb9a22fef3bdcf7df37700f1e7533ed84e0 Mon Sep 17 00:00:00 2001 +From 6f7f89cc4b63d3b080e3e6fc2ec84e2cc9d75aa6 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 17 Mar 2019 21:46:56 +0200 Subject: [PATCH] Fire event on GS4 query @@ -216,5 +216,5 @@ index 848b5c3f0..73efea7e1 100644 this.b.writeShort(Short.reverseBytes(short0)); } -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0361-Implement-PlayerPostRespawnEvent.patch b/Spigot-Server-Patches/0360-Implement-PlayerPostRespawnEvent.patch similarity index 96% rename from Spigot-Server-Patches/0361-Implement-PlayerPostRespawnEvent.patch rename to Spigot-Server-Patches/0360-Implement-PlayerPostRespawnEvent.patch index aea3c6bde4..00a55ae892 100644 --- a/Spigot-Server-Patches/0361-Implement-PlayerPostRespawnEvent.patch +++ b/Spigot-Server-Patches/0360-Implement-PlayerPostRespawnEvent.patch @@ -1,4 +1,4 @@ -From 4ccf2a5aff78c56a23fe6d7a69b2275791ce12ea Mon Sep 17 00:00:00 2001 +From 7088d519d03f25901ad72d447137e2baf88e4441 Mon Sep 17 00:00:00 2001 From: MisterVector Date: Fri, 26 Oct 2018 21:31:00 -0700 Subject: [PATCH] Implement PlayerPostRespawnEvent @@ -47,5 +47,5 @@ index 49437f212..68e089a4b 100644 return entityplayer1; } -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0362-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/Spigot-Server-Patches/0361-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch similarity index 92% rename from Spigot-Server-Patches/0362-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch rename to Spigot-Server-Patches/0361-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch index b48f875c4d..9c5b9a31a4 100644 --- a/Spigot-Server-Patches/0362-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch +++ b/Spigot-Server-Patches/0361-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch @@ -1,4 +1,4 @@ -From b77e7a559145c350925a375f86f5c491572da9ae Mon Sep 17 00:00:00 2001 +From 66a900f4eb5d4488519d2a133ecd2d4204697d03 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 18:09:20 -0400 Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items @@ -6,7 +6,7 @@ Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items vanilla checks for == 0 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 5f46c7f86..a0d1e7fd2 100644 +index e5c9bac88..ef2cf6565 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -60,6 +60,7 @@ public class EntityItem extends Entity { @@ -26,5 +26,5 @@ index 5f46c7f86..a0d1e7fd2 100644 this.lastTick = MinecraftServer.currentTick; // CraftBukkit end -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0363-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0362-Implement-getters-and-setters-for-EntityItem-owner-a.patch similarity index 94% rename from Spigot-Server-Patches/0363-Implement-getters-and-setters-for-EntityItem-owner-a.patch rename to Spigot-Server-Patches/0362-Implement-getters-and-setters-for-EntityItem-owner-a.patch index 1639738178..4e65f3fe6a 100644 --- a/Spigot-Server-Patches/0363-Implement-getters-and-setters-for-EntityItem-owner-a.patch +++ b/Spigot-Server-Patches/0362-Implement-getters-and-setters-for-EntityItem-owner-a.patch @@ -1,4 +1,4 @@ -From 4b9e0ac5eff5d6e5b3122971848dd6943d377c83 Mon Sep 17 00:00:00 2001 +From 7bb6f113e9d08ae26cd94c7a7f7dc8e9a985455e Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 6 Oct 2018 20:54:23 -0500 Subject: [PATCH] Implement getters and setters for EntityItem owner and @@ -51,5 +51,5 @@ index 3f552b590..cb756b1ba 100644 @Override -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0364-Server-Tick-Events.patch b/Spigot-Server-Patches/0363-Server-Tick-Events.patch similarity index 94% rename from Spigot-Server-Patches/0364-Server-Tick-Events.patch rename to Spigot-Server-Patches/0363-Server-Tick-Events.patch index 6bea451450..80484d3a33 100644 --- a/Spigot-Server-Patches/0364-Server-Tick-Events.patch +++ b/Spigot-Server-Patches/0363-Server-Tick-Events.patch @@ -1,4 +1,4 @@ -From 321428ced993804055ff146d6e357403715c5ad8 Mon Sep 17 00:00:00 2001 +From 47ee636e3a1d609a30427568e3a3b4cfb41b9f5d Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Mar 2019 22:48:45 -0400 Subject: [PATCH] Server Tick Events @@ -30,5 +30,5 @@ index 2a01e609c..2801a3ee6 100644 } -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0365-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-Server-Patches/0364-PlayerDeathEvent-getItemsToKeep.patch similarity index 96% rename from Spigot-Server-Patches/0365-PlayerDeathEvent-getItemsToKeep.patch rename to Spigot-Server-Patches/0364-PlayerDeathEvent-getItemsToKeep.patch index a8370b8377..4a24f47e7f 100644 --- a/Spigot-Server-Patches/0365-PlayerDeathEvent-getItemsToKeep.patch +++ b/Spigot-Server-Patches/0364-PlayerDeathEvent-getItemsToKeep.patch @@ -1,4 +1,4 @@ -From 4539d1b910705487353d67cd2d680ee5657f706d Mon Sep 17 00:00:00 2001 +From 0c0529b34d6836df61d8f96039ade9f3e5ce934d Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Mar 2019 23:01:33 -0400 Subject: [PATCH] PlayerDeathEvent#getItemsToKeep @@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 4d614b9ef1..77ad4774ec 100644 +index 4d614b9ef..77ad4774e 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -514,6 +514,46 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -73,5 +73,5 @@ index 4d614b9ef1..77ad4774ec 100644 this.setSpectatorTarget(this); // Remove spectated target -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0366-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0365-Optimize-Captured-TileEntity-Lookup.patch similarity index 93% rename from Spigot-Server-Patches/0366-Optimize-Captured-TileEntity-Lookup.patch rename to Spigot-Server-Patches/0365-Optimize-Captured-TileEntity-Lookup.patch index 12f18d63a0..24e9052ccd 100644 --- a/Spigot-Server-Patches/0366-Optimize-Captured-TileEntity-Lookup.patch +++ b/Spigot-Server-Patches/0365-Optimize-Captured-TileEntity-Lookup.patch @@ -1,4 +1,4 @@ -From c4e2eca4927f4d396d64e5eb88995c9291baa4b2 Mon Sep 17 00:00:00 2001 +From aa97aca65d44f7e7f4fbe2bb98478992da47b84b Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 6 Apr 2019 10:16:48 -0400 Subject: [PATCH] Optimize Captured TileEntity Lookup @@ -10,7 +10,7 @@ Optimize to check if the captured list even has values in it, and also to just do a get call since the value can never be null. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 0409d62e71..065cb3c29a 100644 +index 69f1494ab..b506f5871 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -992,12 +992,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0367-Add-Heightmap-API.patch b/Spigot-Server-Patches/0366-Add-Heightmap-API.patch similarity index 97% rename from Spigot-Server-Patches/0367-Add-Heightmap-API.patch rename to Spigot-Server-Patches/0366-Add-Heightmap-API.patch index 41233aa708..179ee0f422 100644 --- a/Spigot-Server-Patches/0367-Add-Heightmap-API.patch +++ b/Spigot-Server-Patches/0366-Add-Heightmap-API.patch @@ -1,4 +1,4 @@ -From 845e98cc02f7ce3a77ee8bddce44efc8d8392946 Mon Sep 17 00:00:00 2001 +From 6598e3cc8934ed6cbcef393823b7e872f75e2ffc Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 1 Jan 2019 02:22:01 -0800 Subject: [PATCH] Add Heightmap API diff --git a/Spigot-Server-Patches/0368-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0367-Mob-Spawner-API-Enhancements.patch similarity index 98% rename from Spigot-Server-Patches/0368-Mob-Spawner-API-Enhancements.patch rename to Spigot-Server-Patches/0367-Mob-Spawner-API-Enhancements.patch index 53b64aa583..d3dae97ff9 100644 --- a/Spigot-Server-Patches/0368-Mob-Spawner-API-Enhancements.patch +++ b/Spigot-Server-Patches/0367-Mob-Spawner-API-Enhancements.patch @@ -1,4 +1,4 @@ -From 6147a98269b0021a34653fea8f972c807b93f98a Mon Sep 17 00:00:00 2001 +From 2a39fb40df287b3eca48409df6ae4a9810743066 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 19 Apr 2019 12:41:13 -0500 Subject: [PATCH] Mob Spawner API Enhancements @@ -103,5 +103,5 @@ index 5c4c3c70c..e78e3804b 100644 + // Paper end } -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0369-Per-Player-View-Distance-API-placeholders.patch b/Spigot-Server-Patches/0368-Per-Player-View-Distance-API-placeholders.patch similarity index 97% rename from Spigot-Server-Patches/0369-Per-Player-View-Distance-API-placeholders.patch rename to Spigot-Server-Patches/0368-Per-Player-View-Distance-API-placeholders.patch index 62ad25a4d5..7f15deb870 100644 --- a/Spigot-Server-Patches/0369-Per-Player-View-Distance-API-placeholders.patch +++ b/Spigot-Server-Patches/0368-Per-Player-View-Distance-API-placeholders.patch @@ -1,4 +1,4 @@ -From ab9abef73c19224b23446f5e78afb28e9b44d1d9 Mon Sep 17 00:00:00 2001 +From 629400beb0c8a6bbfe7b1f0e9e6407b92c08b82a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 6 May 2019 01:29:25 -0400 Subject: [PATCH] Per-Player View Distance API placeholders @@ -7,7 +7,7 @@ I hope to look at this more in-depth soon. It appears doable. However this should not block the update. diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index 3df8e30ec..9acdd6e56 100644 +index 6a4ccaeb0..af10fc36e 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -579,9 +579,9 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster { @@ -60,5 +60,5 @@ index 90c251c90..c1acec87f 100644 // Spigot start -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0370-Fix-CB-call-to-changed-postToMainThread-method.patch b/Spigot-Server-Patches/0369-Fix-CB-call-to-changed-postToMainThread-method.patch similarity index 87% rename from Spigot-Server-Patches/0370-Fix-CB-call-to-changed-postToMainThread-method.patch rename to Spigot-Server-Patches/0369-Fix-CB-call-to-changed-postToMainThread-method.patch index 5485ad0458..2dd5879cd7 100644 --- a/Spigot-Server-Patches/0370-Fix-CB-call-to-changed-postToMainThread-method.patch +++ b/Spigot-Server-Patches/0369-Fix-CB-call-to-changed-postToMainThread-method.patch @@ -1,11 +1,11 @@ -From a89d5a0b65ce63ebb8b626a43ced070e0bfabbf4 Mon Sep 17 00:00:00 2001 +From ceb04cb2071470c709f3ee9525f4121779f4e94c Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 10 May 2019 18:38:19 +0100 Subject: [PATCH] Fix CB call to changed postToMainThread method diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 17eeecaf4..8c54022e0 100644 +index eee96c3a1..691331217 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -286,7 +286,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -18,5 +18,5 @@ index 17eeecaf4..8c54022e0 100644 @Override -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0371-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/Spigot-Server-Patches/0370-Fix-sounds-when-item-frames-are-modified-MC-123450.patch similarity index 95% rename from Spigot-Server-Patches/0371-Fix-sounds-when-item-frames-are-modified-MC-123450.patch rename to Spigot-Server-Patches/0370-Fix-sounds-when-item-frames-are-modified-MC-123450.patch index d4084f7541..79cfc9ceae 100644 --- a/Spigot-Server-Patches/0371-Fix-sounds-when-item-frames-are-modified-MC-123450.patch +++ b/Spigot-Server-Patches/0370-Fix-sounds-when-item-frames-are-modified-MC-123450.patch @@ -1,4 +1,4 @@ -From 9cf4ee44771b205c0e35bd098b8136ae35a039ba Mon Sep 17 00:00:00 2001 +From 5ecf4291233bf0154b386b8556376317e54d2438 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Sat, 27 Apr 2019 20:00:43 +0100 Subject: [PATCH] Fix sounds when item frames are modified (MC-123450) @@ -32,5 +32,5 @@ index 799036f26..9ad180d94 100644 this.entity = frame; } -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0372-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/Spigot-Server-Patches/0371-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch similarity index 97% rename from Spigot-Server-Patches/0372-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch rename to Spigot-Server-Patches/0371-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch index 43f6a6fc1a..761a0af0f5 100644 --- a/Spigot-Server-Patches/0372-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch +++ b/Spigot-Server-Patches/0371-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch @@ -1,4 +1,4 @@ -From 001a896bf5120aff4addca206be4b40bd82961a6 Mon Sep 17 00:00:00 2001 +From 34378d6190c8595a247722ed00507d61d1fd57c7 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 13 May 2019 21:10:59 -0700 Subject: [PATCH] Fix CraftServer#isPrimaryThread and MinecraftServer diff --git a/Spigot-Server-Patches/0373-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch b/Spigot-Server-Patches/0372-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch similarity index 94% rename from Spigot-Server-Patches/0373-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch rename to Spigot-Server-Patches/0372-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch index 9febc5ca00..6f93b15513 100644 --- a/Spigot-Server-Patches/0373-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch +++ b/Spigot-Server-Patches/0372-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch @@ -1,4 +1,4 @@ -From dedc72add5794be5eb8848f7fe4c6c525c55f6e6 Mon Sep 17 00:00:00 2001 +From 1c8d867560670f953c242359db4311ae0a1d44e7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 28 Sep 2018 21:49:53 -0400 Subject: [PATCH] Fix issues with entity loss due to unloaded chunks @@ -19,7 +19,7 @@ This change ensures the chunks are always loaded when entities are added to the world, or a valid entity moves between chunks. diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 7492284703..4a648f88ba 100644 +index 8074050b4..fd0edea78 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -703,7 +703,7 @@ public class WorldServer extends World { @@ -41,5 +41,5 @@ index 7492284703..4a648f88ba 100644 if (!(ichunkaccess instanceof Chunk)) { return false; -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0374-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0373-Duplicate-UUID-Resolve-Option.patch similarity index 99% rename from Spigot-Server-Patches/0374-Duplicate-UUID-Resolve-Option.patch rename to Spigot-Server-Patches/0373-Duplicate-UUID-Resolve-Option.patch index 8c178bdc4b..4a5aae5ddd 100644 --- a/Spigot-Server-Patches/0374-Duplicate-UUID-Resolve-Option.patch +++ b/Spigot-Server-Patches/0373-Duplicate-UUID-Resolve-Option.patch @@ -1,4 +1,4 @@ -From 394bdf3467ae70f84b7da56ba2afc51a54732333 Mon Sep 17 00:00:00 2001 +From e2c2ff3e5872c41d91ea8e7e983e6395dec394bf Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 21 Jul 2018 14:27:34 -0400 Subject: [PATCH] Duplicate UUID Resolve Option @@ -93,7 +93,7 @@ index c464d6962..3882e5b2a 100644 int k = MathHelper.floor(entity.locY() / 16.0D); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index c440c2863..5f5a7d479 100644 +index dd17967c6..2b452be4b 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2744,6 +2744,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -105,7 +105,7 @@ index c440c2863..5f5a7d479 100644 this.uniqueID = uuid; this.am = this.uniqueID.toString(); diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 64335c288..f20bc3a96 100644 +index fea28eec7..40f0b2dea 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -1,6 +1,7 @@ diff --git a/Spigot-Server-Patches/0375-improve-CraftWorld-isChunkLoaded.patch b/Spigot-Server-Patches/0374-improve-CraftWorld-isChunkLoaded.patch similarity index 96% rename from Spigot-Server-Patches/0375-improve-CraftWorld-isChunkLoaded.patch rename to Spigot-Server-Patches/0374-improve-CraftWorld-isChunkLoaded.patch index b28b36a889..f43b83bf37 100644 --- a/Spigot-Server-Patches/0375-improve-CraftWorld-isChunkLoaded.patch +++ b/Spigot-Server-Patches/0374-improve-CraftWorld-isChunkLoaded.patch @@ -1,4 +1,4 @@ -From 4ace85f30e1af1167db76e5f203eaecc17b49350 Mon Sep 17 00:00:00 2001 +From 7d71e042926c9e3cfce531033ac04ca0c93221d8 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 21 May 2019 02:34:04 +0100 Subject: [PATCH] improve CraftWorld#isChunkLoaded diff --git a/Spigot-Server-Patches/0376-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0375-Configurable-Keep-Spawn-Loaded-range-per-world.patch similarity index 99% rename from Spigot-Server-Patches/0376-Configurable-Keep-Spawn-Loaded-range-per-world.patch rename to Spigot-Server-Patches/0375-Configurable-Keep-Spawn-Loaded-range-per-world.patch index 4a97ab27f4..e714377261 100644 --- a/Spigot-Server-Patches/0376-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/Spigot-Server-Patches/0375-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -1,4 +1,4 @@ -From ca95036219225fc356b6b5b0c090fb71e6c29745 Mon Sep 17 00:00:00 2001 +From a073adb750b62b4c5dd24b8c3fa6dae6935011c7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 13 Sep 2014 23:14:43 -0400 Subject: [PATCH] Configurable Keep Spawn Loaded range per world diff --git a/Spigot-Server-Patches/0377-Fix-some-generation-concurrency-issues.patch b/Spigot-Server-Patches/0376-Fix-some-generation-concurrency-issues.patch similarity index 98% rename from Spigot-Server-Patches/0377-Fix-some-generation-concurrency-issues.patch rename to Spigot-Server-Patches/0376-Fix-some-generation-concurrency-issues.patch index e036a06355..094bdec8ee 100644 --- a/Spigot-Server-Patches/0377-Fix-some-generation-concurrency-issues.patch +++ b/Spigot-Server-Patches/0376-Fix-some-generation-concurrency-issues.patch @@ -1,11 +1,11 @@ -From c560f95e0058d4975a17edee255e9c62f0442d9c Mon Sep 17 00:00:00 2001 +From 98a69f55fab4a1cc510e075671230c441b96d352 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 24 May 2019 07:53:16 +0100 Subject: [PATCH] Fix some generation concurrency issues diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 61faf87179..c089080a90 100644 +index 406e5c60a..e2cac4a92 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -84,6 +84,23 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -33,7 +33,7 @@ index 61faf87179..c089080a90 100644 public CraftWorld getWorld() { return this.world; diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java b/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java -index 22e14fe1e9..e2af6d43b2 100644 +index 22e14fe1e..e2af6d43b 100644 --- a/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java +++ b/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java @@ -23,18 +23,18 @@ public class WorldGenFeatureStateProviderWeighted extends WorldGenFeatureStatePr @@ -59,7 +59,7 @@ index 22e14fe1e9..e2af6d43b2 100644 builder.put(dynamicops.createString("type"), dynamicops.createString(IRegistry.t.getKey(this.a).toString())).put(dynamicops.createString("entries"), this.b.a(dynamicops, (iblockdata) -> { diff --git a/src/main/java/net/minecraft/server/WorldGenStronghold.java b/src/main/java/net/minecraft/server/WorldGenStronghold.java -index fc4348b602..44be7169ff 100644 +index fc4348b60..44be7169f 100644 --- a/src/main/java/net/minecraft/server/WorldGenStronghold.java +++ b/src/main/java/net/minecraft/server/WorldGenStronghold.java @@ -10,10 +10,12 @@ import javax.annotation.Nullable; diff --git a/Spigot-Server-Patches/0378-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch b/Spigot-Server-Patches/0377-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch similarity index 91% rename from Spigot-Server-Patches/0378-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch rename to Spigot-Server-Patches/0377-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch index 1fc15ef8ff..5a640b3789 100644 --- a/Spigot-Server-Patches/0378-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch +++ b/Spigot-Server-Patches/0377-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch @@ -1,4 +1,4 @@ -From 24a3c231cb896032bb5737b5d55634c658a06922 Mon Sep 17 00:00:00 2001 +From 17f07d64dcd6a1a1c9e2d6ead49e0f3b8108cdf0 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 27 May 2019 17:35:39 -0500 Subject: [PATCH] MC-114618 - Fix EntityAreaEffectCloud from going negative @@ -23,5 +23,5 @@ index e8f3e55fd..44289c230 100644 if (this.world.isClientSide) { ParticleParam particleparam = this.getParticle(); -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0379-ChunkMapDistance-CME.patch b/Spigot-Server-Patches/0378-ChunkMapDistance-CME.patch similarity index 95% rename from Spigot-Server-Patches/0379-ChunkMapDistance-CME.patch rename to Spigot-Server-Patches/0378-ChunkMapDistance-CME.patch index 9be70b7bee..2d47534de1 100644 --- a/Spigot-Server-Patches/0379-ChunkMapDistance-CME.patch +++ b/Spigot-Server-Patches/0378-ChunkMapDistance-CME.patch @@ -1,11 +1,11 @@ -From 5619ab021614a4d2a9dcbe56aab720deb415a077 Mon Sep 17 00:00:00 2001 +From 5cc2fb0379d37e87e370fdb424ea2c015d10b950 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Wed, 29 May 2019 04:01:22 +0100 Subject: [PATCH] ChunkMapDistance CME diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java -index a35f0e18b..8c1945687 100644 +index 8b3b1f9bd..73d157076 100644 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java @@ -33,7 +33,7 @@ public abstract class ChunkMapDistance { @@ -50,5 +50,5 @@ index a35f0e18b..8c1945687 100644 } else { if (!this.l.isEmpty()) { -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0380-Implement-CraftBlockSoundGroup.patch b/Spigot-Server-Patches/0379-Implement-CraftBlockSoundGroup.patch similarity index 98% rename from Spigot-Server-Patches/0380-Implement-CraftBlockSoundGroup.patch rename to Spigot-Server-Patches/0379-Implement-CraftBlockSoundGroup.patch index bd3820262b..6090f42d31 100644 --- a/Spigot-Server-Patches/0380-Implement-CraftBlockSoundGroup.patch +++ b/Spigot-Server-Patches/0379-Implement-CraftBlockSoundGroup.patch @@ -1,4 +1,4 @@ -From 24cc5791d8a1cf9cccb522bafff707e5a05742cc Mon Sep 17 00:00:00 2001 +From 820dbc426e560d638f18e038b39450974f07032f Mon Sep 17 00:00:00 2001 From: simpleauthority Date: Tue, 28 May 2019 03:48:51 -0700 Subject: [PATCH] Implement CraftBlockSoundGroup @@ -112,5 +112,5 @@ index fa840c3d3..a667e58ed 100644 + // Paper end } -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0381-Chunk-debug-command.patch b/Spigot-Server-Patches/0380-Chunk-debug-command.patch similarity index 98% rename from Spigot-Server-Patches/0381-Chunk-debug-command.patch rename to Spigot-Server-Patches/0380-Chunk-debug-command.patch index d777faa77a..d7a7620529 100644 --- a/Spigot-Server-Patches/0381-Chunk-debug-command.patch +++ b/Spigot-Server-Patches/0380-Chunk-debug-command.patch @@ -1,4 +1,4 @@ -From b9b9ced96a391744942042339a109ed7e6e9dde4 Mon Sep 17 00:00:00 2001 +From a3f2d76302dac538f98757f335ff10fb07ec1fc2 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 1 Jun 2019 13:00:55 -0700 Subject: [PATCH] Chunk debug command @@ -32,7 +32,7 @@ https://bugs.mojang.com/browse/MC-141484?focusedCommentId=528273&page=com.atlass https://bugs.mojang.com/browse/MC-141484?focusedCommentId=528577&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-528577 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index d704fc79c0..09efbf7250 100644 +index d704fc79c..09efbf725 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -28,14 +28,14 @@ public class PaperCommand extends Command { @@ -185,7 +185,7 @@ index d704fc79c0..09efbf7250 100644 * Ported from MinecraftForge - author: LexManos - License: LGPLv2.1 */ diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 3ef7e4561f..35153af515 100644 +index 242ff923a..bedf47b78 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -22,7 +22,7 @@ import org.apache.logging.log4j.Logger; @@ -198,7 +198,7 @@ index 3ef7e4561f..35153af515 100644 public final ChunkGenerator chunkGenerator; private final WorldServer world; diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java -index 3a482466ec..b6aeca05f7 100644 +index 3a482466e..b6aeca05f 100644 --- a/src/main/java/net/minecraft/server/MCUtil.java +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -4,7 +4,13 @@ import com.destroystokyo.paper.block.TargetBlockInfo; @@ -399,7 +399,7 @@ index 3a482466ec..b6aeca05f7 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 3093154bb7..3a0f0314b2 100644 +index 3093154bb..3a0f0314b 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -26,7 +26,7 @@ public class PlayerChunk { @@ -412,7 +412,7 @@ index 3093154bb7..3a0f0314b2 100644 private int dirtyCount; private int r; diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index b3fa3bd874..803fda511f 100644 +index 40f0b2dea..999f0bb43 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -58,7 +58,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -434,7 +434,7 @@ index b3fa3bd874..803fda511f 100644 private final DefinedStructureManager definedStructureManager; private final File w; diff --git a/src/main/java/net/minecraft/server/Ticket.java b/src/main/java/net/minecraft/server/Ticket.java -index 77bb6b092a..7a8397815a 100644 +index 77bb6b092..7a8397815 100644 --- a/src/main/java/net/minecraft/server/Ticket.java +++ b/src/main/java/net/minecraft/server/Ticket.java @@ -6,8 +6,8 @@ public final class Ticket implements Comparable> { @@ -457,5 +457,5 @@ index 77bb6b092a..7a8397815a 100644 return this.b; } -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0382-incremental-chunk-saving.patch b/Spigot-Server-Patches/0381-incremental-chunk-saving.patch similarity index 98% rename from Spigot-Server-Patches/0382-incremental-chunk-saving.patch rename to Spigot-Server-Patches/0381-incremental-chunk-saving.patch index a315295e80..c700109c10 100644 --- a/Spigot-Server-Patches/0382-incremental-chunk-saving.patch +++ b/Spigot-Server-Patches/0381-incremental-chunk-saving.patch @@ -1,4 +1,4 @@ -From 2184f971f556507ea8be9b037a40072e656de3e2 Mon Sep 17 00:00:00 2001 +From c77a745952015ee72adcb90b58458b05cdfaaf8f Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 9 Jun 2019 03:53:22 +0100 Subject: [PATCH] incremental chunk saving @@ -29,7 +29,7 @@ index 071e5e7f7..486761521 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index d9c53cdc4..76e87c211 100644 +index 3882e5b2a..4d300699f 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -42,7 +42,7 @@ public class Chunk implements IChunkAccess { @@ -42,7 +42,7 @@ index d9c53cdc4..76e87c211 100644 private long inhabitedTime; @Nullable diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index da0f3ada2..13a08bbfb 100644 +index bedf47b78..7bbcc8cd7 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -434,6 +434,15 @@ public class ChunkProviderServer extends IChunkProvider { @@ -175,7 +175,7 @@ index 3a0f0314b..c91312fac 100644 public void a(ProtoChunkExtension protochunkextension) { for (int i = 0; i < this.statusFutures.length(); ++i) { diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 803fda511..40d80f381 100644 +index 999f0bb43..a46d4661d 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -331,6 +331,64 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -261,7 +261,7 @@ index 803fda511..40d80f381 100644 return PlayerChunk.getChunkState(playerchunk.getTicketLevel()); }); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 32da4eb4e..fae30a1c1 100644 +index 5f9930447..729cf3ee5 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -810,11 +810,44 @@ public class WorldServer extends World { @@ -319,5 +319,5 @@ index 32da4eb4e..fae30a1c1 100644 this.checkSession(); this.worldProvider.i(); -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0383-Catch-exceptions-from-dispenser-entity-spawns.patch b/Spigot-Server-Patches/0382-Catch-exceptions-from-dispenser-entity-spawns.patch similarity index 91% rename from Spigot-Server-Patches/0383-Catch-exceptions-from-dispenser-entity-spawns.patch rename to Spigot-Server-Patches/0382-Catch-exceptions-from-dispenser-entity-spawns.patch index 429adf998d..aa620e3a4e 100644 --- a/Spigot-Server-Patches/0383-Catch-exceptions-from-dispenser-entity-spawns.patch +++ b/Spigot-Server-Patches/0382-Catch-exceptions-from-dispenser-entity-spawns.patch @@ -1,11 +1,11 @@ -From ae6210b47e9eacc744d03428dd7e120275374fa4 Mon Sep 17 00:00:00 2001 +From f19a208c8222167e58786c61fe6ff52c0b0834e9 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 10 Jun 2019 09:36:40 +0100 Subject: [PATCH] Catch exceptions from dispenser entity spawns diff --git a/src/main/java/net/minecraft/server/IDispenseBehavior.java b/src/main/java/net/minecraft/server/IDispenseBehavior.java -index abc0cd346..9a8be1474 100644 +index 5a8c4dc6b..b6b7e3c6c 100644 --- a/src/main/java/net/minecraft/server/IDispenseBehavior.java +++ b/src/main/java/net/minecraft/server/IDispenseBehavior.java @@ -163,7 +163,14 @@ public interface IDispenseBehavior { @@ -24,5 +24,5 @@ index abc0cd346..9a8be1474 100644 // CraftBukkit end return itemstack; -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0384-Fix-World-isChunkGenerated-calls.patch b/Spigot-Server-Patches/0383-Fix-World-isChunkGenerated-calls.patch similarity index 99% rename from Spigot-Server-Patches/0384-Fix-World-isChunkGenerated-calls.patch rename to Spigot-Server-Patches/0383-Fix-World-isChunkGenerated-calls.patch index 61c8189d12..8a40131a93 100644 --- a/Spigot-Server-Patches/0384-Fix-World-isChunkGenerated-calls.patch +++ b/Spigot-Server-Patches/0383-Fix-World-isChunkGenerated-calls.patch @@ -1,4 +1,4 @@ -From f3e3ec09e2c0a8d1405e754d9fe3c1605b825a5d Mon Sep 17 00:00:00 2001 +From 961d2303028863f5744c70ac65b60b785de4031a Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 15 Jun 2019 08:54:33 -0700 Subject: [PATCH] Fix World#isChunkGenerated calls @@ -132,7 +132,7 @@ index c91312fac..5108d3ee9 100644 public CompletableFuture> getStatusFutureUnchecked(ChunkStatus chunkstatus) { diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 7a4778ed6..0964b73d8 100644 +index a46d4661d..3dcd23a42 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -967,12 +967,62 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { diff --git a/Spigot-Server-Patches/0385-Show-blockstate-location-if-we-failed-to-read-it.patch b/Spigot-Server-Patches/0384-Show-blockstate-location-if-we-failed-to-read-it.patch similarity index 94% rename from Spigot-Server-Patches/0385-Show-blockstate-location-if-we-failed-to-read-it.patch rename to Spigot-Server-Patches/0384-Show-blockstate-location-if-we-failed-to-read-it.patch index fe376292db..55249d2d18 100644 --- a/Spigot-Server-Patches/0385-Show-blockstate-location-if-we-failed-to-read-it.patch +++ b/Spigot-Server-Patches/0384-Show-blockstate-location-if-we-failed-to-read-it.patch @@ -1,4 +1,4 @@ -From 417b437ce455ba2657ebad4cd5287dcc0454fe7d Mon Sep 17 00:00:00 2001 +From ba1488ff26537c6c00dbb33feb07f158a705767f Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 15 Jun 2019 10:28:25 -0700 Subject: [PATCH] Show blockstate location if we failed to read it @@ -33,5 +33,5 @@ index f6401e2cd..3e22d558e 100644 public final boolean snapshotDisabled; // Paper -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0386-Log-other-thread-in-DataPaletteBlock-lock-failure.patch b/Spigot-Server-Patches/0385-Log-other-thread-in-DataPaletteBlock-lock-failure.patch similarity index 97% rename from Spigot-Server-Patches/0386-Log-other-thread-in-DataPaletteBlock-lock-failure.patch rename to Spigot-Server-Patches/0385-Log-other-thread-in-DataPaletteBlock-lock-failure.patch index 6666c876a8..a99478fc65 100644 --- a/Spigot-Server-Patches/0386-Log-other-thread-in-DataPaletteBlock-lock-failure.patch +++ b/Spigot-Server-Patches/0385-Log-other-thread-in-DataPaletteBlock-lock-failure.patch @@ -1,4 +1,4 @@ -From b57e278904ca310c9f763a59594ff19182445a43 Mon Sep 17 00:00:00 2001 +From 880da4579d9171604282c9f58353e09bd3890d2f Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 21 Jun 2019 14:42:48 -0700 Subject: [PATCH] Log other thread in DataPaletteBlock lock failure @@ -47,5 +47,5 @@ index d5f5a5187..2c1d1b1a5 100644 crashreportsystemdetails.a("Thread dumps", (Object) s); -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0387-Use-ChunkStatus-cache-when-saving-protochunks.patch b/Spigot-Server-Patches/0386-Use-ChunkStatus-cache-when-saving-protochunks.patch similarity index 91% rename from Spigot-Server-Patches/0387-Use-ChunkStatus-cache-when-saving-protochunks.patch rename to Spigot-Server-Patches/0386-Use-ChunkStatus-cache-when-saving-protochunks.patch index 9a54c0ca1d..326abf1eb9 100644 --- a/Spigot-Server-Patches/0387-Use-ChunkStatus-cache-when-saving-protochunks.patch +++ b/Spigot-Server-Patches/0386-Use-ChunkStatus-cache-when-saving-protochunks.patch @@ -1,4 +1,4 @@ -From e602e81e6efe942af77eebd833748d97b5ad9e9b Mon Sep 17 00:00:00 2001 +From cac8f47c478cbce14fadad072caee2187a27d8e8 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 22 Jun 2019 04:20:47 -0700 Subject: [PATCH] Use ChunkStatus cache when saving protochunks @@ -7,7 +7,7 @@ The cache should contain the chunk status when saving. If not it will load it. diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 6c4804232a..8bd212388a 100644 +index 3dcd23a42..41a7b160c 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -843,8 +843,10 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -24,5 +24,5 @@ index 6c4804232a..8bd212388a 100644 } -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0388-Anti-Xray.patch b/Spigot-Server-Patches/0387-Anti-Xray.patch similarity index 99% rename from Spigot-Server-Patches/0388-Anti-Xray.patch rename to Spigot-Server-Patches/0387-Anti-Xray.patch index 2f346ac570..2077d9a1cd 100644 --- a/Spigot-Server-Patches/0388-Anti-Xray.patch +++ b/Spigot-Server-Patches/0387-Anti-Xray.patch @@ -1,4 +1,4 @@ -From 7f0e5f37b7a7fea802a0a1cf1a8247fad77440f0 Mon Sep 17 00:00:00 2001 +From 3be0f944a032e3df23b4fa0a960d3f8a8059ae27 Mon Sep 17 00:00:00 2001 From: stonar96 Date: Mon, 20 Aug 2018 03:03:58 +0200 Subject: [PATCH] Anti-Xray @@ -1558,7 +1558,7 @@ index 5108d3ee9..b556a8fef 100644 this.a(new PacketPlayOutMultiBlockChange(this.dirtyCount, this.dirtyBlocks, chunk), false); diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 14dd813ed..e3c3c1d58 100644 +index 41a7b160c..8525c3ab9 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -603,7 +603,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { diff --git a/Spigot-Server-Patches/0389-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/Spigot-Server-Patches/0388-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch similarity index 95% rename from Spigot-Server-Patches/0389-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch rename to Spigot-Server-Patches/0388-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch index 942d4e9baa..f1f135c74f 100644 --- a/Spigot-Server-Patches/0389-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch +++ b/Spigot-Server-Patches/0388-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch @@ -1,4 +1,4 @@ -From 5f766aa9deba621216afafea763e60fdb78d3335 Mon Sep 17 00:00:00 2001 +From 2786926bdd0e906d2bfc1e6b56748a656fcc62fc Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 01:01:32 -0400 Subject: [PATCH] Only count Natural Spawned mobs towards natural spawn mob @@ -38,7 +38,7 @@ index df24e3297..4c5010936 100644 public boolean asynchronous; public EngineMode engineMode; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 7bf0b8708..53172dac2 100644 +index 729cf3ee5..bc789fc29 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -953,6 +953,13 @@ public class WorldServer extends World { @@ -56,5 +56,5 @@ index 7bf0b8708..53172dac2 100644 } } -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0390-Configurable-projectile-relative-velocity.patch b/Spigot-Server-Patches/0389-Configurable-projectile-relative-velocity.patch similarity index 98% rename from Spigot-Server-Patches/0390-Configurable-projectile-relative-velocity.patch rename to Spigot-Server-Patches/0389-Configurable-projectile-relative-velocity.patch index 7a4b157e45..3b8ae71d31 100644 --- a/Spigot-Server-Patches/0390-Configurable-projectile-relative-velocity.patch +++ b/Spigot-Server-Patches/0389-Configurable-projectile-relative-velocity.patch @@ -1,4 +1,4 @@ -From c7187f4c439228b7437e24042f4d1841f6b02a8f Mon Sep 17 00:00:00 2001 +From c4209470f28071c68b64d5bf4cc030ff1a28256c Mon Sep 17 00:00:00 2001 From: Lucavon Date: Tue, 23 Jul 2019 20:29:20 -0500 Subject: [PATCH] Configurable projectile relative velocity @@ -65,5 +65,5 @@ index 6c091b680..f5c8074dc 100644 @Override -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0391-Mark-entities-as-being-ticked-when-notifying-navigat.patch b/Spigot-Server-Patches/0390-Mark-entities-as-being-ticked-when-notifying-navigat.patch similarity index 89% rename from Spigot-Server-Patches/0391-Mark-entities-as-being-ticked-when-notifying-navigat.patch rename to Spigot-Server-Patches/0390-Mark-entities-as-being-ticked-when-notifying-navigat.patch index ab0ba895d5..fa881afd24 100644 --- a/Spigot-Server-Patches/0391-Mark-entities-as-being-ticked-when-notifying-navigat.patch +++ b/Spigot-Server-Patches/0390-Mark-entities-as-being-ticked-when-notifying-navigat.patch @@ -1,11 +1,11 @@ -From 90d7d42ae7fae9a7933c728771736312bd08504c Mon Sep 17 00:00:00 2001 +From f92c51087d3f8bf9ea9eeabe608b459a4e18e3a6 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 28 Jul 2019 00:51:11 +0100 Subject: [PATCH] Mark entities as being ticked when notifying navigation diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index e9d3424103..0f652e58e1 100644 +index bc789fc29..27dcc2528 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1392,6 +1392,7 @@ public class WorldServer extends World { @@ -25,5 +25,5 @@ index e9d3424103..0f652e58e1 100644 } -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0392-offset-item-frame-ticking.patch b/Spigot-Server-Patches/0391-offset-item-frame-ticking.patch similarity index 90% rename from Spigot-Server-Patches/0392-offset-item-frame-ticking.patch rename to Spigot-Server-Patches/0391-offset-item-frame-ticking.patch index 7f9477f324..d6e148fae8 100644 --- a/Spigot-Server-Patches/0392-offset-item-frame-ticking.patch +++ b/Spigot-Server-Patches/0391-offset-item-frame-ticking.patch @@ -1,4 +1,4 @@ -From 2b0ecef5ce123353ef0bf4dbe36f08ab7c7071af Mon Sep 17 00:00:00 2001 +From fe224276b57344fd8e42986d10e76aaed780c055 Mon Sep 17 00:00:00 2001 From: kickash32 Date: Tue, 30 Jul 2019 03:17:16 +0500 Subject: [PATCH] offset item frame ticking @@ -18,5 +18,5 @@ index 21dbc9b2a..ef9c4717c 100644 protected EnumDirection direction; -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0393-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0392-Avoid-hopper-searches-if-there-are-no-items.patch similarity index 98% rename from Spigot-Server-Patches/0393-Avoid-hopper-searches-if-there-are-no-items.patch rename to Spigot-Server-Patches/0392-Avoid-hopper-searches-if-there-are-no-items.patch index 6cab89c64e..31d1f75cdd 100644 --- a/Spigot-Server-Patches/0393-Avoid-hopper-searches-if-there-are-no-items.patch +++ b/Spigot-Server-Patches/0392-Avoid-hopper-searches-if-there-are-no-items.patch @@ -1,4 +1,4 @@ -From 141837bed113227f781b7f984d04d9baf8e1587e Mon Sep 17 00:00:00 2001 +From 037d9e8939727c321737ade23ecb4f892eec3a80 Mon Sep 17 00:00:00 2001 From: CullanP Date: Thu, 3 Mar 2016 02:13:38 -0600 Subject: [PATCH] Avoid hopper searches if there are no items diff --git a/Spigot-Server-Patches/0394-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0393-Asynchronous-chunk-IO-and-loading.patch similarity index 99% rename from Spigot-Server-Patches/0394-Asynchronous-chunk-IO-and-loading.patch rename to Spigot-Server-Patches/0393-Asynchronous-chunk-IO-and-loading.patch index f8dd72e207..04f6b8681b 100644 --- a/Spigot-Server-Patches/0394-Asynchronous-chunk-IO-and-loading.patch +++ b/Spigot-Server-Patches/0393-Asynchronous-chunk-IO-and-loading.patch @@ -1,4 +1,4 @@ -From 35d80611a44aaf1afc693eb1aedab1c1a50e5ef2 Mon Sep 17 00:00:00 2001 +From 8b70c99a921260236a4ae3fa896eb675f9c6d266 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 13 Jul 2019 09:23:10 -0700 Subject: [PATCH] Asynchronous chunk IO and loading @@ -3055,7 +3055,7 @@ index b556a8fef..b82ea26eb 100644 completablefuture = (CompletableFuture) this.statusFutures.get(i); if (completablefuture != null) { diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index e3c3c1d58..bce04cad0 100644 +index 8525c3ab9..85b21012e 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -63,7 +63,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { diff --git a/Spigot-Server-Patches/0395-Use-getChunkIfLoadedImmediately-in-places.patch b/Spigot-Server-Patches/0394-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 97% rename from Spigot-Server-Patches/0395-Use-getChunkIfLoadedImmediately-in-places.patch rename to Spigot-Server-Patches/0394-Use-getChunkIfLoadedImmediately-in-places.patch index 98999456da..b529671dae 100644 --- a/Spigot-Server-Patches/0395-Use-getChunkIfLoadedImmediately-in-places.patch +++ b/Spigot-Server-Patches/0394-Use-getChunkIfLoadedImmediately-in-places.patch @@ -1,4 +1,4 @@ -From a39d46b1f933c5cf6a96525be0f31f1714b5205f Mon Sep 17 00:00:00 2001 +From 3380218b97568ba835506047722e9907b3b8db69 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 8 Jul 2019 00:13:36 -0700 Subject: [PATCH] Use getChunkIfLoadedImmediately in places @@ -8,7 +8,7 @@ ticket level 33 (yes getChunkIfLoaded will actually perform a chunk load in that case). diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index a92f251ca..2917e1bd4 100644 +index 2b452be4b..6b5e92de0 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -204,7 +204,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -21,7 +21,7 @@ index a92f251ca..2917e1bd4 100644 // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 8c54022e0..f6fbba36f 100644 +index 691331217..f88bcb29d 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -989,7 +989,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0396-Reduce-sync-loads.patch b/Spigot-Server-Patches/0395-Reduce-sync-loads.patch similarity index 99% rename from Spigot-Server-Patches/0396-Reduce-sync-loads.patch rename to Spigot-Server-Patches/0395-Reduce-sync-loads.patch index da5d5fa174..b77e148d8f 100644 --- a/Spigot-Server-Patches/0396-Reduce-sync-loads.patch +++ b/Spigot-Server-Patches/0395-Reduce-sync-loads.patch @@ -1,4 +1,4 @@ -From 95d51be5952ba6c58778cc000dcfecdf2762d7e8 Mon Sep 17 00:00:00 2001 +From 04e43cd09d89b9b8a2a1edb3ecf9b442a446b6e2 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 19 Jul 2019 03:29:14 -0700 Subject: [PATCH] Reduce sync loads @@ -268,7 +268,7 @@ index 000000000..59aec1032 + } +} diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index c6ece425d..5b6b55cc0 100644 +index 2c1937cbe..81d386b4c 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -378,6 +378,7 @@ public class ChunkProviderServer extends IChunkProvider { @@ -311,7 +311,7 @@ index bfbbfb1ba..a2f7c032d 100644 if (chunk != null) { chunk.a(oclass, axisalignedbb, list, predicate); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 5eb52817f..6d362316f 100644 +index 6506daeec..26d1303dd 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -154,6 +154,12 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/0397-Implement-alternative-item-despawn-rate.patch b/Spigot-Server-Patches/0396-Implement-alternative-item-despawn-rate.patch similarity index 98% rename from Spigot-Server-Patches/0397-Implement-alternative-item-despawn-rate.patch rename to Spigot-Server-Patches/0396-Implement-alternative-item-despawn-rate.patch index 1f92ad640c..694676a578 100644 --- a/Spigot-Server-Patches/0397-Implement-alternative-item-despawn-rate.patch +++ b/Spigot-Server-Patches/0396-Implement-alternative-item-despawn-rate.patch @@ -1,4 +1,4 @@ -From 57355251558e0c93d1013da0a4daf31c0749dbdc Mon Sep 17 00:00:00 2001 +From fc4be0daa199c8716a12c431312350cd316a1445 Mon Sep 17 00:00:00 2001 From: kickash32 Date: Mon, 3 Jun 2019 02:02:39 -0400 Subject: [PATCH] Implement alternative item-despawn-rate @@ -80,7 +80,7 @@ index a09282e00..9d9260ad0 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index a0d1e7fd2..e61af3f5e 100644 +index ef2cf6565..507627a29 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -6,6 +6,7 @@ import java.util.Objects; diff --git a/Spigot-Server-Patches/0398-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/Spigot-Server-Patches/0397-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch similarity index 96% rename from Spigot-Server-Patches/0398-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch rename to Spigot-Server-Patches/0397-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch index f622ba1a09..887ccd8647 100644 --- a/Spigot-Server-Patches/0398-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch +++ b/Spigot-Server-Patches/0397-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch @@ -1,4 +1,4 @@ -From ccc77a6fcce7424b8fe23ec255b5f9f2a3f472de Mon Sep 17 00:00:00 2001 +From 76940738c04aaddb4f5f34d72fef56bdfbecfe48 Mon Sep 17 00:00:00 2001 From: Paul Sauve Date: Sun, 14 Jul 2019 21:05:03 -0500 Subject: [PATCH] Do less work if we have a custom Bukkit generator @@ -7,7 +7,7 @@ If the Bukkit generator already has a spawn, use it immediately instead of spending time generating one that we won't use diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 6d362316f..9055df2ca 100644 +index 26d1303dd..edffae055 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -807,12 +807,13 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/0399-Fix-MC-158900.patch b/Spigot-Server-Patches/0398-Fix-MC-158900.patch similarity index 95% rename from Spigot-Server-Patches/0399-Fix-MC-158900.patch rename to Spigot-Server-Patches/0398-Fix-MC-158900.patch index 303452a9c2..122f889e84 100644 --- a/Spigot-Server-Patches/0399-Fix-MC-158900.patch +++ b/Spigot-Server-Patches/0398-Fix-MC-158900.patch @@ -1,4 +1,4 @@ -From 01c349f67f42dfe0eae6e4df65fbfd8ecdd68240 Mon Sep 17 00:00:00 2001 +From 65130b9f04b275e5bb76f5ef26d24a78fa7a0655 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 13 Aug 2019 06:35:17 -0700 Subject: [PATCH] Fix MC-158900 diff --git a/Spigot-Server-Patches/0400-implement-optional-per-player-mob-spawns.patch b/Spigot-Server-Patches/0399-implement-optional-per-player-mob-spawns.patch similarity index 99% rename from Spigot-Server-Patches/0400-implement-optional-per-player-mob-spawns.patch rename to Spigot-Server-Patches/0399-implement-optional-per-player-mob-spawns.patch index 440ba3eb74..292ebdf0bb 100644 --- a/Spigot-Server-Patches/0400-implement-optional-per-player-mob-spawns.patch +++ b/Spigot-Server-Patches/0399-implement-optional-per-player-mob-spawns.patch @@ -1,4 +1,4 @@ -From b1cf779b03f6b30e934f3c01b5b304cdde97c96e Mon Sep 17 00:00:00 2001 +From 9a3e15afdf492a8f854a0f8947cdc283f7a3f45b Mon Sep 17 00:00:00 2001 From: kickash32 Date: Mon, 19 Aug 2019 01:27:58 +0500 Subject: [PATCH] implement optional per player mob spawns @@ -545,7 +545,7 @@ index 000000000..4f13d3ff8 + } +} diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 5b6b55cc0..7edbd0aac 100644 +index 81d386b4c..e5af40e9f 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -654,7 +654,22 @@ public class ChunkProviderServer extends IChunkProvider { @@ -643,7 +643,7 @@ index 79f854966..4100e367a 100644 return this.bb; } diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 9fa6d2b52..36657465f 100644 +index 85b21012e..46d205380 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -78,7 +78,8 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -755,7 +755,7 @@ index fdac5bb3a..58bbf2f9d 100644 @Nullable diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 9055df2ca..5ec0acc30 100644 +index edffae055..88cc8763f 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1024,7 +1024,20 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/0401-Prevent-consuming-the-wrong-itemstack.patch b/Spigot-Server-Patches/0400-Prevent-consuming-the-wrong-itemstack.patch similarity index 97% rename from Spigot-Server-Patches/0401-Prevent-consuming-the-wrong-itemstack.patch rename to Spigot-Server-Patches/0400-Prevent-consuming-the-wrong-itemstack.patch index b44734cd9e..a7c214c306 100644 --- a/Spigot-Server-Patches/0401-Prevent-consuming-the-wrong-itemstack.patch +++ b/Spigot-Server-Patches/0400-Prevent-consuming-the-wrong-itemstack.patch @@ -1,4 +1,4 @@ -From 3d2cfefe958cd9c58530a13d0fb3b1268b34fe72 Mon Sep 17 00:00:00 2001 +From 431512c2f38c3069b6e0bae7c5dbf76fd5709e31 Mon Sep 17 00:00:00 2001 From: kickash32 Date: Mon, 19 Aug 2019 19:42:35 +0500 Subject: [PATCH] Prevent consuming the wrong itemstack diff --git a/Spigot-Server-Patches/0402-only-add-passanger-entities-once-from-spawners.patch b/Spigot-Server-Patches/0401-only-add-passanger-entities-once-from-spawners.patch similarity index 93% rename from Spigot-Server-Patches/0402-only-add-passanger-entities-once-from-spawners.patch rename to Spigot-Server-Patches/0401-only-add-passanger-entities-once-from-spawners.patch index b7b72d1fdb..14b015b25f 100644 --- a/Spigot-Server-Patches/0402-only-add-passanger-entities-once-from-spawners.patch +++ b/Spigot-Server-Patches/0401-only-add-passanger-entities-once-from-spawners.patch @@ -1,4 +1,4 @@ -From d5cd7b4f8513250a13290b1367076c4cd71dfbcf Mon Sep 17 00:00:00 2001 +From d9e9829a94fd251395c72ef690300c4eb12aea2b Mon Sep 17 00:00:00 2001 From: kickash32 Date: Wed, 21 Aug 2019 23:57:32 +0500 Subject: [PATCH] only add passanger entities once from spawners diff --git a/Spigot-Server-Patches/0403-Fix-nether-portal-creation.patch b/Spigot-Server-Patches/0402-Fix-nether-portal-creation.patch similarity index 94% rename from Spigot-Server-Patches/0403-Fix-nether-portal-creation.patch rename to Spigot-Server-Patches/0402-Fix-nether-portal-creation.patch index 53f271c3bd..9d5b93db18 100644 --- a/Spigot-Server-Patches/0403-Fix-nether-portal-creation.patch +++ b/Spigot-Server-Patches/0402-Fix-nether-portal-creation.patch @@ -1,4 +1,4 @@ -From 93d110715eed5843d746a1412dc9033216cf172f Mon Sep 17 00:00:00 2001 +From c6369a11b64b98fcc5e817c9fc8d134e6030ce6f Mon Sep 17 00:00:00 2001 From: Michael Himing Date: Mon, 9 Sep 2019 13:21:17 +1000 Subject: [PATCH] Fix nether portal creation diff --git a/Spigot-Server-Patches/0404-Generator-Settings.patch b/Spigot-Server-Patches/0403-Generator-Settings.patch similarity index 97% rename from Spigot-Server-Patches/0404-Generator-Settings.patch rename to Spigot-Server-Patches/0403-Generator-Settings.patch index 6e8a632a66..162409bd8c 100644 --- a/Spigot-Server-Patches/0404-Generator-Settings.patch +++ b/Spigot-Server-Patches/0403-Generator-Settings.patch @@ -1,4 +1,4 @@ -From 8512e2be1a6eddf20366466249c26b6505199dff Mon Sep 17 00:00:00 2001 +From f46c369395e917501cfe23302b200ed5bf2559ce Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 02:17:54 -0600 Subject: [PATCH] Generator Settings diff --git a/Spigot-Server-Patches/0405-Fix-zero-tick-instant-grow-farms-MC-113809.patch b/Spigot-Server-Patches/0404-Fix-zero-tick-instant-grow-farms-MC-113809.patch similarity index 98% rename from Spigot-Server-Patches/0405-Fix-zero-tick-instant-grow-farms-MC-113809.patch rename to Spigot-Server-Patches/0404-Fix-zero-tick-instant-grow-farms-MC-113809.patch index 8f452da11d..9cb5f27cec 100644 --- a/Spigot-Server-Patches/0405-Fix-zero-tick-instant-grow-farms-MC-113809.patch +++ b/Spigot-Server-Patches/0404-Fix-zero-tick-instant-grow-farms-MC-113809.patch @@ -1,4 +1,4 @@ -From dd5b17a71c994c9242a43575d4393b258940c2b4 Mon Sep 17 00:00:00 2001 +From 6057172216ab6a77aa85da8860d3112120659f79 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Sun, 15 Sep 2019 11:32:32 -0500 Subject: [PATCH] Fix zero-tick instant grow farms MC-113809 @@ -81,7 +81,7 @@ index 55b07444e..3bc3c5aa2 100644 for (i = 1; worldserver.getType(blockposition.down(i)).getBlock() == this; ++i) { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 5ec0acc30..569ae0b9e 100644 +index 88cc8763f..b2d8f7b9f 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -590,7 +590,9 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/0406-Fix-MC-161754.patch b/Spigot-Server-Patches/0405-Fix-MC-161754.patch similarity index 94% rename from Spigot-Server-Patches/0406-Fix-MC-161754.patch rename to Spigot-Server-Patches/0405-Fix-MC-161754.patch index 5b90c37bc6..05cacc89c6 100644 --- a/Spigot-Server-Patches/0406-Fix-MC-161754.patch +++ b/Spigot-Server-Patches/0405-Fix-MC-161754.patch @@ -1,4 +1,4 @@ -From 1448afa6b67445f2ccfd8b0cd4e4b9b747e1e342 Mon Sep 17 00:00:00 2001 +From 07ccb9dcfccdf75d49ba6838862c2f8cdaa6dc69 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 24 Sep 2019 16:03:00 -0700 Subject: [PATCH] Fix MC-161754 diff --git a/Spigot-Server-Patches/0407-Performance-improvement-for-Chunk.getEntities.patch b/Spigot-Server-Patches/0406-Performance-improvement-for-Chunk.getEntities.patch similarity index 96% rename from Spigot-Server-Patches/0407-Performance-improvement-for-Chunk.getEntities.patch rename to Spigot-Server-Patches/0406-Performance-improvement-for-Chunk.getEntities.patch index c1a2060c8e..68a4a6fa2a 100644 --- a/Spigot-Server-Patches/0407-Performance-improvement-for-Chunk.getEntities.patch +++ b/Spigot-Server-Patches/0406-Performance-improvement-for-Chunk.getEntities.patch @@ -1,4 +1,4 @@ -From e9c8733e3b5f64257ec416a75cc83c5f028bc1e6 Mon Sep 17 00:00:00 2001 +From 9961ec0865c5a0e65986c223b7dfaf11aaa91f3c Mon Sep 17 00:00:00 2001 From: wea_ondara Date: Thu, 10 Oct 2019 11:29:42 +0200 Subject: [PATCH] Performance improvement for Chunk.getEntities diff --git a/Spigot-Server-Patches/0408-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch b/Spigot-Server-Patches/0407-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch similarity index 96% rename from Spigot-Server-Patches/0408-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch rename to Spigot-Server-Patches/0407-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch index 796bdbb854..812929f6f9 100644 --- a/Spigot-Server-Patches/0408-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch +++ b/Spigot-Server-Patches/0407-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch @@ -1,4 +1,4 @@ -From 51e677c767f7aa6d4ac700ab6e5ecb92b8b82d37 Mon Sep 17 00:00:00 2001 +From 12ebbef1f536b9c55251bc6c4031f16bbdb24765 Mon Sep 17 00:00:00 2001 From: MisterErwin Date: Wed, 30 Oct 2019 16:57:54 +0100 Subject: [PATCH] Fix spawning of hanging entities that are not ItemFrames and diff --git a/Spigot-Server-Patches/0409-Expose-the-internal-current-tick.patch b/Spigot-Server-Patches/0408-Expose-the-internal-current-tick.patch similarity index 92% rename from Spigot-Server-Patches/0409-Expose-the-internal-current-tick.patch rename to Spigot-Server-Patches/0408-Expose-the-internal-current-tick.patch index c61b2e3ab4..3b75e9662e 100644 --- a/Spigot-Server-Patches/0409-Expose-the-internal-current-tick.patch +++ b/Spigot-Server-Patches/0408-Expose-the-internal-current-tick.patch @@ -1,4 +1,4 @@ -From 3ed6e75f9e52e0f661b52e31450ede7b3c179cae Mon Sep 17 00:00:00 2001 +From d7bfcf10fbc2f8ea3d6a08d9e9128b1561b34a6a Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 20 Apr 2019 19:47:34 -0500 Subject: [PATCH] Expose the internal current tick diff --git a/Spigot-Server-Patches/0410-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/Spigot-Server-Patches/0409-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch similarity index 96% rename from Spigot-Server-Patches/0410-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch rename to Spigot-Server-Patches/0409-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch index 10c3707b54..633c263d32 100644 --- a/Spigot-Server-Patches/0410-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch +++ b/Spigot-Server-Patches/0409-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch @@ -1,4 +1,4 @@ -From 8b2fdab63c344ea88957b7c3ddd6add574f1ac31 Mon Sep 17 00:00:00 2001 +From a3e85079b53118282bf2c3897ee95b0e90e71223 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 9 Oct 2019 21:51:43 -0500 Subject: [PATCH] Fix stuck in sneak when changing worlds (MC-10657) diff --git a/Spigot-Server-Patches/0411-Add-option-to-disable-pillager-patrols.patch b/Spigot-Server-Patches/0410-Add-option-to-disable-pillager-patrols.patch similarity index 96% rename from Spigot-Server-Patches/0411-Add-option-to-disable-pillager-patrols.patch rename to Spigot-Server-Patches/0410-Add-option-to-disable-pillager-patrols.patch index 7d22d29d81..70b4c0efd1 100644 --- a/Spigot-Server-Patches/0411-Add-option-to-disable-pillager-patrols.patch +++ b/Spigot-Server-Patches/0410-Add-option-to-disable-pillager-patrols.patch @@ -1,4 +1,4 @@ -From 51b9651ad6a9905786add533bdd54e3c9b314134 Mon Sep 17 00:00:00 2001 +From c38e8c64b07e32f52623d615f826b598f52173e9 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 9 Oct 2019 21:46:15 -0500 Subject: [PATCH] Add option to disable pillager patrols diff --git a/Spigot-Server-Patches/0412-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/Spigot-Server-Patches/0411-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch similarity index 96% rename from Spigot-Server-Patches/0412-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch rename to Spigot-Server-Patches/0411-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch index 9d4f11b6a2..f6bb0f6433 100644 --- a/Spigot-Server-Patches/0412-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch +++ b/Spigot-Server-Patches/0411-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch @@ -1,4 +1,4 @@ -From eba334b27e400e43ad5a9d2f56be5d0374558907 Mon Sep 17 00:00:00 2001 +From 163f785cdd7cfe820fd49b464636a0143805ac4d Mon Sep 17 00:00:00 2001 From: Lukasz Derlatka Date: Mon, 11 Nov 2019 16:08:13 +0100 Subject: [PATCH] Fix AssertionError when player hand set to empty type diff --git a/Spigot-Server-Patches/0413-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0412-PlayerLaunchProjectileEvent.patch similarity index 99% rename from Spigot-Server-Patches/0413-PlayerLaunchProjectileEvent.patch rename to Spigot-Server-Patches/0412-PlayerLaunchProjectileEvent.patch index 6a1b3cd801..637736c8e3 100644 --- a/Spigot-Server-Patches/0413-PlayerLaunchProjectileEvent.patch +++ b/Spigot-Server-Patches/0412-PlayerLaunchProjectileEvent.patch @@ -1,4 +1,4 @@ -From 59aa9a9b449b105136155c63953779acaec6d212 Mon Sep 17 00:00:00 2001 +From 719ddf27e23783436bd14bc69ec944608ced30a6 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 03:11:03 -0500 Subject: [PATCH] PlayerLaunchProjectileEvent diff --git a/Spigot-Server-Patches/0414-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/Spigot-Server-Patches/0413-Add-CraftMagicNumbers.isSupportedApiVersion.patch similarity index 93% rename from Spigot-Server-Patches/0414-Add-CraftMagicNumbers.isSupportedApiVersion.patch rename to Spigot-Server-Patches/0413-Add-CraftMagicNumbers.isSupportedApiVersion.patch index f94bebca3e..fed921cdd3 100644 --- a/Spigot-Server-Patches/0414-Add-CraftMagicNumbers.isSupportedApiVersion.patch +++ b/Spigot-Server-Patches/0413-Add-CraftMagicNumbers.isSupportedApiVersion.patch @@ -1,4 +1,4 @@ -From 32b8a8aae60c0ee6e0e1fba24756de333d726dc8 Mon Sep 17 00:00:00 2001 +From e682e63dd6c0e1fdb2038a09fa2af72c1b7b33fc Mon Sep 17 00:00:00 2001 From: BlackHole Date: Sun, 15 Dec 2019 19:12:39 +0100 Subject: [PATCH] Add CraftMagicNumbers.isSupportedApiVersion() diff --git a/Spigot-Server-Patches/0415-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/Spigot-Server-Patches/0414-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch similarity index 95% rename from Spigot-Server-Patches/0415-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch rename to Spigot-Server-Patches/0414-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch index 0fc8db37f7..fa32c80d6d 100644 --- a/Spigot-Server-Patches/0415-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch +++ b/Spigot-Server-Patches/0414-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch @@ -1,4 +1,4 @@ -From b5a58bc1b7288a7fb29b74839a68ceefc0b8d28c Mon Sep 17 00:00:00 2001 +From 480b09577ea0a64c67a7b18d6e2477db7c837ec2 Mon Sep 17 00:00:00 2001 From: Callahan Date: Mon, 13 Jan 2020 23:47:28 -0600 Subject: [PATCH] Prevent sync chunk loads when villagers try to find beds diff --git a/Spigot-Server-Patches/0416-Fix-spawn-radius-being-treated-as-0.patch b/Spigot-Server-Patches/0415-Fix-spawn-radius-being-treated-as-0.patch similarity index 94% rename from Spigot-Server-Patches/0416-Fix-spawn-radius-being-treated-as-0.patch rename to Spigot-Server-Patches/0415-Fix-spawn-radius-being-treated-as-0.patch index e2a84a655a..663419db21 100644 --- a/Spigot-Server-Patches/0416-Fix-spawn-radius-being-treated-as-0.patch +++ b/Spigot-Server-Patches/0415-Fix-spawn-radius-being-treated-as-0.patch @@ -1,4 +1,4 @@ -From c40f96693475ff2eef780c0d10e9a8c0ef6d86fd Mon Sep 17 00:00:00 2001 +From 19d81003e11bd737430877d25d2582cb3c77f246 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 15 Dec 2019 19:41:28 +0000 Subject: [PATCH] Fix spawn radius being treated as 0 diff --git a/Spigot-Server-Patches/0417-MC-145656-Fix-Follow-Range-Initial-Target.patch b/Spigot-Server-Patches/0416-MC-145656-Fix-Follow-Range-Initial-Target.patch similarity index 96% rename from Spigot-Server-Patches/0417-MC-145656-Fix-Follow-Range-Initial-Target.patch rename to Spigot-Server-Patches/0416-MC-145656-Fix-Follow-Range-Initial-Target.patch index 4f235e8d29..43efe3c140 100644 --- a/Spigot-Server-Patches/0417-MC-145656-Fix-Follow-Range-Initial-Target.patch +++ b/Spigot-Server-Patches/0416-MC-145656-Fix-Follow-Range-Initial-Target.patch @@ -1,4 +1,4 @@ -From 2c8183b4b216a2cffce18c4513b816d1031e642a Mon Sep 17 00:00:00 2001 +From 7519f49f7a660508c09304fb1f5e384562789d9f Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 18 Dec 2019 22:21:35 -0600 Subject: [PATCH] MC-145656 Fix Follow Range Initial Target @@ -19,7 +19,7 @@ index 3bbf77a8e..f8d8cb865 100644 + } } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java -index 5a2fa079e..b81b9a9a4 100644 +index cd17bf2be..b85e67a85 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java @@ -25,6 +25,7 @@ public class PathfinderGoalNearestAttackableTarget exten diff --git a/Spigot-Server-Patches/0418-Optimize-Hoppers.patch b/Spigot-Server-Patches/0417-Optimize-Hoppers.patch similarity index 99% rename from Spigot-Server-Patches/0418-Optimize-Hoppers.patch rename to Spigot-Server-Patches/0417-Optimize-Hoppers.patch index e0cc12f7ef..44ddc1e61e 100644 --- a/Spigot-Server-Patches/0418-Optimize-Hoppers.patch +++ b/Spigot-Server-Patches/0417-Optimize-Hoppers.patch @@ -1,4 +1,4 @@ -From 3ac137952a2bd84c2aa47dda56355346ff5e2ea1 Mon Sep 17 00:00:00 2001 +From 7fb4a2248613ae2e5e9247b4baf08dab78d71cd3 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/0419-PlayerDeathEvent-shouldDropExperience.patch b/Spigot-Server-Patches/0418-PlayerDeathEvent-shouldDropExperience.patch similarity index 93% rename from Spigot-Server-Patches/0419-PlayerDeathEvent-shouldDropExperience.patch rename to Spigot-Server-Patches/0418-PlayerDeathEvent-shouldDropExperience.patch index 1e852b773a..4d3fe9f19b 100644 --- a/Spigot-Server-Patches/0419-PlayerDeathEvent-shouldDropExperience.patch +++ b/Spigot-Server-Patches/0418-PlayerDeathEvent-shouldDropExperience.patch @@ -1,4 +1,4 @@ -From 2056a69d1bdb6b08ae97ac5f1485dc7c795acbdd Mon Sep 17 00:00:00 2001 +From 9c38e277c56a329d000cb60a7c628aa32c515357 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 24 Dec 2019 00:35:42 +0000 Subject: [PATCH] PlayerDeathEvent#shouldDropExperience diff --git a/Spigot-Server-Patches/0420-Prevent-bees-loading-chunks-checking-hive-position.patch b/Spigot-Server-Patches/0419-Prevent-bees-loading-chunks-checking-hive-position.patch similarity index 90% rename from Spigot-Server-Patches/0420-Prevent-bees-loading-chunks-checking-hive-position.patch rename to Spigot-Server-Patches/0419-Prevent-bees-loading-chunks-checking-hive-position.patch index cd90f7b22a..35fabf8397 100644 --- a/Spigot-Server-Patches/0420-Prevent-bees-loading-chunks-checking-hive-position.patch +++ b/Spigot-Server-Patches/0419-Prevent-bees-loading-chunks-checking-hive-position.patch @@ -1,11 +1,11 @@ -From bac0c036cb48667eb3238938a2878bf733b0e0f1 Mon Sep 17 00:00:00 2001 +From d24accc49be4c8a1eadc38b95ceb3b02edad77f2 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 5 Jan 2020 17:24:34 -0600 Subject: [PATCH] Prevent bees loading chunks checking hive position diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java -index d1d7db062..f67d66b9a 100644 +index b39599654..73e016257 100644 --- a/src/main/java/net/minecraft/server/EntityBee.java +++ b/src/main/java/net/minecraft/server/EntityBee.java @@ -386,6 +386,7 @@ public class EntityBee extends EntityAnimal implements EntityBird { diff --git a/Spigot-Server-Patches/0421-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0420-Don-t-load-Chunks-from-Hoppers-and-other-things.patch similarity index 96% rename from Spigot-Server-Patches/0421-Don-t-load-Chunks-from-Hoppers-and-other-things.patch rename to Spigot-Server-Patches/0420-Don-t-load-Chunks-from-Hoppers-and-other-things.patch index fccf022436..9edf68af9e 100644 --- a/Spigot-Server-Patches/0421-Don-t-load-Chunks-from-Hoppers-and-other-things.patch +++ b/Spigot-Server-Patches/0420-Don-t-load-Chunks-from-Hoppers-and-other-things.patch @@ -1,4 +1,4 @@ -From 5abb62d4dfe70f4d5d9d76a8bf6bc0958198ef20 Mon Sep 17 00:00:00 2001 +From d8a248beb167d610ebf3f63b997db5bd3796bd3d Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Nov 2016 20:28:12 -0400 Subject: [PATCH] Don't load Chunks from Hoppers and other things diff --git a/Spigot-Server-Patches/0422-Guard-against-serializing-mismatching-chunk-coordina.patch b/Spigot-Server-Patches/0421-Guard-against-serializing-mismatching-chunk-coordina.patch similarity index 98% rename from Spigot-Server-Patches/0422-Guard-against-serializing-mismatching-chunk-coordina.patch rename to Spigot-Server-Patches/0421-Guard-against-serializing-mismatching-chunk-coordina.patch index 243a92b6ce..9a123e8caa 100644 --- a/Spigot-Server-Patches/0422-Guard-against-serializing-mismatching-chunk-coordina.patch +++ b/Spigot-Server-Patches/0421-Guard-against-serializing-mismatching-chunk-coordina.patch @@ -1,4 +1,4 @@ -From e0a4155558a6c810a7357f0eb029d9e489080bee Mon Sep 17 00:00:00 2001 +From d14f9813bbe32d554e92189e8173ba2ec0858bd7 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 27 Dec 2019 09:42:26 -0800 Subject: [PATCH] Guard against serializing mismatching chunk coordinate diff --git a/Spigot-Server-Patches/0423-Optimise-IEntityAccess-getPlayerByUUID.patch b/Spigot-Server-Patches/0422-Optimise-IEntityAccess-getPlayerByUUID.patch similarity index 95% rename from Spigot-Server-Patches/0423-Optimise-IEntityAccess-getPlayerByUUID.patch rename to Spigot-Server-Patches/0422-Optimise-IEntityAccess-getPlayerByUUID.patch index 7bf7a11a0d..5e127d1ba6 100644 --- a/Spigot-Server-Patches/0423-Optimise-IEntityAccess-getPlayerByUUID.patch +++ b/Spigot-Server-Patches/0422-Optimise-IEntityAccess-getPlayerByUUID.patch @@ -1,4 +1,4 @@ -From 5a87ceeb957d4c5665bfe1b20fab70c43e24a25d Mon Sep 17 00:00:00 2001 +From e2239878575f16aa302f52d2067c69b04957ebac Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 11 Jan 2020 21:50:56 -0800 Subject: [PATCH] Optimise IEntityAccess#getPlayerByUUID @@ -23,7 +23,7 @@ index d5c284cdd..4157e50e4 100644 EntityHuman entityhuman = (EntityHuman) this.getPlayers().get(i); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 569ae0b9e..6ec394da5 100644 +index b2d8f7b9f..0fed33713 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -82,6 +82,15 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/0424-Fix-items-not-falling-correctly.patch b/Spigot-Server-Patches/0423-Fix-items-not-falling-correctly.patch similarity index 93% rename from Spigot-Server-Patches/0424-Fix-items-not-falling-correctly.patch rename to Spigot-Server-Patches/0423-Fix-items-not-falling-correctly.patch index 96ea627883..99e0c6e221 100644 --- a/Spigot-Server-Patches/0424-Fix-items-not-falling-correctly.patch +++ b/Spigot-Server-Patches/0423-Fix-items-not-falling-correctly.patch @@ -1,4 +1,4 @@ -From 69bcbbedd0ba97943fb186169d61af8455427799 Mon Sep 17 00:00:00 2001 +From 8c46eba042db53113e73979dabd61b85c76a751d Mon Sep 17 00:00:00 2001 From: AJMFactsheets Date: Fri, 17 Jan 2020 17:17:54 -0600 Subject: [PATCH] Fix items not falling correctly @@ -15,7 +15,7 @@ This patch resolves the conflict by offsetting checking an item's move method from Spigot's entity activation range check. diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index e61af3f5e..d15a9fcfb 100644 +index 507627a29..2926fbb95 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -86,7 +86,7 @@ public class EntityItem extends Entity { diff --git a/Spigot-Server-Patches/0425-Lag-compensate-eating.patch b/Spigot-Server-Patches/0424-Lag-compensate-eating.patch similarity index 98% rename from Spigot-Server-Patches/0425-Lag-compensate-eating.patch rename to Spigot-Server-Patches/0424-Lag-compensate-eating.patch index 6c05077df8..77f1a654ba 100644 --- a/Spigot-Server-Patches/0425-Lag-compensate-eating.patch +++ b/Spigot-Server-Patches/0424-Lag-compensate-eating.patch @@ -1,4 +1,4 @@ -From 2e82a885dd01c3c7c249ea01e95071e9a4ef631d Mon Sep 17 00:00:00 2001 +From ac8562fe51ed88f00e955863bf3d8cb4c6f0c5c3 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 14 Jan 2020 15:28:28 -0800 Subject: [PATCH] Lag compensate eating diff --git a/Spigot-Server-Patches/0426-Optimize-call-to-getFluid-for-explosions.patch b/Spigot-Server-Patches/0425-Optimize-call-to-getFluid-for-explosions.patch similarity index 94% rename from Spigot-Server-Patches/0426-Optimize-call-to-getFluid-for-explosions.patch rename to Spigot-Server-Patches/0425-Optimize-call-to-getFluid-for-explosions.patch index 1c5655205b..7bbc5ce01e 100644 --- a/Spigot-Server-Patches/0426-Optimize-call-to-getFluid-for-explosions.patch +++ b/Spigot-Server-Patches/0425-Optimize-call-to-getFluid-for-explosions.patch @@ -1,4 +1,4 @@ -From 2a0f2c0409f7add8fbf63f1fe36cdfbcbd3684ca Mon Sep 17 00:00:00 2001 +From 264745e23b68ce3618a16a909031196fc0c83f0e Mon Sep 17 00:00:00 2001 From: BrodyBeckwith Date: Tue, 14 Jan 2020 17:49:03 -0500 Subject: [PATCH] Optimize call to getFluid for explosions diff --git a/Spigot-Server-Patches/0427-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/Spigot-Server-Patches/0426-Fix-last-firework-in-stack-not-having-effects-when-d.patch similarity index 95% rename from Spigot-Server-Patches/0427-Fix-last-firework-in-stack-not-having-effects-when-d.patch rename to Spigot-Server-Patches/0426-Fix-last-firework-in-stack-not-having-effects-when-d.patch index 07649e63f9..0b2d63b12c 100644 --- a/Spigot-Server-Patches/0427-Fix-last-firework-in-stack-not-having-effects-when-d.patch +++ b/Spigot-Server-Patches/0426-Fix-last-firework-in-stack-not-having-effects-when-d.patch @@ -1,4 +1,4 @@ -From 6a1b5bebc34a1721a9686b9bf5d8229e7c715201 Mon Sep 17 00:00:00 2001 +From d001ebbfc24d1432185a7e9f60fdcd337a9b2f7c Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 17 Jan 2020 18:44:55 -0800 Subject: [PATCH] Fix last firework in stack not having effects when dispensed diff --git a/Spigot-Server-Patches/0428-Activation-Range-Improvements.patch b/Spigot-Server-Patches/0427-Activation-Range-Improvements.patch similarity index 99% rename from Spigot-Server-Patches/0428-Activation-Range-Improvements.patch rename to Spigot-Server-Patches/0427-Activation-Range-Improvements.patch index 6074832b41..b4a62ce06f 100644 --- a/Spigot-Server-Patches/0428-Activation-Range-Improvements.patch +++ b/Spigot-Server-Patches/0427-Activation-Range-Improvements.patch @@ -1,4 +1,4 @@ -From 7ac06d699d63f2f3ec9b2364943c2ae6d7166678 Mon Sep 17 00:00:00 2001 +From 28760f56aef1d90ac4fbddd6700109149c412bbc Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 13 May 2016 01:38:06 -0400 Subject: [PATCH] Activation Range Improvements @@ -10,7 +10,7 @@ Fixes and adds new Immunities to improve gameplay behavior Adds water Mobs to activation range config and nerfs fish diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 2917e1bd4..ac34a1008 100644 +index 6b5e92de0..2e4b50a19 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -554,6 +554,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -34,7 +34,7 @@ index b40c8d2f8..4eda13075 100644 protected EntityCreature(EntityTypes entitytypes, World world) { super(entitytypes, world); diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 5fb3c948d..e0355d3a3 100644 +index cc10db88b..e54f1e840 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -112,6 +112,17 @@ public abstract class EntityInsentient extends EntityLiving { diff --git a/Spigot-Server-Patches/0429-Add-effect-to-block-break-naturally.patch b/Spigot-Server-Patches/0428-Add-effect-to-block-break-naturally.patch similarity index 95% rename from Spigot-Server-Patches/0429-Add-effect-to-block-break-naturally.patch rename to Spigot-Server-Patches/0428-Add-effect-to-block-break-naturally.patch index 56cdc56376..d884e71df5 100644 --- a/Spigot-Server-Patches/0429-Add-effect-to-block-break-naturally.patch +++ b/Spigot-Server-Patches/0428-Add-effect-to-block-break-naturally.patch @@ -1,4 +1,4 @@ -From 25a422b6b9d4265c73f603e070518b6105ee460a Mon Sep 17 00:00:00 2001 +From e5a71750091b3cecc98572d14469bf5a9e45b8c4 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 2 Jan 2020 12:25:07 -0600 Subject: [PATCH] Add effect to block break naturally diff --git a/Spigot-Server-Patches/0430-Tracking-Range-Improvements.patch b/Spigot-Server-Patches/0429-Tracking-Range-Improvements.patch similarity index 97% rename from Spigot-Server-Patches/0430-Tracking-Range-Improvements.patch rename to Spigot-Server-Patches/0429-Tracking-Range-Improvements.patch index 06e448cdbf..cba11fa37a 100644 --- a/Spigot-Server-Patches/0430-Tracking-Range-Improvements.patch +++ b/Spigot-Server-Patches/0429-Tracking-Range-Improvements.patch @@ -1,4 +1,4 @@ -From bf942fbe7fb7f2dbb7bae951d724993390e05a8c Mon Sep 17 00:00:00 2001 +From f7736da3f129e86ad5703c6e56ea94ed07893f15 Mon Sep 17 00:00:00 2001 From: kickash32 Date: Sat, 21 Dec 2019 15:22:09 -0500 Subject: [PATCH] Tracking Range Improvements diff --git a/Spigot-Server-Patches/0431-Fix-comparator-behavior-for-EntityPhanton-goal.patch b/Spigot-Server-Patches/0430-Fix-comparator-behavior-for-EntityPhanton-goal.patch similarity index 93% rename from Spigot-Server-Patches/0431-Fix-comparator-behavior-for-EntityPhanton-goal.patch rename to Spigot-Server-Patches/0430-Fix-comparator-behavior-for-EntityPhanton-goal.patch index d93e787c79..7bc4693437 100644 --- a/Spigot-Server-Patches/0431-Fix-comparator-behavior-for-EntityPhanton-goal.patch +++ b/Spigot-Server-Patches/0430-Fix-comparator-behavior-for-EntityPhanton-goal.patch @@ -1,4 +1,4 @@ -From 0b73f7fd0181ed80b76fd44005e9fe83cf1e61f5 Mon Sep 17 00:00:00 2001 +From 0c3789b1011ec7c2c68bac60ab20db21db5c9782 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Wed, 22 Jan 2020 21:00:21 +0000 Subject: [PATCH] Fix comparator behavior for EntityPhanton goal diff --git a/Spigot-Server-Patches/0432-Fix-items-vanishing-through-end-portal.patch b/Spigot-Server-Patches/0431-Fix-items-vanishing-through-end-portal.patch similarity index 94% rename from Spigot-Server-Patches/0432-Fix-items-vanishing-through-end-portal.patch rename to Spigot-Server-Patches/0431-Fix-items-vanishing-through-end-portal.patch index b91aa09606..e10716c663 100644 --- a/Spigot-Server-Patches/0432-Fix-items-vanishing-through-end-portal.patch +++ b/Spigot-Server-Patches/0431-Fix-items-vanishing-through-end-portal.patch @@ -1,4 +1,4 @@ -From b29a7453c74d0138ef0e58110430dbdf5ba772c4 Mon Sep 17 00:00:00 2001 +From ce57854db81fc6045f10a12adb97ee48e4e9e657 Mon Sep 17 00:00:00 2001 From: AJMFactsheets Date: Wed, 22 Jan 2020 19:52:28 -0600 Subject: [PATCH] Fix items vanishing through end portal @@ -13,7 +13,7 @@ Quickly loading the exact world spawn chunk before searching the heightmap resolves the issue without having to load all spawn chunks. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 05862e0e7..e6727c58a 100644 +index 2e4b50a19..acb7848d8 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2600,6 +2600,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0433-Seed-based-feature-search.patch b/Spigot-Server-Patches/0432-Seed-based-feature-search.patch similarity index 98% rename from Spigot-Server-Patches/0433-Seed-based-feature-search.patch rename to Spigot-Server-Patches/0432-Seed-based-feature-search.patch index ec6e7436df..a6607009ff 100644 --- a/Spigot-Server-Patches/0433-Seed-based-feature-search.patch +++ b/Spigot-Server-Patches/0432-Seed-based-feature-search.patch @@ -1,4 +1,4 @@ -From 26a819f39b9ff44bbcab563d6f839cd43691d40e Mon Sep 17 00:00:00 2001 +From c35fcf7b8dec737a83ef004b3800ea5134d7e619 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Mon, 13 Jan 2020 15:40:32 +0100 Subject: [PATCH] Seed based feature search diff --git a/Spigot-Server-Patches/0434-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/Spigot-Server-Patches/0433-Bees-get-gravity-in-void.-Fixes-MC-167279.patch similarity index 96% rename from Spigot-Server-Patches/0434-Bees-get-gravity-in-void.-Fixes-MC-167279.patch rename to Spigot-Server-Patches/0433-Bees-get-gravity-in-void.-Fixes-MC-167279.patch index a020d20fe8..b985305e80 100644 --- a/Spigot-Server-Patches/0434-Bees-get-gravity-in-void.-Fixes-MC-167279.patch +++ b/Spigot-Server-Patches/0433-Bees-get-gravity-in-void.-Fixes-MC-167279.patch @@ -1,4 +1,4 @@ -From d2a044d9e091d09b35265be50c646f57f2172bcd Mon Sep 17 00:00:00 2001 +From 082e7095b0d8be07d4649ecda8c285eb67edb146 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 26 Jan 2020 16:30:19 -0600 Subject: [PATCH] Bees get gravity in void. Fixes MC-167279 @@ -31,7 +31,7 @@ index 2b6ac2eeb..0496c0c5d 100644 this.h = ControllerMove.Operation.WAIT; this.a.setNoGravity(true); diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java -index e039ec536..7fdfe9b92 100644 +index 73e016257..c7d79efdf 100644 --- a/src/main/java/net/minecraft/server/EntityBee.java +++ b/src/main/java/net/minecraft/server/EntityBee.java @@ -36,7 +36,17 @@ public class EntityBee extends EntityAnimal implements EntityBird { diff --git a/Spigot-Server-Patches/0435-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/Spigot-Server-Patches/0434-Optimise-getChunkAt-calls-for-loaded-chunks.patch similarity index 98% rename from Spigot-Server-Patches/0435-Optimise-getChunkAt-calls-for-loaded-chunks.patch rename to Spigot-Server-Patches/0434-Optimise-getChunkAt-calls-for-loaded-chunks.patch index a7f7f62f42..84b105248d 100644 --- a/Spigot-Server-Patches/0435-Optimise-getChunkAt-calls-for-loaded-chunks.patch +++ b/Spigot-Server-Patches/0434-Optimise-getChunkAt-calls-for-loaded-chunks.patch @@ -1,4 +1,4 @@ -From 2c3714b7548688e69abc5d4e16953ac36cf68bcf Mon Sep 17 00:00:00 2001 +From 5802854a423626f7ea7cb60a6974997beb999c56 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 25 Jan 2020 17:04:35 -0800 Subject: [PATCH] Optimise getChunkAt calls for loaded chunks diff --git a/Spigot-Server-Patches/0436-Be-more-tolerant-of-invalid-attributes.patch b/Spigot-Server-Patches/0435-Be-more-tolerant-of-invalid-attributes.patch similarity index 96% rename from Spigot-Server-Patches/0436-Be-more-tolerant-of-invalid-attributes.patch rename to Spigot-Server-Patches/0435-Be-more-tolerant-of-invalid-attributes.patch index 68784e4618..ce01e73a07 100644 --- a/Spigot-Server-Patches/0436-Be-more-tolerant-of-invalid-attributes.patch +++ b/Spigot-Server-Patches/0435-Be-more-tolerant-of-invalid-attributes.patch @@ -1,4 +1,4 @@ -From 21b08a76566773d9fe0215ec49975d4b64d28f07 Mon Sep 17 00:00:00 2001 +From a60336b74418974ecc49ff0759161157205ea962 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 6 Feb 2020 19:20:27 -0600 Subject: [PATCH] Be more tolerant of invalid attributes diff --git a/Spigot-Server-Patches/0437-Allow-overriding-the-java-version-check.patch b/Spigot-Server-Patches/0436-Allow-overriding-the-java-version-check.patch similarity index 93% rename from Spigot-Server-Patches/0437-Allow-overriding-the-java-version-check.patch rename to Spigot-Server-Patches/0436-Allow-overriding-the-java-version-check.patch index 523f53ecd1..9d431fb37c 100644 --- a/Spigot-Server-Patches/0437-Allow-overriding-the-java-version-check.patch +++ b/Spigot-Server-Patches/0436-Allow-overriding-the-java-version-check.patch @@ -1,4 +1,4 @@ -From 4747cf7910f84bd591445645e21568b9c3ae2e3d Mon Sep 17 00:00:00 2001 +From c623ba588a6cfb7b73ac122339ce101718d7f8fe Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 8 Feb 2020 18:02:24 -0600 Subject: [PATCH] Allow overriding the java version check diff --git a/Spigot-Server-Patches/0438-Add-ThrownEggHatchEvent.patch b/Spigot-Server-Patches/0437-Add-ThrownEggHatchEvent.patch similarity index 93% rename from Spigot-Server-Patches/0438-Add-ThrownEggHatchEvent.patch rename to Spigot-Server-Patches/0437-Add-ThrownEggHatchEvent.patch index 249de47886..146c8d0d7d 100644 --- a/Spigot-Server-Patches/0438-Add-ThrownEggHatchEvent.patch +++ b/Spigot-Server-Patches/0437-Add-ThrownEggHatchEvent.patch @@ -1,4 +1,4 @@ -From 0e91125680ffd3e0b2782e0159543cd2cf3c44bb Mon Sep 17 00:00:00 2001 +From bd7ca93f5cd8917fc00f2e24885df6ecb672acf5 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 9 Feb 2020 00:19:05 -0600 Subject: [PATCH] Add ThrownEggHatchEvent @@ -7,7 +7,7 @@ Adds a new event similar to PlayerEggThrowEvent, but without the Player requirem (dispensers can throw eggs to hatch them, too). diff --git a/src/main/java/net/minecraft/server/EntityEgg.java b/src/main/java/net/minecraft/server/EntityEgg.java -index 970f9109d9..bdd82d052a 100644 +index 970f9109d..bdd82d052 100644 --- a/src/main/java/net/minecraft/server/EntityEgg.java +++ b/src/main/java/net/minecraft/server/EntityEgg.java @@ -52,6 +52,16 @@ public class EntityEgg extends EntityProjectileThrowable {