From a7cb000633d608368968d5dfdd65825a427c420a Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 16 Jul 2017 20:36:27 -0400 Subject: [PATCH] Update upstream (memory leak fix) --- Spigot-API-Patches/0001-POM-changes.patch | 12 +++---- Spigot-Server-Patches/0001-POM-Changes.patch | 25 +++++++------- Spigot-Server-Patches/0006-Timings-v2.patch | 10 +++--- .../0047-Add-PlayerInitialSpawnEvent.patch | 6 ++-- ...dDebugInfo-not-initialized-on-client.patch | 8 ++--- .../0111-Configurable-Player-Collision.patch | 22 ++++++------ .../0155-Auto-Save-Improvements.patch | 26 +++++++------- .../0193-Enforce-Sync-Player-Saves.patch | 10 +++--- ...le-async-calls-to-restart-the-server.patch | 14 ++++---- ...oleAppender-for-console-improvements.patch | 34 +++++++++---------- work/Bukkit | 2 +- work/CraftBukkit | 2 +- work/Spigot | 2 +- 13 files changed, 86 insertions(+), 87 deletions(-) diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch index c4941d494..c69980103 100644 --- a/Spigot-API-Patches/0001-POM-changes.patch +++ b/Spigot-API-Patches/0001-POM-changes.patch @@ -1,11 +1,11 @@ -From 121bc2816dfe4ab6c4c7b4c155fb57e04b3f7caa Mon Sep 17 00:00:00 2001 +From 69671c3d50b5ad75e2c8f11130e76efc5c676fbb Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 17:16:08 -0600 Subject: [PATCH] POM changes diff --git a/pom.xml b/pom.xml -index ecb870a0..968f9091 100644 +index 0c3bf997..cce94262 100644 --- a/pom.xml +++ b/pom.xml @@ -4,35 +4,36 @@ @@ -94,7 +94,7 @@ index ecb870a0..968f9091 100644 org.apache.maven.plugins -@@ -124,26 +140,6 @@ +@@ -121,26 +137,6 @@ @@ -120,8 +120,8 @@ index ecb870a0..968f9091 100644 - org.apache.maven.plugins maven-shade-plugin - 2.4.3 -@@ -156,8 +152,7 @@ + 3.0.0 +@@ -153,8 +149,7 @@ @@ -132,5 +132,5 @@ index ecb870a0..968f9091 100644 true -- -2.13.0.windows.1 +2.13.0 diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch index 0013a39a4..b710af95a 100644 --- a/Spigot-Server-Patches/0001-POM-Changes.patch +++ b/Spigot-Server-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From 968f0917c3bd89062f9209a09fb95f4e1d3b1d8f Mon Sep 17 00:00:00 2001 +From b14b02e17ed398f786427ff1c794ea9a24611d5a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 20:40:33 -0600 Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml -index 9bdc62ab..cf00ee13 100644 +index dafedf609..4cac7e38e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ @@ -25,7 +25,7 @@ index 9bdc62ab..cf00ee13 100644 UTF-8 -@@ -21,16 +21,16 @@ +@@ -21,8 +21,8 @@ @@ -36,8 +36,9 @@ index 9bdc62ab..cf00ee13 100644 dev-SNAPSHOT ../pom.xml - - +@@ -36,8 +36,8 @@ + compile + - org.spigotmc - spigot-api @@ -137,29 +138,27 @@ index 9bdc62ab..cf00ee13 100644 org.bukkit.craftbukkit org.bukkit.craftbukkit.v${minecraft_version} -@@ -242,20 +234,6 @@ +@@ -241,18 +233,6 @@ + org.apache.maven.plugins maven-compiler-plugin - - 3.1 + 3.6.1 - - - eclipse -- -- true - - - - - org.codehaus.plexus - plexus-compiler-eclipse -- 2.5.0-spigotmc +- 2.8.1-spigotmc - - org.apache.maven.plugins diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java -index 93046379..674096ca 100644 +index 93046379d..674096cab 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java @@ -11,7 +11,7 @@ public final class Versioning { @@ -172,5 +171,5 @@ index 93046379..674096ca 100644 if (stream != null) { -- -2.13.1.windows.2 +2.13.0 diff --git a/Spigot-Server-Patches/0006-Timings-v2.patch b/Spigot-Server-Patches/0006-Timings-v2.patch index 19b2a007d..ed125c136 100644 --- a/Spigot-Server-Patches/0006-Timings-v2.patch +++ b/Spigot-Server-Patches/0006-Timings-v2.patch @@ -1,4 +1,4 @@ -From 68acbbb74a75c739a22d11fb34865fee7056d0e4 Mon Sep 17 00:00:00 2001 +From 36765f132f5118529188d2241f558a3081793d08 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 04:00:11 -0600 Subject: [PATCH] Timings v2 @@ -1073,7 +1073,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 2df545ec7..38ac3b272 100644 +index 65b075307..b9920a5fc 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1,5 +1,6 @@ @@ -1083,7 +1083,7 @@ index 2df545ec7..38ac3b272 100644 import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -@@ -1197,10 +1198,11 @@ public abstract class PlayerList { +@@ -1203,10 +1204,11 @@ public abstract class PlayerList { } public void savePlayers() { @@ -1399,7 +1399,7 @@ index 8afe1d3d3..00b093976 100644 // CraftBukkit start diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 51981c386..25a11a69d 100644 +index ad075615a..209eaf36d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1744,6 +1744,7 @@ public final class CraftServer implements Server { @@ -1918,5 +1918,5 @@ index 2bd690fdf..38be7ed71 100644 } } -- -2.13.2 +2.13.0 diff --git a/Spigot-Server-Patches/0047-Add-PlayerInitialSpawnEvent.patch b/Spigot-Server-Patches/0047-Add-PlayerInitialSpawnEvent.patch index 5d4402e4d..8e916167c 100644 --- a/Spigot-Server-Patches/0047-Add-PlayerInitialSpawnEvent.patch +++ b/Spigot-Server-Patches/0047-Add-PlayerInitialSpawnEvent.patch @@ -1,4 +1,4 @@ -From 15eda5f02abe75614df683675329df4080bf6394 Mon Sep 17 00:00:00 2001 +From aa6a5903956d14c43ff5c5871306a1cfb3b089a6 Mon Sep 17 00:00:00 2001 From: Steve Anton Date: Thu, 3 Mar 2016 00:09:38 -0600 Subject: [PATCH] Add PlayerInitialSpawnEvent @@ -6,10 +6,10 @@ Subject: [PATCH] Add PlayerInitialSpawnEvent For modifying a player's initial spawn location as they join the server diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 4aaf287ae..7c73e08c3 100644 +index b9920a5fc..b90407d18 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java -@@ -106,6 +106,21 @@ public abstract class PlayerList { +@@ -110,6 +110,21 @@ public abstract class PlayerList { } // CraftBukkit end diff --git a/Spigot-Server-Patches/0101-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0101-Fix-reducedDebugInfo-not-initialized-on-client.patch index 6b9a87eb8..5ce03c37c 100644 --- a/Spigot-Server-Patches/0101-Fix-reducedDebugInfo-not-initialized-on-client.patch +++ b/Spigot-Server-Patches/0101-Fix-reducedDebugInfo-not-initialized-on-client.patch @@ -1,14 +1,14 @@ -From 2f8a388386c6602545ebd65522362757432f2de2 Mon Sep 17 00:00:00 2001 +From 421d357eb2ae97cda5e4f7a787df50d64161f834 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 2 Apr 2016 20:37:03 -0400 Subject: [PATCH] Fix reducedDebugInfo not initialized on client diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 3a5f2108..d54d7270 100644 +index b90407d18..4b2865506 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java -@@ -156,6 +156,7 @@ public abstract class PlayerList { +@@ -160,6 +160,7 @@ public abstract class PlayerList { playerconnection.sendPacket(new PacketPlayOutServerDifficulty(worlddata.getDifficulty(), worlddata.isDifficultyLocked())); playerconnection.sendPacket(new PacketPlayOutAbilities(entityplayer.abilities)); playerconnection.sendPacket(new PacketPlayOutHeldItemSlot(entityplayer.inventory.itemInHandIndex)); @@ -17,5 +17,5 @@ index 3a5f2108..d54d7270 100644 entityplayer.getStatisticManager().c(); entityplayer.F().a(entityplayer); -- -2.13.1.windows.2 +2.13.0 diff --git a/Spigot-Server-Patches/0111-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0111-Configurable-Player-Collision.patch index cff98fad0..fc71e5484 100644 --- a/Spigot-Server-Patches/0111-Configurable-Player-Collision.patch +++ b/Spigot-Server-Patches/0111-Configurable-Player-Collision.patch @@ -1,11 +1,11 @@ -From f60dc6267a873745b86a6b980e692da81f5eda76 Mon Sep 17 00:00:00 2001 +From 21967495ae6d6921239d59e93d97f7b459c41c55 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 02:10:49 -0400 Subject: [PATCH] Configurable Player Collision diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index ec464338..430b5d0c 100644 +index ec4643384..430b5d0cd 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -220,4 +220,9 @@ public class PaperConfig { @@ -19,7 +19,7 @@ index ec464338..430b5d0c 100644 + } } diff --git a/src/main/java/net/minecraft/server/CommandScoreboard.java b/src/main/java/net/minecraft/server/CommandScoreboard.java -index b08274d9..0607e55d 100644 +index b08274d93..0607e55d3 100644 --- a/src/main/java/net/minecraft/server/CommandScoreboard.java +++ b/src/main/java/net/minecraft/server/CommandScoreboard.java @@ -183,6 +183,13 @@ public class CommandScoreboard extends CommandAbstract { @@ -37,7 +37,7 @@ index b08274d9..0607e55d 100644 } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 71b66bbd..5db42bef 100644 +index 71b66bbdf..5db42beff 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -331,6 +331,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs @@ -62,7 +62,7 @@ index 71b66bbd..5db42bef 100644 protected void l() { diff --git a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java -index 549d4e89..df11764e 100644 +index 549d4e89d..df11764e0 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java @@ -96,7 +96,7 @@ public class PacketPlayOutScoreboardTeam implements Packet playersByName = new org.spigotmc.CaseInsensitiveMap(); @@ -86,7 +86,7 @@ index d54d7270..8fcf4d9c 100644 public PlayerList(MinecraftServer minecraftserver) { this.cserver = minecraftserver.server = new CraftServer(minecraftserver, this); -@@ -230,6 +231,12 @@ public abstract class PlayerList { +@@ -234,6 +235,12 @@ public abstract class PlayerList { } entityplayer.syncInventory(); @@ -99,7 +99,7 @@ index d54d7270..8fcf4d9c 100644 // CraftBukkit - Moved from above, added world PlayerList.f.info(entityplayer.getName() + "[" + s1 + "] logged in with entity id " + entityplayer.getId() + " at ([" + entityplayer.world.worldData.getName() + "]" + entityplayer.locX + ", " + entityplayer.locY + ", " + entityplayer.locZ + ")"); } -@@ -415,6 +422,16 @@ public abstract class PlayerList { +@@ -419,6 +426,16 @@ public abstract class PlayerList { entityplayer.playerTick();// SPIGOT-924 // CraftBukkit end @@ -116,7 +116,7 @@ index d54d7270..8fcf4d9c 100644 this.savePlayerFile(entityplayer); if (entityplayer.isPassenger()) { Entity entity = entityplayer.getVehicle(); -@@ -1337,7 +1354,13 @@ public abstract class PlayerList { +@@ -1343,7 +1360,13 @@ public abstract class PlayerList { player.playerConnection.disconnect(this.server.server.getShutdownMessage()); // CraftBukkit - add custom shutdown message } // CraftBukkit end @@ -132,5 +132,5 @@ index d54d7270..8fcf4d9c 100644 // CraftBukkit start -- -2.13.1.windows.2 +2.13.0 diff --git a/Spigot-Server-Patches/0155-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0155-Auto-Save-Improvements.patch index 40f1d33ad..efe3a744b 100644 --- a/Spigot-Server-Patches/0155-Auto-Save-Improvements.patch +++ b/Spigot-Server-Patches/0155-Auto-Save-Improvements.patch @@ -1,4 +1,4 @@ -From 1de2ca6ca76fc8df92e2c582ba2f90e152143109 Mon Sep 17 00:00:00 2001 +From 106acbe429bea150b87a92d9862a94c1d5c03840 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 19 Sep 2016 23:16:39 -0400 Subject: [PATCH] Auto Save Improvements @@ -12,7 +12,7 @@ Re-introduce a cap per tick for auto save (Spigot disabled the vanilla cap) and Adds incremental player auto saving too diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 621c585e..da0984a3 100644 +index 621c585e7..da0984a35 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -251,4 +251,9 @@ public class PaperConfig { @@ -26,7 +26,7 @@ index 621c585e..da0984a3 100644 + } } diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index cec9ea74..39f8a0a2 100644 +index cec9ea74c..39f8a0a2c 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -2,6 +2,7 @@ package com.destroystokyo.paper; @@ -58,7 +58,7 @@ index cec9ea74..39f8a0a2 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index a0b5cd56..f98d380f 100644 +index a0b5cd56b..f98d380f6 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -962,11 +962,9 @@ public class Chunk { @@ -76,7 +76,7 @@ index a0b5cd56..f98d380f 100644 public Random a(long i) { diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 9836c0c5..39f0f5a1 100644 +index 9836c0c5a..39f0f5a17 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -1,5 +1,6 @@ @@ -96,7 +96,7 @@ index 9836c0c5..39f0f5a1 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 8fe324cf..4cfd8961 100644 +index 5422b7d59..7ff7cc5d4 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -32,6 +32,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -108,7 +108,7 @@ index 8fe324cf..4cfd8961 100644 public final MinecraftServer server; public final PlayerInteractManager playerInteractManager; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 31ead884..9fc484ce 100644 +index 31ead8849..9fc484ce1 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -118,6 +118,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs @@ -155,18 +155,18 @@ index 31ead884..9fc484ce 100644 this.methodProfiler.a("tallying"); // Spigot start diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 8fcf4d9c..7882eaba 100644 +index 7adf5eb87..73cf2e3d8 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java -@@ -339,6 +339,7 @@ public abstract class PlayerList { +@@ -343,6 +343,7 @@ public abstract class PlayerList { } protected void savePlayerFile(EntityPlayer entityplayer) { + entityplayer.lastSave = MinecraftServer.currentTick; // Paper this.playerFileData.save(entityplayer); - ServerStatisticManager serverstatisticmanager = (ServerStatisticManager) this.o.get(entityplayer.getUniqueID()); + ServerStatisticManager serverstatisticmanager = (ServerStatisticManager) entityplayer.getStatisticManager(); // CraftBukkit -@@ -1230,13 +1231,23 @@ public abstract class PlayerList { +@@ -1236,13 +1237,23 @@ public abstract class PlayerList { } @@ -192,7 +192,7 @@ index 8fcf4d9c..7882eaba 100644 public void addWhitelist(GameProfile gameprofile) { this.whitelist.add(new WhiteListEntry(gameprofile)); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 3865b31c..87a95857 100644 +index 3865b31cb..87a95857c 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1050,8 +1050,9 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -215,5 +215,5 @@ index 3865b31c..87a95857 100644 timings.worldSaveChunks.startTiming(); // Paper chunkproviderserver.a(flag); -- -2.13.1.windows.2 +2.13.0 diff --git a/Spigot-Server-Patches/0193-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0193-Enforce-Sync-Player-Saves.patch index ebd48a738..25b980da0 100644 --- a/Spigot-Server-Patches/0193-Enforce-Sync-Player-Saves.patch +++ b/Spigot-Server-Patches/0193-Enforce-Sync-Player-Saves.patch @@ -1,4 +1,4 @@ -From f995493ed9d0b38b87b04a5ddbc99a8651aa53b2 Mon Sep 17 00:00:00 2001 +From 7c95b7c974a7cb9cf8bee918dd8b0e371c65856f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 15:41:58 -0500 Subject: [PATCH] Enforce Sync Player Saves @@ -7,10 +7,10 @@ Saving players async is extremely dangerous. This will force it to main the same way we handle async chunk loads. diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 7882eaba..a988fc8b 100644 +index 73cf2e3d8..206068384 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java -@@ -1237,6 +1237,7 @@ public abstract class PlayerList { +@@ -1243,6 +1243,7 @@ public abstract class PlayerList { } public void savePlayers(Integer interval) { @@ -18,7 +18,7 @@ index 7882eaba..a988fc8b 100644 long now = MinecraftServer.currentTick; MinecraftTimings.savePlayers.startTiming(); // Paper for (int i = 0; i < this.players.size(); ++i) { -@@ -1246,6 +1247,7 @@ public abstract class PlayerList { +@@ -1252,6 +1253,7 @@ public abstract class PlayerList { } } MinecraftTimings.savePlayers.stopTiming(); // Paper @@ -27,5 +27,5 @@ index 7882eaba..a988fc8b 100644 // Paper end -- -2.13.1.windows.2 +2.13.0 diff --git a/Spigot-Server-Patches/0207-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0207-Properly-handle-async-calls-to-restart-the-server.patch index 7d74def6f..485eda178 100644 --- a/Spigot-Server-Patches/0207-Properly-handle-async-calls-to-restart-the-server.patch +++ b/Spigot-Server-Patches/0207-Properly-handle-async-calls-to-restart-the-server.patch @@ -1,4 +1,4 @@ -From edb20e1ceec744ff0fa18400ae98722d87e5ed3c Mon Sep 17 00:00:00 2001 +From 57a80f8590fbad019ad0e95879dc06b101494c83 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 12 May 2017 23:34:11 -0500 Subject: [PATCH] Properly handle async calls to restart the server @@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result in corruption/dataloss. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index eb585818..d84f59da 100644 +index eb5858189..d84f59da1 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -70,6 +70,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs @@ -78,10 +78,10 @@ index eb585818..d84f59da 100644 return this.serverThread; } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index a988fc8b..0c328782 100644 +index 206068384..17c251ba9 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java -@@ -1361,10 +1361,15 @@ public abstract class PlayerList { +@@ -1367,10 +1367,15 @@ public abstract class PlayerList { entityplayer.playerInteractManager.b(world.getWorldData().getGameType()); } @@ -98,7 +98,7 @@ index a988fc8b..0c328782 100644 } // CraftBukkit end // Paper start - Remove collideRule team if it exists -@@ -1375,6 +1380,7 @@ public abstract class PlayerList { +@@ -1381,6 +1386,7 @@ public abstract class PlayerList { } // Paper end } @@ -107,7 +107,7 @@ index a988fc8b..0c328782 100644 // CraftBukkit start public void sendMessage(IChatBaseComponent[] iChatBaseComponents) { diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java -index 49768734..d51636c8 100644 +index 49768734d..d51636c8e 100644 --- a/src/main/java/org/spigotmc/RestartCommand.java +++ b/src/main/java/org/spigotmc/RestartCommand.java @@ -45,88 +45,123 @@ public class RestartCommand extends Command @@ -306,5 +306,5 @@ index 49768734..d51636c8 100644 } } -- -2.13.1.windows.2 +2.13.0 diff --git a/Spigot-Server-Patches/0211-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0211-Use-TerminalConsoleAppender-for-console-improvements.patch index 2c8061f18..bdc118dbe 100644 --- a/Spigot-Server-Patches/0211-Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/Spigot-Server-Patches/0211-Use-TerminalConsoleAppender-for-console-improvements.patch @@ -1,4 +1,4 @@ -From fc1189eaba170bf32e11dc12d0c07a1903e83f5f Mon Sep 17 00:00:00 2001 +From 811b012817d88586fba83c6798297827910ff7fd Mon Sep 17 00:00:00 2001 From: Minecrell Date: Fri, 9 Jun 2017 19:03:43 +0200 Subject: [PATCH] Use TerminalConsoleAppender for console improvements @@ -20,10 +20,10 @@ Other changes: configuration diff --git a/pom.xml b/pom.xml -index 1ddfe7f4..63a1ae2b 100644 +index 4cac7e38e..420a47d94 100644 --- a/pom.xml +++ b/pom.xml -@@ -47,12 +47,6 @@ +@@ -54,12 +54,6 @@ compile @@ -96,7 +96,7 @@ index 1ddfe7f4..63a1ae2b 100644 org.apache.maven.plugins diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java new file mode 100644 -index 00000000..685deaa0 +index 000000000..685deaa0e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java @@ -0,0 +1,17 @@ @@ -119,7 +119,7 @@ index 00000000..685deaa0 +} diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalHandler.java b/src/main/java/com/destroystokyo/paper/console/TerminalHandler.java new file mode 100644 -index 00000000..d5bc6149 +index 000000000..d5bc61490 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/console/TerminalHandler.java @@ -0,0 +1,60 @@ @@ -184,7 +184,7 @@ index 00000000..d5bc6149 + +} diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 2feeb855..3266df1f 100644 +index 2feeb855b..3266df1f5 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -73,7 +73,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -237,7 +237,7 @@ index 2feeb855..3266df1f 100644 System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true)); System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true)); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d84f59da..8ca8fdce 100644 +index d84f59da1..8ca8fdceb 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -41,7 +41,6 @@ import org.apache.commons.lang3.Validate; @@ -296,10 +296,10 @@ index d84f59da..8ca8fdce 100644 public boolean a(int i, String s) { diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index c3c82f1f..9a4357d1 100644 +index 17c251ba9..c47e05c19 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java -@@ -76,8 +76,7 @@ public abstract class PlayerList { +@@ -78,8 +78,7 @@ public abstract class PlayerList { public PlayerList(MinecraftServer minecraftserver) { this.cserver = minecraftserver.server = new CraftServer(minecraftserver, this); @@ -310,7 +310,7 @@ index c3c82f1f..9a4357d1 100644 this.k = new GameProfileBanList(PlayerList.a); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index dbb44d63..12f1bdfc 100644 +index 49a321d5d..aa9b3f1c9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -127,7 +127,6 @@ import io.netty.buffer.ByteBuf; @@ -336,7 +336,7 @@ index dbb44d63..12f1bdfc 100644 @Override public PluginCommand getPluginCommand(String name) { diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index ec9508e9..d3d848f8 100644 +index ec9508e90..d3d848f8c 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -14,7 +14,7 @@ import java.util.logging.Logger; @@ -378,7 +378,7 @@ index ec9508e9..d3d848f8 100644 if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java deleted file mode 100644 -index 26a2fb89..00000000 +index 26a2fb894..000000000 --- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java +++ /dev/null @@ -1,74 +0,0 @@ @@ -457,7 +457,7 @@ index 26a2fb89..00000000 - } -} diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java -index 33e8ea02..1e3aae3b 100644 +index 33e8ea02c..1e3aae3b8 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java @@ -8,17 +8,27 @@ import java.util.logging.Level; @@ -536,7 +536,7 @@ index 33e8ea02..1e3aae3b 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java -index a0cdd231..0a181288 100644 +index a0cdd2317..0a1812883 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java @@ -19,7 +19,7 @@ public class ServerShutdownThread extends Thread { @@ -550,7 +550,7 @@ index a0cdd231..0a181288 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java deleted file mode 100644 -index b6409711..00000000 +index b64097113..000000000 --- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java +++ /dev/null @@ -1,54 +0,0 @@ @@ -609,7 +609,7 @@ index b6409711..00000000 - } -} diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index 5cee8f00..08b6bb7f 100644 +index 5cee8f00e..08b6bb7f9 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -1,12 +1,11 @@ @@ -639,5 +639,5 @@ index 5cee8f00..08b6bb7f 100644 -- -2.13.3.windows.1 +2.13.0 diff --git a/work/Bukkit b/work/Bukkit index c86a051a8..6ed0a976e 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit c86a051a8ee61331cf827c429030ba056fb3aa0d +Subproject commit 6ed0a976e5e8da5599c95eb7e92976f1c839acf1 diff --git a/work/CraftBukkit b/work/CraftBukkit index e03b1a556..3819f8dbe 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit e03b1a556d889f5ad47d53a4157bde75cbbf4764 +Subproject commit 3819f8dbec3b5967b4e242c5a1d57ed6c986b64c diff --git a/work/Spigot b/work/Spigot index 722832861..99c2a3704 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 722832861f0300f0b1e9d9079b0085bca5387ce2 +Subproject commit 99c2a370408a7e4359eb40763b9c4efe8ef68932