diff options
| -rw-r--r-- | Spigot-API-Patches/0001-POM-changes.patch | 14 | ||||
| -rw-r--r-- | Spigot-API-Patches/0002-add-Trove-and-FastUtil-to-Bukkit.patch | 14 | ||||
| -rw-r--r-- | Spigot-API-Patches/0005-Add-getTPS-method.patch | 24 | ||||
| -rw-r--r-- | Spigot-API-Patches/0006-Add-async-chunk-load-API.patch | 14 | ||||
| -rw-r--r-- | Spigot-API-Patches/0033-Add-MetadataStoreBase.removeAll-Plugin.patch | 14 | ||||
| -rw-r--r-- | Spigot-Server-Patches/0001-POM-Changes.patch | 24 | ||||
| -rw-r--r-- | Spigot-Server-Patches/0005-Timings-v2.patch | 65 | ||||
| -rw-r--r-- | Spigot-Server-Patches/0170-update-log4j.patch | 93 | ||||
| -rw-r--r-- | pom.xml | 9 | ||||
| -rwxr-xr-x | scripts/paperclip.sh | 6 | ||||
| m--------- | work/CraftBukkit | 6 | ||||
| m--------- | work/Paperclip | 0 |
12 files changed, 182 insertions, 101 deletions
diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch index 5e8250343b..c429845a63 100644 --- a/Spigot-API-Patches/0001-POM-changes.patch +++ b/Spigot-API-Patches/0001-POM-changes.patch @@ -1,11 +1,11 @@ -From 40a793d76f1bb04ad6d9d6cbbadb2a04024ed1b3 Mon Sep 17 00:00:00 2001 +From 4f79f8dbab91ed42030492c7667fb71b9f7df5c7 Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> Date: Mon, 29 Feb 2016 17:16:08 -0600 Subject: [PATCH] POM changes diff --git a/pom.xml b/pom.xml -index 0ab9e14..79498ae 100644 +index 0ab9e147..79498ae3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,35 +4,37 @@ @@ -67,10 +67,11 @@ index 0ab9e14..79498ae 100644 <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> -@@ -129,26 +132,6 @@ +@@ -128,26 +131,6 @@ + </dependency> </dependencies> </plugin> - <plugin> +- <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>animal-sniffer-maven-plugin</artifactId> - <version>1.14</version> @@ -90,10 +91,9 @@ index 0ab9e14..79498ae 100644 - </signature> - </configuration> - </plugin> -- <plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>2.4.1</version> -- -2.8.2 +2.34.0 diff --git a/Spigot-API-Patches/0002-add-Trove-and-FastUtil-to-Bukkit.patch b/Spigot-API-Patches/0002-add-Trove-and-FastUtil-to-Bukkit.patch index df25c25732..50a38c601e 100644 --- a/Spigot-API-Patches/0002-add-Trove-and-FastUtil-to-Bukkit.patch +++ b/Spigot-API-Patches/0002-add-Trove-and-FastUtil-to-Bukkit.patch @@ -1,17 +1,18 @@ -From 95be64b105c7cc5e412441b55ef5257a9aacb660 Mon Sep 17 00:00:00 2001 +From 1aa9457a8545624da4c45927f2819d00d7e9b90e Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Fri, 1 Apr 2016 00:02:47 -0400 Subject: [PATCH] add Trove and FastUtil to Bukkit diff --git a/pom.xml b/pom.xml -index a03865f..597f65c 100644 +index 79498ae3..35cf290d 100644 --- a/pom.xml +++ b/pom.xml -@@ -48,6 +48,19 @@ +@@ -47,6 +47,19 @@ + </pluginRepositories> <dependencies> - <dependency> ++ <dependency> + <groupId>net.sf.trove4j</groupId> + <artifactId>trove4j</artifactId> + <version>3.0.3</version> @@ -24,10 +25,9 @@ index a03865f..597f65c 100644 + <version>1.0</version> + <scope>provided</scope> + </dependency> -+ <dependency> + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.6</version> -- -2.8.0 +2.34.0 diff --git a/Spigot-API-Patches/0005-Add-getTPS-method.patch b/Spigot-API-Patches/0005-Add-getTPS-method.patch index cd9252ec25..7f89cbd3ed 100644 --- a/Spigot-API-Patches/0005-Add-getTPS-method.patch +++ b/Spigot-API-Patches/0005-Add-getTPS-method.patch @@ -1,17 +1,18 @@ -From f41ba48d012b47e2ea11fae6e58e595e93ba47e1 Mon Sep 17 00:00:00 2001 +From 00ea1e8397cb66553e5fb8b7d5a29ecbaa1a6a36 Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Mon, 29 Feb 2016 17:24:57 -0600 Subject: [PATCH] Add getTPS method diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 85fd9a8..8d602a3 100644 +index 85fd9a83..8d602a3e 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1140,6 +1140,14 @@ public final class Bukkit { +@@ -1139,6 +1139,14 @@ public final class Bukkit { + return server.createBossBar(title, color, style, flags); } - /** ++ /** + * Gets the current server TPS + * @return current server TPS (1m, 5m, 15m in Paper-Server) + */ @@ -19,28 +20,27 @@ index 85fd9a8..8d602a3 100644 + return server.getTPS(); + } + -+ /** + /** * @see UnsafeValues * @return the unsafe values instance - */ diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index f82cbaf..6e23b0c 100644 +index f82cbaf5..6e23b0ce 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -934,6 +934,13 @@ public interface Server extends PluginMessageRecipient { +@@ -933,6 +933,13 @@ public interface Server extends PluginMessageRecipient { + */ BossBar createBossBar(String title, BarColor color, BarStyle style, BarFlag ...flags); - /** ++ /** + * Gets the current server TPS + * + * @return current server TPS (1m, 5m, 15m in Paper-Server) + */ + public double[] getTPS(); + -+ /** + /** * @see UnsafeValues * @return the unsafe values instance - */ -- -2.8.0 +2.34.0 diff --git a/Spigot-API-Patches/0006-Add-async-chunk-load-API.patch b/Spigot-API-Patches/0006-Add-async-chunk-load-API.patch index 28f2d800d8..e19dc40164 100644 --- a/Spigot-API-Patches/0006-Add-async-chunk-load-API.patch +++ b/Spigot-API-Patches/0006-Add-async-chunk-load-API.patch @@ -1,17 +1,18 @@ -From 410427fe9f7aa75592d7ba4aec7cfc78ae868da7 Mon Sep 17 00:00:00 2001 +From dcca0bbf7f9820481d601b754d7e7c80e9c4dc09 Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Mon, 29 Feb 2016 17:43:33 -0600 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 d088c3c..d16facb 100644 +index d088c3c2..d16facb7 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -130,6 +130,78 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -129,6 +129,78 @@ 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,10 +84,9 @@ index d088c3c..d16facb 100644 + */ + public void getChunkAtAsync(Block block, ChunkLoadCallback cb); + -+ /** + /** * Checks if the specified {@link Chunk} is loaded * - * @param chunk The chunk to check -- -2.8.0 +2.34.0 diff --git a/Spigot-API-Patches/0033-Add-MetadataStoreBase.removeAll-Plugin.patch b/Spigot-API-Patches/0033-Add-MetadataStoreBase.removeAll-Plugin.patch index c29bd3cc26..f583512adb 100644 --- a/Spigot-API-Patches/0033-Add-MetadataStoreBase.removeAll-Plugin.patch +++ b/Spigot-API-Patches/0033-Add-MetadataStoreBase.removeAll-Plugin.patch @@ -1,4 +1,4 @@ -From 1e48496f8fce2c543a8bace6a565bce6ccbe1c97 Mon Sep 17 00:00:00 2001 +From 898c2d3dd2134dc3499047ff32cc71b8d95cab9a Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Tue, 16 Jul 2013 21:26:50 -0400 Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin) @@ -6,13 +6,14 @@ Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin) So that on reload, metadata will be cleared diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java -index 64c0f0a..6da6abd 100644 +index 64c0f0a7..6da6abd8 100644 --- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java +++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java -@@ -125,6 +125,26 @@ public abstract class MetadataStoreBase<T> { +@@ -124,6 +124,26 @@ public abstract class MetadataStoreBase<T> { + } } - /** ++ /** + * Removes all metadata in the metadata store that originates from the + * given plugin. + * @@ -32,10 +33,9 @@ index 64c0f0a..6da6abd 100644 + } + } + -+ /** + /** * Creates a unique name for the object receiving metadata by combining * unique data from the subject with a metadataKey. - * <p> -- -2.8.3.windows.1 +2.34.0 diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch index 3ed837a649..b7fefeac13 100644 --- a/Spigot-Server-Patches/0001-POM-Changes.patch +++ b/Spigot-Server-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From 1f44ac1349b9039a365ca63f7ec578fdbc0974ea Mon Sep 17 00:00:00 2001 +From 4739bc1f1d6337e2a5467eabbcfa555b0cd070fb Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> Date: Mon, 29 Feb 2016 20:40:33 -0600 Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml -index 95a9224..00edfb5 100644 +index 91a7135d5..b4f523866 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ @@ -54,7 +54,7 @@ index 95a9224..00edfb5 100644 <version>${project.version}</version> <scope>compile</scope> </dependency> -@@ -93,34 +94,22 @@ +@@ -99,34 +100,22 @@ <!-- This builds a completely 'ready to start' jar with all dependencies inside --> <build> @@ -100,7 +100,7 @@ index 95a9224..00edfb5 100644 </goals> </execution> </executions> -@@ -130,11 +119,12 @@ +@@ -136,11 +125,12 @@ <artifactId>maven-jar-plugin</artifactId> <version>2.6</version> <configuration> @@ -114,10 +114,11 @@ index 95a9224..00edfb5 100644 <Implementation-Vendor>Bukkit Team</Implementation-Vendor> <Specification-Title>Bukkit</Specification-Title> <Specification-Version>${api.version}</Specification-Version> -@@ -164,26 +154,6 @@ +@@ -169,26 +159,6 @@ + </archive> </configuration> </plugin> - <plugin> +- <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>animal-sniffer-maven-plugin</artifactId> - <version>1.14</version> @@ -137,11 +138,10 @@ index 95a9224..00edfb5 100644 - </signature> - </configuration> - </plugin> -- <plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>2.4.1</version> -@@ -194,11 +164,13 @@ +@@ -200,11 +170,13 @@ <goal>shade</goal> </goals> <configuration> @@ -159,7 +159,7 @@ index 95a9224..00edfb5 100644 <relocation> <pattern>jline</pattern> <shadedPattern>org.bukkit.craftbukkit.libs.jline</shadedPattern> -@@ -232,20 +204,6 @@ +@@ -238,20 +210,6 @@ <artifactId>maven-compiler-plugin</artifactId> <!-- versions after this appear to be broken --> <version>3.1</version> @@ -181,7 +181,7 @@ index 95a9224..00edfb5 100644 <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java -index 9304637..674096c 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 { @@ -194,5 +194,5 @@ index 9304637..674096c 100644 if (stream != null) { -- -2.8.3.windows.1 +2.34.0 diff --git a/Spigot-Server-Patches/0005-Timings-v2.patch b/Spigot-Server-Patches/0005-Timings-v2.patch index e9221f27b5..86a40baa54 100644 --- a/Spigot-Server-Patches/0005-Timings-v2.patch +++ b/Spigot-Server-Patches/0005-Timings-v2.patch @@ -1,29 +1,29 @@ -From fb2ea5754f6414174122a0d0186e402a0cbee9ca Mon Sep 17 00:00:00 2001 +From 33e58793766f42ddd9b8d575ac47a4fd1e7e3674 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 00edfb5..79d2171 100644 +index b4f523866..d751230bd 100644 --- a/pom.xml +++ b/pom.xml -@@ -65,6 +65,12 @@ +@@ -70,6 +70,12 @@ + <version>5.1.37</version> <scope>compile</scope> </dependency> - <dependency> ++ <dependency> + <groupId>co.aikar</groupId> + <artifactId>fastutil-lite</artifactId> + <version>1.0</version> + <scope>compile</scope> + </dependency> -+ <dependency> + <dependency> <groupId>net.sf.trove4j</groupId> <artifactId>trove4j</artifactId> - <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 0000000..0f8315c +index 000000000..0f8315cde --- /dev/null +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java @@ -0,0 +1,110 @@ @@ -139,7 +139,7 @@ index 0000000..0f8315c +} 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 0000000..741da72 +index 000000000..741da72e0 --- /dev/null +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java @@ -0,0 +1,85 @@ @@ -229,7 +229,7 @@ index 0000000..741da72 + } +} diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 0468372..7739e78 100644 +index 046837249..7739e7812 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; @@ -273,7 +273,7 @@ index 0468372..7739e78 100644 + } } diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index 8cee6fa..3212255 100644 +index 8cee6fab2..321225557 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -33,6 +33,15 @@ public class Block { @@ -293,7 +293,7 @@ index 8cee6fa..3212255 100644 public static int getId(Block block) { return Block.REGISTRY.a(block); // CraftBukkit - decompile error diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 6750d85..70994d4 100644 +index 6750d85a5..70994d463 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -21,7 +21,7 @@ import java.io.PrintStream; @@ -324,7 +324,7 @@ index 6750d85..70994d4 100644 public boolean aa() { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 6ad99b0..62ada23 100644 +index 6ad99b04e..62ada23da 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -24,7 +24,8 @@ import org.bukkit.block.BlockFace; @@ -363,7 +363,7 @@ index 6ad99b0..62ada23 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 5f84a70..4d7be74 100644 +index 5f84a701c..4d7be74a6 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -26,7 +26,7 @@ import org.bukkit.event.entity.EntityTeleportEvent; @@ -434,7 +434,7 @@ index 5f84a70..4d7be74 100644 } diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java -index 68242d9..2eea1c1 100644 +index 68242d98a..2eea1c198 100644 --- a/src/main/java/net/minecraft/server/EntityTracker.java +++ b/src/main/java/net/minecraft/server/EntityTracker.java @@ -171,7 +171,7 @@ public class EntityTracker { @@ -465,7 +465,7 @@ index 68242d9..2eea1c1 100644 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e17d5d3..8845ad2 100644 +index e17d5d330..8845ad257 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -50,7 +50,7 @@ import org.apache.logging.log4j.Logger; @@ -610,7 +610,7 @@ index e17d5d3..8845ad2 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 b0249ff..797a84f 100644 +index b0249ffc0..797a84f9b 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -1,5 +1,6 @@ @@ -710,7 +710,7 @@ index b0249ff..797a84f 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 0a14dd2..7c52e15 100644 +index 0a14dd21c..7c52e154e 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -57,6 +57,7 @@ import org.bukkit.inventory.CraftingInventory; @@ -758,7 +758,7 @@ index 0a14dd2..7c52e15 100644 // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 0cb2e63..6d4f4e7 100644 +index 0cb2e6334..6d4f4e7ca 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -6,12 +6,13 @@ import javax.annotation.Nullable; @@ -778,7 +778,7 @@ index 0cb2e63..6d4f4e7 100644 private static Map<String, Class<? extends TileEntity>> f = Maps.newHashMap(); private static Map<Class<? extends TileEntity>, String> g = Maps.newHashMap(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 78045c5..7d1272b 100644 +index 78045c5bd..7d1272b3f 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; @@ -884,7 +884,7 @@ index 78045c5..7d1272b 100644 } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index f8ef497..4980c7a 100644 +index f8ef4978e..4980c7a75 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -245,13 +245,13 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -965,10 +965,10 @@ index f8ef497..4980c7a 100644 this.methodProfiler.b(); this.U.clear(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 12156d4..f0db144 100644 +index 12156d4bf..f0db144a6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1726,6 +1726,7 @@ public final class CraftServer implements Server { +@@ -1726,12 +1726,31 @@ public final class CraftServer implements Server { private final Spigot spigot = new Spigot() { @@ -976,10 +976,10 @@ index 12156d4..f0db144 100644 @Override public YamlConfiguration getConfig() { -@@ -1733,6 +1734,24 @@ public final class CraftServer implements Server { + return org.spigotmc.SpigotConfig.config; } - @Override ++ @Override + public YamlConfiguration getBukkitConfig() + { + return configuration; @@ -997,13 +997,12 @@ index 12156d4..f0db144 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 41d2d87..0000000 +index 41d2d87ee..000000000 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java +++ /dev/null @@ -1,173 +0,0 @@ @@ -1181,7 +1180,7 @@ index 41d2d87..0000000 - } -} diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 46882f1..35f6c27 100644 +index 46882f1c1..35f6c2784 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -37,15 +37,9 @@ import org.bukkit.configuration.serialization.DelegateDeserialization; @@ -1215,7 +1214,7 @@ index 46882f1..35f6c27 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 93d8d42..2a22697 100644 +index 93d8d4248..2a2269721 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -186,7 +186,7 @@ public class CraftScheduler implements BukkitScheduler { @@ -1256,7 +1255,7 @@ index 93d8d42..2a22697 100644 task.getOwner().getLogger().log( Level.WARNING, diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java -index 220e39a..afc6c17 100644 +index 220e39abe..afc6c17e6 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 @@ @@ -1338,7 +1337,7 @@ index 220e39a..afc6c17 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 e52ef47..3d90b34 100644 +index e52ef47b7..3d90b3426 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; @@ -1350,7 +1349,7 @@ index e52ef47..3d90b34 100644 this.value = value; } diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index a752376..8870607 100644 +index a75237686..8870607ad 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; @@ -1412,5 +1411,5 @@ index a752376..8870607 100644 } } -- -2.8.3 +2.34.0 diff --git a/Spigot-Server-Patches/0170-update-log4j.patch b/Spigot-Server-Patches/0170-update-log4j.patch new file mode 100644 index 0000000000..c912edfa1e --- /dev/null +++ b/Spigot-Server-Patches/0170-update-log4j.patch @@ -0,0 +1,93 @@ +From b12cef9556678f14d349af0b8b8a2c520b5d0e94 Mon Sep 17 00:00:00 2001 +From: sulu5890 <[email protected]> +Date: Fri, 17 Dec 2021 13:36:28 -0600 +Subject: [PATCH] update log4j + + +diff --git a/pom.xml b/pom.xml +index d751230b..3958ba7a 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -37,7 +37,7 @@ + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> +- <version>2.8.1</version> ++ <version>2.17.0</version> <!-- Paper - update log4j --> + <scope>compile</scope> + </dependency> + <dependency> +@@ -55,7 +55,7 @@ + <dependency> + <groupId>jline</groupId> + <artifactId>jline</artifactId> +- <version>2.12</version> ++ <version>2.12.1</version> <!-- Paper - update log4j --> + <scope>compile</scope> + </dependency> + <dependency> +@@ -99,8 +99,8 @@ + <!-- required until fixed plexus-compiler-eclipse is deployed --> + <pluginRepositories> + <pluginRepository> +- <id>spigotmc-public</id> +- <url>https://hub.spigotmc.org/nexus/content/groups/public/</url> ++ <id>papermc</id> <!-- Paper - update log4j --> ++ <url>https://papermc.io/repo/repository/maven-public/</url> <!-- Paper - update log4j --> + </pluginRepository> + </pluginRepositories> + +@@ -141,6 +141,7 @@ + <Specification-Title>Bukkit</Specification-Title> + <Specification-Version>${api.version}</Specification-Version> + <Specification-Vendor>Bukkit Team</Specification-Vendor> ++ <Multi-Release>true</Multi-Release> <!-- Paper - update log4j --> + </manifestEntries> + <manifestSections> + <manifestSection> +@@ -168,7 +169,7 @@ + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> +- <version>2.4.1</version> ++ <version>3.2.4</version> <!-- Paper - update log4j --> + <executions> + <execution> + <phase>package</phase> +@@ -176,6 +177,16 @@ + <goal>shade</goal> + </goals> + <configuration> ++ <!-- Paper start - update log4j --> ++ <filters> ++ <filter> ++ <artifact>org.spigotmc:minecraft-server:**</artifact> ++ <excludes> ++ <exclude>org/apache/logging/log4j/**</exclude> ++ </excludes> ++ </filter> ++ </filters> ++ <!-- Paper end - update log4j --> + <createDependencyReducedPom>false</createDependencyReducedPom> <!-- Paper --> + <relocations> + <!-- Paper - Workaround for hardcoded path lookup in dependency, easier than forking it - GH-189 --> +diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml +index 0452fbc0..63cb069f 100644 +--- a/src/main/resources/log4j2.xml ++++ b/src/main/resources/log4j2.xml +@@ -3,10 +3,10 @@ + <Appenders> + <Console name="WINDOWS_COMPAT" target="SYSTEM_OUT"></Console> + <Queue name="TerminalConsole"> +- <PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg{nolookups}%n" /> ++ <PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg%n" /> <!-- Paper - update log4j --> + </Queue> + <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz"> +- <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg{nolookups}%n" /> ++ <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" /> <!-- Paper - update log4j --> + <Policies> + <TimeBasedTriggeringPolicy /> + <OnStartupTriggeringPolicy /> +-- +2.34.1 + @@ -1,4 +1,3 @@ - <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -33,12 +32,8 @@ <repositories> <repository> - <id>md_5-releases</id> - <url>http://repo.md-5.net/content/repositories/releases/</url> - </repository> - <repository> - <id>aikar</id> - <url>http://ci.emc.gs/nexus/content/repositories/aikar/</url> + <id>papermc</id> + <url>https://papermc.io/repo/repository/maven-public/</url> </repository> </repositories> diff --git a/scripts/paperclip.sh b/scripts/paperclip.sh index 071fe06cc2..f03d77aeb1 100755 --- a/scripts/paperclip.sh +++ b/scripts/paperclip.sh @@ -5,14 +5,14 @@ set -e basedir="$(cd "$1" && pwd -P)" workdir="$basedir/work" mcver=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4) -paperjar="../../Paper-Server/target/paper-$mcver.jar" -vanillajar="../$mcver/$mcver.jar" +paperjar="$basedir/Paper-Server/target/paper-$mcver.jar" +vanillajar="$workdir/$mcver/$mcver.jar" ( cd "$workdir/Paperclip" mvn clean package "-Dmcver=$mcver" "-Dpaperjar=$paperjar" "-Dvanillajar=$vanillajar" ) -cp "$workdir/Paperclip/target/paperclip-${mcver}.jar" "$basedir/paperclip.jar" +cp "$workdir/Paperclip/assembly/target/paperclip-${mcver}.jar" "$basedir/paperclip.jar" echo "" echo "" diff --git a/work/CraftBukkit b/work/CraftBukkit -Subproject 0cd0397a8295992112ad3bf0d37795a04d22503 +Subproject e1d3516bef9fb294689c3a859b828af54d0f883 diff --git a/work/Paperclip b/work/Paperclip -Subproject e22721a1aa7f7aca95175cb1430a583f202b757 +Subproject 2d4c7b3bbd322d8b7f3bbe2fe33ecf627251c82 |