From e70452db81ae88c09992556c491057f25bedd926 Mon Sep 17 00:00:00 2001 From: Zach Brown <1254957+zachbr@users.noreply.github.com> Date: Fri, 11 Aug 2017 17:59:44 -0500 Subject: [PATCH] Remove null values in TileEntity tick list Because who wouldn't want to tick a null tile entity right? Fixes GH-851 --- ...d-MetadataStoreBase.removeAll-Plugin.patch | 6 +- .../Add-async-chunk-load-API.patch | 8 +-- .../Add-source-to-PlayerExpChangeEvent.patch | 5 +- Spigot-API-Patches/POM-changes.patch | 6 +- .../add-Trove-and-FastUtil-to-Bukkit.patch | 8 +-- .../Fix-MC-117075-TE-Unload-Lag-Spike.patch | 10 ++- .../String-based-Action-Bar-API.patch | 8 +-- Spigot-Server-Patches/Timings-v2.patch | 65 +++++++++---------- ...oleAppender-for-console-improvements.patch | 32 ++++----- 9 files changed, 75 insertions(+), 73 deletions(-) diff --git a/Spigot-API-Patches/Add-MetadataStoreBase.removeAll-Plugin.patch b/Spigot-API-Patches/Add-MetadataStoreBase.removeAll-Plugin.patch index e299a0af46..922477bd6a 100644 --- a/Spigot-API-Patches/Add-MetadataStoreBase.removeAll-Plugin.patch +++ b/Spigot-API-Patches/Add-MetadataStoreBase.removeAll-Plugin.patch @@ -10,9 +10,10 @@ index 64c0f0a7..6da6abd8 100644 --- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java +++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java @@ -0,0 +0,0 @@ public abstract class MetadataStoreBase { + } } - /** ++ /** + * Removes all metadata in the metadata store that originates from the + * given plugin. + * @@ -32,8 +33,7 @@ index 64c0f0a7..6da6abd8 100644 + } + } + -+ /** + /** * Creates a unique name for the object receiving metadata by combining * unique data from the subject with a metadataKey. - *

-- \ No newline at end of file diff --git a/Spigot-API-Patches/Add-async-chunk-load-API.patch b/Spigot-API-Patches/Add-async-chunk-load-API.patch index c148b35efc..a2e65dcfb8 100644 --- a/Spigot-API-Patches/Add-async-chunk-load-API.patch +++ b/Spigot-API-Patches/Add-async-chunk-load-API.patch @@ -5,13 +5,14 @@ Subject: [PATCH] Add async chunk load API diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +index 67b0d516..21b2733f 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable { + */ public Chunk getChunkAt(Block block); - /** ++ /** + * Used by {@link World#getChunkAtAsync(Location,ChunkLoadCallback)} methods + * to request a {@link Chunk} to be loaded, with this callback receiving + * the chunk when it is finished. @@ -83,8 +84,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + */ + public void getChunkAtAsync(Block block, ChunkLoadCallback cb); + -+ /** + /** * Checks if the specified {@link Chunk} is loaded * - * @param chunk The chunk to check -- \ No newline at end of file diff --git a/Spigot-API-Patches/Add-source-to-PlayerExpChangeEvent.patch b/Spigot-API-Patches/Add-source-to-PlayerExpChangeEvent.patch index 6b6b159745..6a464a6b10 100644 --- a/Spigot-API-Patches/Add-source-to-PlayerExpChangeEvent.patch +++ b/Spigot-API-Patches/Add-source-to-PlayerExpChangeEvent.patch @@ -37,7 +37,7 @@ index f37491d7..30882559 100644 exp = expAmount; } - /** ++ /** + * Get the source that provided the experience. + * + * @return The source of the experience @@ -48,8 +48,7 @@ index f37491d7..30882559 100644 + } + // Paper end + -+ /** + /** * Get the amount of experience the player will receive * - * @return The amount of experience -- \ No newline at end of file diff --git a/Spigot-API-Patches/POM-changes.patch b/Spigot-API-Patches/POM-changes.patch index 67d696a04e..aebb0a42c9 100644 --- a/Spigot-API-Patches/POM-changes.patch +++ b/Spigot-API-Patches/POM-changes.patch @@ -106,9 +106,10 @@ index 31b8f93e..360d2f08 100644 org.apache.maven.plugins @@ -0,0 +0,0 @@ + - +- - org.codehaus.mojo - animal-sniffer-maven-plugin - 1.15 @@ -128,10 +129,9 @@ index 31b8f93e..360d2f08 100644 - - - -- + org.apache.maven.plugins maven-shade-plugin - 3.0.0 @@ -0,0 +0,0 @@ diff --git a/Spigot-API-Patches/add-Trove-and-FastUtil-to-Bukkit.patch b/Spigot-API-Patches/add-Trove-and-FastUtil-to-Bukkit.patch index 85c287fcaf..584e0768f6 100644 --- a/Spigot-API-Patches/add-Trove-and-FastUtil-to-Bukkit.patch +++ b/Spigot-API-Patches/add-Trove-and-FastUtil-to-Bukkit.patch @@ -5,13 +5,14 @@ Subject: [PATCH] add Trove and FastUtil to Bukkit diff --git a/pom.xml b/pom.xml -index 07143b46..1e57d386 100644 +index 360d2f08..c6bdf44e 100644 --- a/pom.xml +++ b/pom.xml @@ -0,0 +0,0 @@ + - ++ + net.sf.trove4j + trove4j + 3.0.3 @@ -24,8 +25,7 @@ index 07143b46..1e57d386 100644 + 1.0 + provided + -+ + commons-lang commons-lang - 2.6 -- \ No newline at end of file diff --git a/Spigot-Server-Patches/Fix-MC-117075-TE-Unload-Lag-Spike.patch b/Spigot-Server-Patches/Fix-MC-117075-TE-Unload-Lag-Spike.patch index 21f00acc96..79a3db2cf3 100644 --- a/Spigot-Server-Patches/Fix-MC-117075-TE-Unload-Lag-Spike.patch +++ b/Spigot-Server-Patches/Fix-MC-117075-TE-Unload-Lag-Spike.patch @@ -40,7 +40,7 @@ index 23944088..e8d1a1c6 100644 return (long) i & 4294967295L | ((long) j & 4294967295L) << 32; } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 12938b9f..7e0ba4b2 100644 +index 12938b9f..e4fd7fa7 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess { @@ -74,7 +74,11 @@ index 12938b9f..7e0ba4b2 100644 + + private void removeTileEntitiesForRemovedChunks() { + if (!this.tileEntitiesChunkToBeRemoved.isEmpty()) { -+ java.util.function.Predicate isInChunk = (tileEntity) -> { ++ java.util.function.Predicate isInChunkOrNull = (tileEntity) -> { ++ if (tileEntity == null) { ++ return true; ++ } ++ + BlockPosition tilePos = tileEntity.getPosition(); + long tileChunkPos = net.minecraft.server.ChunkCoordIntPair.asLong(tilePos.getX() >> 4, tilePos.getZ() >> 4); + final boolean willRemove = this.tileEntitiesChunkToBeRemoved.contains(tileChunkPos); @@ -90,7 +94,7 @@ index 12938b9f..7e0ba4b2 100644 + return willRemove; + }; + -+ this.tileEntityListTick.removeIf(isInChunk); ++ this.tileEntityListTick.removeIf(isInChunkOrNull); + this.tileEntitiesChunkToBeRemoved.clear(); + } + } diff --git a/Spigot-Server-Patches/String-based-Action-Bar-API.patch b/Spigot-Server-Patches/String-based-Action-Bar-API.patch index 7a4d06fef4..a9f43933e3 100644 --- a/Spigot-Server-Patches/String-based-Action-Bar-API.patch +++ b/Spigot-Server-Patches/String-based-Action-Bar-API.patch @@ -62,13 +62,14 @@ index 1159eea1..38359517 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 2569f0b7..28e00da3 100644 +index b65ac0c7..005c8a00 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player { + } // Paper start - @Override ++ @Override + public void sendActionBar(String message) { + if (getHandle().playerConnection == null || message == null || message.isEmpty()) return; + getHandle().playerConnection.sendPacket(new PacketPlayOutChat(new ChatComponentText(message), ChatMessageType.GAME_INFO)); @@ -80,8 +81,7 @@ index 2569f0b7..28e00da3 100644 + sendActionBar(org.bukkit.ChatColor.translateAlternateColorCodes(alternateChar, message)); + } + -+ @Override + @Override public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) { PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter(); - packet.header = header; -- \ No newline at end of file diff --git a/Spigot-Server-Patches/Timings-v2.patch b/Spigot-Server-Patches/Timings-v2.patch index 94ecd6bf99..22e29b7437 100644 --- a/Spigot-Server-Patches/Timings-v2.patch +++ b/Spigot-Server-Patches/Timings-v2.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2 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..1b33390de +index 00000000..1b33390d --- /dev/null +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java @@ -0,0 +0,0 @@ @@ -137,7 +137,7 @@ index 000000000..1b33390de +} 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..089154f62 +index 00000000..089154f6 --- /dev/null +++ b/src/main/java/co/aikar/timings/TimedChunkGenerator.java @@ -0,0 +0,0 @@ @@ -274,7 +274,7 @@ index 000000000..089154f62 +} 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 +0,0 @@ @@ -380,7 +380,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 5ab2cf6ee..b5795b6d3 100644 +index 5ab2cf6e..b5795b6d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -0,0 +0,0 @@ import java.util.concurrent.TimeUnit; @@ -424,7 +424,7 @@ index 5ab2cf6ee..b5795b6d3 100644 + } } diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index 2dca6dbcb..352310960 100644 +index 2dca6dbc..35231096 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -0,0 +0,0 @@ public class Block { @@ -444,7 +444,7 @@ index 2dca6dbcb..352310960 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 d268fec39..52f6242d7 100644 +index d268fec3..52f6242d 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -0,0 +0,0 @@ public class Chunk { @@ -492,7 +492,7 @@ index d268fec39..52f6242d7 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 9dcab42de..c1b0d6cea 100644 +index 9dcab42d..c1b0d6ce 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider { @@ -514,7 +514,7 @@ index 9dcab42de..c1b0d6cea 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 9655a3ceb..cdb0b1342 100644 +index 9655a3ce..cdb0b134 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -0,0 +0,0 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { @@ -554,7 +554,7 @@ index 9655a3ceb..cdb0b1342 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 6f63a5a1d..3b8425915 100644 +index 6f63a5a1..3b842591 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -0,0 +0,0 @@ import java.io.PrintStream; @@ -607,7 +607,7 @@ index 6f63a5a1d..3b8425915 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 c2da96eaf..6d47f384a 100644 +index c2da96ea..6d47f384 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -0,0 +0,0 @@ import org.bukkit.block.BlockFace; @@ -646,7 +646,7 @@ index c2da96eaf..6d47f384a 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 27580a938..35812d561 100644 +index 27580a93..35812d56 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -0,0 +0,0 @@ import org.bukkit.event.entity.EntityTeleportEvent; @@ -717,7 +717,7 @@ index 27580a938..35812d561 100644 } diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java -index 284d1204d..3aab54206 100644 +index 284d1204..3aab5420 100644 --- a/src/main/java/net/minecraft/server/EntityTracker.java +++ b/src/main/java/net/minecraft/server/EntityTracker.java @@ -0,0 +0,0 @@ public class EntityTracker { @@ -748,7 +748,7 @@ index 284d1204d..3aab54206 100644 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index da9ad6037..5b5c143b0 100644 +index da9ad603..5b5c143b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -0,0 +0,0 @@ import org.bukkit.Bukkit; @@ -895,7 +895,7 @@ index da9ad6037..5b5c143b0 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 eeac34998..e4ed2e991 100644 +index eeac3499..e4ed2e99 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -0,0 +0,0 @@ @@ -995,7 +995,7 @@ index eeac34998..e4ed2e991 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index b679b1363..03bbac737 100644 +index b679b136..03bbac73 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -0,0 +0,0 @@ import org.bukkit.inventory.CraftingInventory; @@ -1043,7 +1043,7 @@ index b679b1363..03bbac737 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 @@ -0,0 +0,0 @@ @@ -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 c00aee885..b3356b40f 100644 +index c00aee88..b3356b40 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -0,0 +0,0 @@ @@ -1097,7 +1097,7 @@ index c00aee885..b3356b40f 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 74e3f42cd..2580a4cf6 100644 +index 74e3f42c..2580a4cf 100644 --- a/src/main/java/net/minecraft/server/StructureGenerator.java +++ b/src/main/java/net/minecraft/server/StructureGenerator.java @@ -0,0 +0,0 @@ @@ -1139,7 +1139,7 @@ index 74e3f42cd..2580a4cf6 100644 return flag; } diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 5a5a588e7..d2d4ff6fb 100644 +index 5a5a588e..d2d4ff6f 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -0,0 +0,0 @@ import javax.annotation.Nullable; @@ -1159,7 +1159,7 @@ index 5a5a588e7..d2d4ff6fb 100644 private static final RegistryMaterials> 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 1096c6c66..f06b82ec5 100644 +index 1096c6c6..f06b82ec 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -0,0 +0,0 @@ import com.google.common.collect.Maps; @@ -1265,7 +1265,7 @@ index 1096c6c66..f06b82ec5 100644 public boolean b(AxisAlignedBB axisalignedbb) { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 8afe1d3d3..00b093976 100644 +index 8afe1d3d..00b09397 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -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 ec98b3a02..63bbcf0b1 100644 +index ec98b3a0..63bbcf0b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -0,0 +0,0 @@ public final class CraftServer implements Server { @@ -1410,10 +1410,10 @@ index ec98b3a02..63bbcf0b1 100644 @Override public YamlConfiguration getConfig() { -@@ -0,0 +0,0 @@ public final class CraftServer implements Server { + return org.spigotmc.SpigotConfig.config; } - @Override ++ @Override + public YamlConfiguration getBukkitConfig() + { + return configuration; @@ -1431,13 +1431,12 @@ index ec98b3a02..63bbcf0b1 100644 + return com.destroystokyo.paper.PaperConfig.config; + } + -+ @Override + @Override public void restart() { org.spigotmc.RestartCommand.restart(); - } 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 311a2c3f6..000000000 +index 311a2c3f..00000000 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java +++ /dev/null @@ -0,0 +0,0 @@ @@ -1616,7 +1615,7 @@ index 311a2c3f6..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 @@ -0,0 +0,0 @@ @@ -1660,7 +1659,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 ca138fa65..d38900887 100644 +index ca138fa6..d3890088 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -0,0 +0,0 @@ import org.bukkit.configuration.serialization.DelegateDeserialization; @@ -1686,7 +1685,7 @@ index ca138fa65..d38900887 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 27725b20e..19adb77b5 100644 +index 27725b20..19adb77b 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -0,0 +0,0 @@ import java.util.concurrent.atomic.AtomicInteger; @@ -1762,7 +1761,7 @@ index 27725b20e..19adb77b5 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 @@ -0,0 +0,0 @@ @@ -1844,7 +1843,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 @@ -0,0 +0,0 @@ import org.bukkit.util.CachedServerIcon; @@ -1856,7 +1855,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 2bd690fdf..38be7ed71 100644 +index 2bd690fd..38be7ed7 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -0,0 +0,0 @@ import net.minecraft.server.EntityWither; diff --git a/Spigot-Server-Patches/Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/Use-TerminalConsoleAppender-for-console-improvements.patch index 11abdf0464..11133a1370 100644 --- a/Spigot-Server-Patches/Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/Spigot-Server-Patches/Use-TerminalConsoleAppender-for-console-improvements.patch @@ -20,22 +20,22 @@ Other changes: configuration diff --git a/pom.xml b/pom.xml -index 7f6f7fe84..d36611644 100644 +index 7f6f7fe8..d3661164 100644 --- a/pom.xml +++ b/pom.xml @@ -0,0 +0,0 @@ + 5.0.4 compile - +- - jline - jline - 2.12.1 - compile - -- + org.xerial sqlite-jdbc - 3.19.3 @@ -0,0 +0,0 @@ 3.0.3 compile @@ -96,7 +96,7 @@ index 7f6f7fe84..d36611644 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 000000000..685deaa0e +index 00000000..685deaa0 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java @@ -0,0 +0,0 @@ @@ -119,7 +119,7 @@ index 000000000..685deaa0e +} 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 000000000..d5bc61490 +index 00000000..d5bc6149 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/console/TerminalHandler.java @@ -0,0 +0,0 @@ @@ -184,7 +184,7 @@ index 000000000..d5bc61490 + +} diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 3b8425915..059f6b6b5 100644 +index 3b842591..059f6b6b 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -0,0 +0,0 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -237,7 +237,7 @@ index 3b8425915..059f6b6b5 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 a4f44b39b..ea2c57137 100644 +index a4f44b39..ea2c5713 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -0,0 +0,0 @@ import org.apache.commons.lang3.Validate; @@ -296,7 +296,7 @@ index a4f44b39b..ea2c57137 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 b8a0b67a9..ebca377e5 100644 +index b8a0b67a..ebca377e 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -0,0 +0,0 @@ public abstract class PlayerList { @@ -310,7 +310,7 @@ index b8a0b67a9..ebca377e5 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 444f28019..9c0b3c60e 100644 +index 444f2801..9c0b3c60 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -0,0 +0,0 @@ import io.netty.buffer.ByteBuf; @@ -336,7 +336,7 @@ index 444f28019..9c0b3c60e 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 ec9508e90..d3d848f8c 100644 +index ec9508e9..d3d848f8 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -0,0 +0,0 @@ import java.util.logging.Logger; @@ -378,7 +378,7 @@ index ec9508e90..d3d848f8c 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 26a2fb894..000000000 +index 26a2fb89..00000000 --- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java +++ /dev/null @@ -0,0 +0,0 @@ @@ -457,7 +457,7 @@ index 26a2fb894..000000000 - } -} diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java -index 33e8ea02c..1e3aae3b8 100644 +index 33e8ea02..1e3aae3b 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java @@ -0,0 +0,0 @@ import java.util.logging.Level; @@ -536,7 +536,7 @@ index 33e8ea02c..1e3aae3b8 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java -index a0cdd2317..0a1812883 100644 +index a0cdd231..0a181288 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java @@ -0,0 +0,0 @@ public class ServerShutdownThread extends Thread { @@ -550,7 +550,7 @@ index a0cdd2317..0a1812883 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 b64097113..000000000 +index b6409711..00000000 --- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java +++ /dev/null @@ -0,0 +0,0 @@ @@ -609,7 +609,7 @@ index b64097113..000000000 - } -} diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index 5cee8f00e..08b6bb7f9 100644 +index 5cee8f00..08b6bb7f 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -0,0 +0,0 @@