diff options
| -rw-r--r-- | Spigot-Server-Patches/0006-Timings-v2.patch | 68 | ||||
| -rw-r--r-- | Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch | 12 | ||||
| -rw-r--r-- | Spigot-Server-Patches/0071-Allow-Reloading-of-Custom-Permissions.patch | 8 | ||||
| -rw-r--r-- | Spigot-Server-Patches/0175-Allow-Reloading-of-Command-Aliases.patch | 8 | ||||
| m--------- | work/Bukkit | 0 | ||||
| m--------- | work/CraftBukkit | 13 | ||||
| m--------- | work/Spigot | 0 |
7 files changed, 53 insertions, 56 deletions
diff --git a/Spigot-Server-Patches/0006-Timings-v2.patch b/Spigot-Server-Patches/0006-Timings-v2.patch index 7d06b4d2ef..93a87ffdbf 100644 --- a/Spigot-Server-Patches/0006-Timings-v2.patch +++ b/Spigot-Server-Patches/0006-Timings-v2.patch @@ -1,11 +1,11 @@ -From a6a0156f385f0432bbc34afd2126d95247cccd75 Mon Sep 17 00:00:00 2001 +From 57a6b73c98e68ef1d2a215fb2ac38056aec5f8e5 Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Thu, 3 Mar 2016 04:00:11 -0600 Subject: [PATCH] Timings v2 diff --git a/pom.xml b/pom.xml -index 8b96966d8..8d1e8680b 100644 +index 8b96966d..8d1e8680 100644 --- a/pom.xml +++ b/pom.xml @@ -66,6 +66,12 @@ @@ -23,7 +23,7 @@ index 8b96966d8..8d1e8680b 100644 <version>3.0.3</version> diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java new file mode 100644 -index 000000000..4b4b77a5c +index 00000000..4b4b77a5 --- /dev/null +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java @@ -0,0 +1,124 @@ @@ -153,7 +153,7 @@ index 000000000..4b4b77a5c +} diff --git a/src/main/java/co/aikar/timings/TimedChunkGenerator.java b/src/main/java/co/aikar/timings/TimedChunkGenerator.java new file mode 100644 -index 000000000..b79f1be7a +index 00000000..b79f1be7 --- /dev/null +++ b/src/main/java/co/aikar/timings/TimedChunkGenerator.java @@ -0,0 +1,126 @@ @@ -285,7 +285,7 @@ index 000000000..b79f1be7a +} diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java new file mode 100644 -index 000000000..e7789117b +index 00000000..e7789117 --- /dev/null +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java @@ -0,0 +1,101 @@ @@ -391,7 +391,7 @@ index 000000000..e7789117b + } +} diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 75d4048a9..1ea799d59 100644 +index 75d4048a..1ea799d5 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -14,11 +14,14 @@ import java.util.concurrent.TimeUnit; @@ -435,7 +435,7 @@ index 75d4048a9..1ea799d59 100644 + } } diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index e8511ac9a..d3f1a4ac0 100644 +index e8511ac9..d3f1a4ac 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -35,6 +35,15 @@ public class Block { @@ -455,7 +455,7 @@ index e8511ac9a..d3f1a4ac0 100644 public static int getId(Block block) { return Block.REGISTRY.a(block); // CraftBukkit - decompile error diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 81fc04ed3..bd3b16025 100644 +index 81fc04ed..bd3b1602 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -900,7 +900,7 @@ public class Chunk { @@ -503,7 +503,7 @@ index 81fc04ed3..bd3b16025 100644 private void z() { diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index daf2c0a67..3ba489d4f 100644 +index daf2c0a6..3ba489d4 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -195,7 +195,7 @@ public class ChunkProviderServer implements IChunkProvider { @@ -525,7 +525,7 @@ index daf2c0a67..3ba489d4f 100644 this.chunkLoader.a(this.world, chunk); } catch (IOException ioexception) { diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index a97e7d3c2..4890023d7 100644 +index a97e7d3c..4890023d 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -402,7 +402,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { @@ -565,7 +565,7 @@ index a97e7d3c2..4890023d7 100644 // return chunk; // CraftBukkit } diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index cb83e4f56..e6819139f 100644 +index cb83e4f5..e6819139 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -23,7 +23,7 @@ import java.io.PrintStream; @@ -618,7 +618,7 @@ index cb83e4f56..e6819139f 100644 return waitable.get(); } catch (java.util.concurrent.ExecutionException e) { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 9bd9dc28b..14d23556f 100644 +index 9bd9dc28..14d23556 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -25,7 +25,8 @@ import org.bukkit.block.BlockFace; @@ -657,7 +657,7 @@ index 9bd9dc28b..14d23556f 100644 public void recalcPosition() { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index e9002c953..b22f81b12 100644 +index e9002c95..b22f81b1 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -31,7 +31,7 @@ import org.bukkit.event.entity.EntityTeleportEvent; @@ -728,7 +728,7 @@ index e9002c953..b22f81b12 100644 } diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java -index 347a2b671..aceb08ce1 100644 +index 347a2b67..aceb08ce 100644 --- a/src/main/java/net/minecraft/server/EntityTracker.java +++ b/src/main/java/net/minecraft/server/EntityTracker.java @@ -175,7 +175,7 @@ public class EntityTracker { @@ -759,7 +759,7 @@ index 347a2b671..aceb08ce1 100644 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d1b488e8f..8f7b148a1 100644 +index cc0efa2e..1b432f0d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -47,8 +47,8 @@ import org.bukkit.Bukkit; @@ -900,7 +900,7 @@ index d1b488e8f..8f7b148a1 100644 this.methodProfiler.b(); } diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 703d5813d..021dfba14 100644 +index 703d5813..021dfba1 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -1,5 +1,6 @@ @@ -1000,7 +1000,7 @@ index 703d5813d..021dfba14 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 86f9776ee..e19513a96 100644 +index 86f9776e..e19513a9 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory; @@ -1048,7 +1048,7 @@ index 86f9776ee..e19513a96 100644 // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java -index f74b06794..1fc632e0c 100644 +index f74b0679..1fc632e0 100644 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java @@ -1,15 +1,21 @@ @@ -1078,7 +1078,7 @@ index f74b06794..1fc632e0c 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index c0af82b48..676cc3f3e 100644 +index c0af82b4..676cc3f3 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1,5 +1,6 @@ @@ -1102,7 +1102,7 @@ index c0af82b48..676cc3f3e 100644 public void addWhitelist(GameProfile gameprofile) { diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java -index f1f206501..fb350c408 100644 +index f1f20650..fb350c40 100644 --- a/src/main/java/net/minecraft/server/StructureGenerator.java +++ b/src/main/java/net/minecraft/server/StructureGenerator.java @@ -1,5 +1,7 @@ @@ -1144,7 +1144,7 @@ index f1f206501..fb350c408 100644 return flag; } diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 6958a2e0f..b3d3df4cf 100644 +index 6958a2e0..b3d3df4c 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -4,12 +4,13 @@ import javax.annotation.Nullable; @@ -1164,7 +1164,7 @@ index 6958a2e0f..b3d3df4cf 100644 private static final RegistryMaterials<MinecraftKey, Class<? extends TileEntity>> f = new RegistryMaterials(); protected World world; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 758962e67..a87b37277 100644 +index 758962e6..a87b3727 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -18,11 +18,11 @@ import com.google.common.collect.Maps; @@ -1270,7 +1270,7 @@ index 758962e67..a87b37277 100644 } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 391a09c52..966938997 100644 +index 391a09c5..96693899 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -247,13 +247,13 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -1403,10 +1403,10 @@ index 391a09c52..966938997 100644 // CraftBukkit start diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 791383fb3..38ce05828 100644 +index 587d23df..d27e2ce9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1737,6 +1737,7 @@ public final class CraftServer implements Server { +@@ -1741,6 +1741,7 @@ public final class CraftServer implements Server { private final Spigot spigot = new Spigot() { @@ -1414,7 +1414,7 @@ index 791383fb3..38ce05828 100644 @Override public YamlConfiguration getConfig() { -@@ -1744,6 +1745,24 @@ public final class CraftServer implements Server { +@@ -1748,6 +1749,24 @@ public final class CraftServer implements Server { } @Override @@ -1441,7 +1441,7 @@ index 791383fb3..38ce05828 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java deleted file mode 100644 -index 41d2d87ee..000000000 +index 41d2d87e..00000000 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java +++ /dev/null @@ -1,173 +0,0 @@ @@ -1619,7 +1619,7 @@ index 41d2d87ee..000000000 - } -} diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java -index 3a95b4465..b5efb9c3f 100644 +index 3a95b446..b5efb9c3 100644 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java @@ -1,6 +1,8 @@ @@ -1663,7 +1663,7 @@ index 3a95b4465..b5efb9c3f 100644 public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 5ceb086e5..b56ae7a36 100644 +index 5ceb086e..b56ae7a3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -39,15 +39,9 @@ import org.bukkit.configuration.serialization.DelegateDeserialization; @@ -1697,7 +1697,7 @@ index 5ceb086e5..b56ae7a36 100644 public Player.Spigot spigot() diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index 92d217bce..9952b64be 100644 +index 92d217bc..9952b64b 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -14,6 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger; @@ -1773,7 +1773,7 @@ index 92d217bce..9952b64be 100644 private boolean isReady(final int currentTick) { diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java -index 220e39abe..afc6c17e6 100644 +index 220e39ab..afc6c17e 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java @@ -1,8 +1,8 @@ @@ -1855,7 +1855,7 @@ index 220e39abe..afc6c17e6 100644 - // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java -index e52ef47b7..3d90b3426 100644 +index e52ef47b..3d90b342 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java @@ -5,6 +5,7 @@ import org.bukkit.util.CachedServerIcon; @@ -1867,7 +1867,7 @@ index e52ef47b7..3d90b3426 100644 this.value = value; } diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index c32d44df0..5c2fb0058 100644 +index c32d44df..5c2fb005 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -29,7 +29,7 @@ import net.minecraft.server.EntityWither; @@ -1929,5 +1929,5 @@ index c32d44df0..5c2fb0058 100644 } } -- -2.12.1.windows.1 +2.12.2 diff --git a/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch index ebfc30f48c..ec37aa4151 100644 --- a/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch +++ b/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch @@ -1,4 +1,4 @@ -From 5a56db7a9f54088291795d52f2bde422119d5642 Mon Sep 17 00:00:00 2001 +From b57fe9f86395e7db8e78eca60a656aa263d39d2c Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Tue, 1 Mar 2016 23:09:29 -0600 Subject: [PATCH] Further improve server tick loop @@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly. Switch to a realistic rolling average and factor in std deviation as an extra reporting variable diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 7539bb215..4476799d8 100644 +index d9e4f1a9..c4497aaa 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -113,16 +113,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs @@ -147,10 +147,10 @@ index 7539bb215..4476799d8 100644 } lastTick = curTime; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 24fd62b53..30ed3ad58 100644 +index db4ac484..0f77d067 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1734,6 +1734,17 @@ public final class CraftServer implements Server { +@@ -1738,6 +1738,17 @@ public final class CraftServer implements Server { return CraftMagicNumbers.INSTANCE; } @@ -169,7 +169,7 @@ index 24fd62b53..30ed3ad58 100644 { diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java -index be2e31dea..6d21c3269 100644 +index be2e31de..6d21c326 100644 --- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java +++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java @@ -1,8 +1,5 @@ @@ -210,5 +210,5 @@ index be2e31dea..6d21c3269 100644 return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString() + ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 ); -- -2.12.0.windows.1 +2.12.2 diff --git a/Spigot-Server-Patches/0071-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0071-Allow-Reloading-of-Custom-Permissions.patch index dbd13cceba..afec32c612 100644 --- a/Spigot-Server-Patches/0071-Allow-Reloading-of-Custom-Permissions.patch +++ b/Spigot-Server-Patches/0071-Allow-Reloading-of-Custom-Permissions.patch @@ -1,4 +1,4 @@ -From 1fc605c65c74fb9aff47a23174518c1492b73496 Mon Sep 17 00:00:00 2001 +From 851ddaf3a91b416502beeb19aabbe3f495e1f580 Mon Sep 17 00:00:00 2001 From: William <[email protected]> Date: Fri, 18 Mar 2016 03:30:17 -0400 Subject: [PATCH] Allow Reloading of Custom Permissions @@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Custom Permissions https://github.com/PaperMC/Paper/issues/49 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e2afd9d93..40091231e 100644 +index 9df6c0eb..e77307c3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1823,4 +1823,21 @@ public final class CraftServer implements Server { +@@ -1827,4 +1827,21 @@ public final class CraftServer implements Server { { return spigot; } @@ -32,5 +32,5 @@ index e2afd9d93..40091231e 100644 + // Paper end } -- -2.12.0.windows.1 +2.12.2 diff --git a/Spigot-Server-Patches/0175-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0175-Allow-Reloading-of-Command-Aliases.patch index 96b2e44ae4..5bc0a5f3c5 100644 --- a/Spigot-Server-Patches/0175-Allow-Reloading-of-Command-Aliases.patch +++ b/Spigot-Server-Patches/0175-Allow-Reloading-of-Command-Aliases.patch @@ -1,4 +1,4 @@ -From 40e511425c81959832c85fb4926e86e83ec5a2d3 Mon Sep 17 00:00:00 2001 +From d333a7c47ff1433c9ac3bfd965d118968c665904 Mon Sep 17 00:00:00 2001 From: willies952002 <[email protected]> Date: Mon, 28 Nov 2016 10:21:52 -0500 Subject: [PATCH] Allow Reloading of Command Aliases @@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases Reload the aliases stored in commands.yml diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 1bbce7a78..225e118dc 100644 +index 8ade1686..326196ce 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1848,5 +1848,24 @@ public final class CraftServer implements Server { +@@ -1852,5 +1852,24 @@ public final class CraftServer implements Server { }); } } @@ -35,5 +35,5 @@ index 1bbce7a78..225e118dc 100644 // Paper end } -- -2.12.0.windows.1 +2.12.2 diff --git a/work/Bukkit b/work/Bukkit -Subproject 4716bcc6f875def8bc7c6121dfa0f06782d7ec3 +Subproject 6751fefdda0b171e0830d31e701d4be66af73c9 diff --git a/work/CraftBukkit b/work/CraftBukkit -Subproject d219213e2bb8b63e6ca51c1c86a7a698ac5106d +Subproject e17c3d285b1026811acc1df8a1299d4ad7a6953 diff --git a/work/Spigot b/work/Spigot -Subproject d276ab1ccac39a41d48a524ed7da27561a03aed +Subproject 54ec0b8b502d298334e7011c0a5065777e22421 |