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/0032-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 | 79 | ||||
| -rw-r--r-- | Spigot-Server-Patches/0184-Don-t-process-packets-from-offline-players.patch | 8 | ||||
| -rw-r--r-- | Spigot-Server-Patches/0185-update-log4j.patch | 93 | ||||
| -rw-r--r-- | pom.xml | 12 | ||||
| -rwxr-xr-x | scripts/paperclip.sh | 6 | ||||
| m--------- | work/CraftBukkit | 6 | ||||
| m--------- | work/Paperclip | 0 |
13 files changed, 193 insertions, 115 deletions
diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch index a18a62e0be..1b2e3155b7 100644 --- a/Spigot-API-Patches/0001-POM-changes.patch +++ b/Spigot-API-Patches/0001-POM-changes.patch @@ -1,11 +1,11 @@ -From d2964723ffed5f0bbf1fef361f554666b43d53e7 Mon Sep 17 00:00:00 2001 +From 9adc816d4a4214efb78ec4db9354eb5cb4f9bbe0 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 217ce0b..8f0fb79 100644 +index 217ce0b9..8f0fb798 100644 --- a/pom.xml +++ b/pom.xml @@ -4,35 +4,37 @@ @@ -95,10 +95,11 @@ index 217ce0b..8f0fb79 100644 <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> -@@ -129,26 +146,6 @@ +@@ -128,26 +145,6 @@ + </dependency> </dependencies> </plugin> - <plugin> +- <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>animal-sniffer-maven-plugin</artifactId> - <version>1.14</version> @@ -118,10 +119,9 @@ index 217ce0b..8f0fb79 100644 - </signature> - </configuration> - </plugin> -- <plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>2.4.1</version> -- -2.10.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 da70825a68..e2311bce3c 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 68c630ca51baec9eb6c20b206e7119fd72c9c854 Mon Sep 17 00:00:00 2001 +From 7384d452c0f322347e136d54a34373c148a8a8cc 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 46df34d..5e5e5e4 100644 +index 8f0fb798..a2515c28 100644 --- a/pom.xml +++ b/pom.xml -@@ -55,6 +55,19 @@ +@@ -54,6 +54,19 @@ + </repositories> <dependencies> - <dependency> ++ <dependency> + <groupId>net.sf.trove4j</groupId> + <artifactId>trove4j</artifactId> + <version>3.0.3</version> @@ -24,10 +25,9 @@ index 46df34d..5e5e5e4 100644 + <version>1.0</version> + <scope>provided</scope> + </dependency> -+ <dependency> + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.6</version> -- -2.9.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 ab8c17c677..d4739b1d65 100644 --- a/Spigot-API-Patches/0005-Add-getTPS-method.patch +++ b/Spigot-API-Patches/0005-Add-getTPS-method.patch @@ -1,17 +1,18 @@ -From 5c2caa3ee27bbd84914df4a001cfb7bcb528b3a2 Mon Sep 17 00:00:00 2001 +From 89bf27993307d5c147a030e8736f656aa6c42a83 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.9.2.windows.1 +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 77a7cb65c7..f61836b5ea 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 90daaa2067899aa0bea025e45ee3e98ad862275a Mon Sep 17 00:00:00 2001 +From 2baad952536f2c0fd477dda9004f0fab7c49fbee 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 339afe4..ce92fef 100644 +index 0d48c9f0..1d4ece89 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -135,6 +135,78 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -134,6 +134,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 339afe4..ce92fef 100644 + */ + public void getChunkAtAsync(Block block, ChunkLoadCallback cb); + -+ /** + /** * Checks if the specified {@link Chunk} is loaded * - * @param chunk The chunk to check -- -2.9.2.windows.1 +2.34.0 diff --git a/Spigot-API-Patches/0032-Add-MetadataStoreBase.removeAll-Plugin.patch b/Spigot-API-Patches/0032-Add-MetadataStoreBase.removeAll-Plugin.patch index c19c3a63d4..f133df538b 100644 --- a/Spigot-API-Patches/0032-Add-MetadataStoreBase.removeAll-Plugin.patch +++ b/Spigot-API-Patches/0032-Add-MetadataStoreBase.removeAll-Plugin.patch @@ -1,4 +1,4 @@ -From 804562f99c8f2bf6b5d9937d5a7816974c716502 Mon Sep 17 00:00:00 2001 +From a74caf7bb6b8a4a4bb552ec8507b778c1c510375 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.9.2.windows.1 +2.34.0 diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch index 1e97a19242..5c74121aca 100644 --- a/Spigot-Server-Patches/0001-POM-Changes.patch +++ b/Spigot-Server-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From 888d6c40c7160d46ca8a0f64c5c0eda4129a841a Mon Sep 17 00:00:00 2001 +From b16716a7423c64afa6cd15e3070ba9574e7a4341 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 5dfa5b6..4ae34c8 100644 +index 354d256c2..d0a5c6351 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ @@ -54,7 +54,7 @@ index 5dfa5b6..4ae34c8 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 5dfa5b6..4ae34c8 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 5dfa5b6..4ae34c8 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 5dfa5b6..4ae34c8 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 5dfa5b6..4ae34c8 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 5dfa5b6..4ae34c8 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.9.0 +2.34.0 diff --git a/Spigot-Server-Patches/0005-Timings-v2.patch b/Spigot-Server-Patches/0005-Timings-v2.patch index ef7bd986b9..7b09f4cdcb 100644 --- a/Spigot-Server-Patches/0005-Timings-v2.patch +++ b/Spigot-Server-Patches/0005-Timings-v2.patch @@ -1,29 +1,29 @@ -From cc65e1b66b14dc2f2ef8ee68689bdee6201c1fd0 Mon Sep 17 00:00:00 2001 +From 398cecff8974e34d74881b9f13977d35999d5279 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 4ae34c8..63aaa7a 100644 +index d0a5c6351..1f518dd2d 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..29838de +index 000000000..29838de47 --- /dev/null +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java @@ -0,0 +1,114 @@ @@ -143,7 +143,7 @@ index 0000000..29838de +} 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 0000000..2bf5b66 +index 000000000..2bf5b662c --- /dev/null +++ b/src/main/java/co/aikar/timings/TimedChunkGenerator.java @@ -0,0 +1,126 @@ @@ -275,7 +275,7 @@ index 0000000..2bf5b66 +} 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..e778911 +index 000000000..e7789117b --- /dev/null +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java @@ -0,0 +1,101 @@ @@ -381,7 +381,7 @@ index 0000000..e778911 + } +} diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 3d0a005..f509bed 100644 +index 3d0a00512..f509bed8a 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; @@ -425,7 +425,7 @@ index 3d0a005..f509bed 100644 + } } diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index a106e44..d17160a 100644 +index a106e4452..d17160af2 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 { @@ -445,7 +445,7 @@ index a106e44..d17160a 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 b651edc..5807bb8 100644 +index b651edc5e..5807bb8ce 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 { @@ -493,7 +493,7 @@ index b651edc..5807bb8 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 5682f03..1380815 100644 +index 5682f03c0..13808152c 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -194,7 +194,7 @@ public class ChunkProviderServer implements IChunkProvider { @@ -515,7 +515,7 @@ index 5682f03..1380815 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 f604639..17dd7bb 100644 +index f604639f4..17dd7bb41 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -394,7 +394,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { @@ -555,7 +555,7 @@ index f604639..17dd7bb 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 11a49a3..e70d5c5 100644 +index 11a49a3c9..e70d5c53a 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; @@ -586,7 +586,7 @@ index 11a49a3..e70d5c5 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 6434566..1409faa 100644 +index 6434566a4..1409faa00 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; @@ -625,7 +625,7 @@ index 6434566..1409faa 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 365b61d..0a583bc 100644 +index 365b61d99..0a583bc3d 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; @@ -696,7 +696,7 @@ index 365b61d..0a583bc 100644 } diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java -index 5432e70..72cd51a 100644 +index 5432e70b1..72cd51abe 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 { @@ -727,7 +727,7 @@ index 5432e70..72cd51a 100644 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 26f8467..4814643 100644 +index 26f846725..481464326 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -45,7 +45,7 @@ import org.bukkit.Bukkit; @@ -869,7 +869,7 @@ index 26f8467..4814643 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 @@ @@ -969,7 +969,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 29f0062..d910c41 100644 +index 29f00627b..d910c4189 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; @@ -1017,7 +1017,7 @@ index 29f0062..d910c41 100644 // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 7090262..2e418a7 100644 +index 7090262d4..2e418a7c4 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1,5 +1,6 @@ @@ -1041,7 +1041,7 @@ index 7090262..2e418a7 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 8dd434c..c965af1 100644 +index 8dd434c4d..c965af1e7 100644 --- a/src/main/java/net/minecraft/server/StructureGenerator.java +++ b/src/main/java/net/minecraft/server/StructureGenerator.java @@ -1,5 +1,7 @@ @@ -1083,7 +1083,7 @@ index 8dd434c..c965af1 100644 return flag; } diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 42f37df..2b82312 100644 +index 42f37dfc0..2b8231224 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; @@ -1103,7 +1103,7 @@ index 42f37df..2b82312 100644 private static final Map<String, Class<? extends TileEntity>> f = Maps.newHashMap(); private static final 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 e649435..b73f64e 100644 +index e64943591..b73f64ee9 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; @@ -1209,7 +1209,7 @@ index e649435..b73f64e 100644 } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 50fad7c..3d98392 100644 +index 50fad7cd6..3d9839289 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -246,13 +246,13 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -1342,10 +1342,10 @@ index 50fad7c..3d98392 100644 // CraftBukkit start diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e7e9941..5f2a9b0 100644 +index e7e994139..5f2a9b087 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1727,6 +1727,7 @@ public final class CraftServer implements Server { +@@ -1727,12 +1727,31 @@ public final class CraftServer implements Server { private final Spigot spigot = new Spigot() { @@ -1353,10 +1353,10 @@ index e7e9941..5f2a9b0 100644 @Override public YamlConfiguration getConfig() { -@@ -1734,6 +1735,24 @@ public final class CraftServer implements Server { + return org.spigotmc.SpigotConfig.config; } - @Override ++ @Override + public YamlConfiguration getBukkitConfig() + { + return configuration; @@ -1374,13 +1374,12 @@ index e7e9941..5f2a9b0 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 @@ @@ -1558,7 +1557,7 @@ index 41d2d87..0000000 - } -} diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java -index 3a95b44..b5efb9c 100644 +index 3a95b4465..b5efb9c3f 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 @@ @@ -1602,7 +1601,7 @@ index 3a95b44..b5efb9c 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 4e3b8fc..8ee4fc4 100644 +index 80cafee86..a21259701 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; @@ -1636,7 +1635,7 @@ index 4e3b8fc..8ee4fc4 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 92d217b..198c37c 100644 +index 92d217bce..198c37c3c 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -189,7 +189,7 @@ public class CraftScheduler implements BukkitScheduler { @@ -1677,7 +1676,7 @@ index 92d217b..198c37c 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 @@ @@ -1759,7 +1758,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; @@ -1771,7 +1770,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 30efc99..eb30abe 100644 +index 30efc9937..eb30abe97 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; @@ -1833,5 +1832,5 @@ index 30efc99..eb30abe 100644 } } -- -2.9.3 +2.34.0 diff --git a/Spigot-Server-Patches/0184-Don-t-process-packets-from-offline-players.patch b/Spigot-Server-Patches/0184-Don-t-process-packets-from-offline-players.patch index 6ff3eb7e12..e985cb3a1d 100644 --- a/Spigot-Server-Patches/0184-Don-t-process-packets-from-offline-players.patch +++ b/Spigot-Server-Patches/0184-Don-t-process-packets-from-offline-players.patch @@ -1,11 +1,11 @@ -From 87366b9912d670dc827854b9f83456f5f61cbef0 Mon Sep 17 00:00:00 2001 -From: From: Alfie Cleveland <[email protected]> +From 440a5d1b8f3e5356c9ead921f7a6059fdf028790 Mon Sep 17 00:00:00 2001 +From: "From: Alfie Cleveland" <[email protected]> Date: Mon, 28 Nov 2016 15:56:28 -0600 Subject: [PATCH] Don't process packets from offline players diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 301313b..865c1a2 100644 +index 301313b1f..865c1a295 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -14,6 +14,7 @@ import javax.annotation.Nullable; @@ -26,5 +26,5 @@ index 301313b..865c1a2 100644 public void closeInventory() { -- -2.10.2 +2.34.0 diff --git a/Spigot-Server-Patches/0185-update-log4j.patch b/Spigot-Server-Patches/0185-update-log4j.patch new file mode 100644 index 0000000000..5be1703d11 --- /dev/null +++ b/Spigot-Server-Patches/0185-update-log4j.patch @@ -0,0 +1,93 @@ +From b5c599702cf865e727ccfcbf4b68c80d2de0fc07 Mon Sep 17 00:00:00 2001 +From: sulu5890 <[email protected]> +Date: Fri, 17 Dec 2021 13:52:11 -0600 +Subject: [PATCH] update log4j + + +diff --git a/pom.xml b/pom.xml +index 1f518dd2..7dbe9281 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> + <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 c99aedb4..20bb83ac 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 + @@ -33,16 +33,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/groups/aikar/</url> - </repository> - <repository> - <id>destroystokyo-releases</id> - <url>https://repo.destroystokyo.com/repository/maven-releases/</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 51263e97187a84338f89698eef187284055a682 +Subproject e669d325d7341741efa8a2a15347235b823aeb5 diff --git a/work/Paperclip b/work/Paperclip -Subproject d7ab8f9438db1dbe544eaf643bde7b25a029f3c +Subproject 2d4c7b3bbd322d8b7f3bbe2fe33ecf627251c82 |