From 4b8997f4b5ff5f0a4cc588220e72339cbdcc2319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Sat, 18 Apr 2020 18:00:20 +0800 Subject: [PATCH] get rid of current-paper; update options of format-patch --- current-paper | 1 - patches/api/0001-POM-Changes.patch | 7 +--- .../api/0002-Add-server-configuration.patch | 9 ++-- ...ix-errors-on-editors-and-add-ignores.patch | 11 ++--- patches/server/0002-Akarin-POM-changes.patch | 9 ++-- .../server/0003-Akarin-configuration.patch | 15 +++---- .../server/0004-Akarin-brand-changes.patch | 11 ++--- patches/server/0005-Akarin-Metrics.patch | 7 +--- patches/server/0006-Disable-the-Snooper.patch | 7 +--- ...le-I-O-operation-on-load-player-file.patch | 7 +--- ...otable-Refresh-for-non-player-intera.patch | 7 +--- ...009-Never-drop-items-on-command-give.patch | 7 +--- .../0010-Save-Json-list-asynchronously.patch | 7 +--- ...0011-Remove-vanilla-profiler-callers.patch | 41 +++++++++---------- .../0012-Asynchronous-pathfinding.patch | 17 ++++---- .../0013-Optimizations-for-network.patch | 35 ++++++++-------- ...aps-the-predicate-order-of-collision.patch | 7 +--- ...yDeque-for-pendingChunkUpdates-in-Ch.patch | 7 +--- ...ity-Optimise-ArraySetSorted-removeIf.patch | 7 +--- ...-entity-collision-code-if-not-needed.patch | 7 +--- ...imize-door-interact-with-pathfinding.patch | 11 ++--- ...019-Remove-stream-for-ender-teleport.patch | 7 +--- ...020-Cache-hashcode-for-BlockPosition.patch | 9 ++-- ...and-simplify-operation-in-pathfinder.patch | 9 ++-- .../0022-Remove-a-few-more-streams.patch | 11 ++--- scripts/generateImports.sh | 6 +-- scripts/rebuildPatches.sh | 2 +- 27 files changed, 103 insertions(+), 178 deletions(-) delete mode 100644 current-paper diff --git a/current-paper b/current-paper deleted file mode 100644 index 6ad363af9..000000000 --- a/current-paper +++ /dev/null @@ -1 +0,0 @@ -1.15.2--- diff --git a/patches/api/0001-POM-Changes.patch b/patches/api/0001-POM-Changes.patch index 5115e30cd..a8441d252 100644 --- a/patches/api/0001-POM-Changes.patch +++ b/patches/api/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From ef19a5cdf803c60b840540c9c61accca961fe8eb Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Fri, 14 Dec 2018 21:52:29 -0800 @@ -6,7 +6,7 @@ Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml -index 2cb97140..d167304b 100644 +index 2cb9714084c8a7aa1b20d445edd5be4cc206672f..d167304be5ca4d067886a9740230b25b9fa21b56 100644 --- a/pom.xml +++ b/pom.xml @@ -3,18 +3,18 @@ @@ -34,6 +34,3 @@ index 2cb97140..d167304b 100644 An enhanced plugin API for Minecraft servers. --- -2.20.1 - diff --git a/patches/api/0002-Add-server-configuration.patch b/patches/api/0002-Add-server-configuration.patch index 3ab4969b4..f057c028f 100644 --- a/patches/api/0002-Add-server-configuration.patch +++ b/patches/api/0002-Add-server-configuration.patch @@ -1,4 +1,4 @@ -From 297ce321a17608b758c4b2d8b00f15dc2984ec6d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Fri, 3 Apr 2020 15:18:38 +0800 @@ -6,7 +6,7 @@ Subject: [PATCH] Add server configuration diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java -index 93d5a3f9..dfb57b9d 100644 +index 93d5a3f97a1b2b3a1cd2731d48e8ebd01d29aa91..dfb57b9db56b31205a581f26ff46496b95c7344b 100644 --- a/src/main/java/co/aikar/timings/TimingsExport.java +++ b/src/main/java/co/aikar/timings/TimingsExport.java @@ -207,6 +207,7 @@ class TimingsExport extends Thread { @@ -18,7 +18,7 @@ index 93d5a3f9..dfb57b9d 100644 new TimingsExport(listeners, parent, history).start(); diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 9ceaac0e..17a494b4 100644 +index 9ceaac0e859e347b07fa9f4c6507a73deb280670..17a494b4ded276ae2aa16c008e424c58b3090150 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1386,6 +1386,14 @@ public interface Server extends PluginMessageRecipient { @@ -36,6 +36,3 @@ index 9ceaac0e..17a494b4 100644 /** * Sends the component to the player * --- -2.20.1 - diff --git a/patches/server/0001-Fix-errors-on-editors-and-add-ignores.patch b/patches/server/0001-Fix-errors-on-editors-and-add-ignores.patch index 41ec5bfdc..aa911112a 100644 --- a/patches/server/0001-Fix-errors-on-editors-and-add-ignores.patch +++ b/patches/server/0001-Fix-errors-on-editors-and-add-ignores.patch @@ -1,11 +1,11 @@ -From 53046222580d1b8ab5abf950474e04fbb7b469fb Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sotr Date: Wed, 15 Apr 2020 00:52:56 +0700 Subject: [PATCH] Fix errors on editors and add ignores diff --git a/.gitignore b/.gitignore -index 67fb370ca..9b8966343 100644 +index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..9b89663438e30e3d45d66df4d06835b1ede8cd90 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ @@ -17,7 +17,7 @@ index 67fb370ca..9b8966343 100644 # netbeans /nbproject diff --git a/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java b/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java -index 9ebd7ecb7..677ccffd0 100644 +index 9ebd7ecb7a0ac73ccacf34c097056598bb5d26e8..677ccffd00e44eff74fa588a1af0c3e5f87c50e3 100644 --- a/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java +++ b/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java @@ -76,7 +76,7 @@ public final class PlayerMobDistanceMap { @@ -30,7 +30,7 @@ index 9ebd7ecb7..677ccffd0 100644 final PooledHashSets.PooledObjectLinkedOpenHashSet map = entry.getValue(); diff --git a/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java b/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java -index f625da9f0..3f128565b 100644 +index f625da9f0968b6f41e302b628c4439198eb4ed64..3f128565b4d47ab768c9b31a57b338b5cd9c86a7 100644 --- a/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java +++ b/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java @@ -134,10 +134,10 @@ public abstract class AreaMap { @@ -46,6 +46,3 @@ index f625da9f0..3f128565b 100644 final long key = entry.getLongKey(); final PooledLinkedHashSets.PooledObjectLinkedOpenHashSet map = entry.getValue(); --- -2.20.1 - diff --git a/patches/server/0002-Akarin-POM-changes.patch b/patches/server/0002-Akarin-POM-changes.patch index d6e3bcc5d..8fcdf36a5 100644 --- a/patches/server/0002-Akarin-POM-changes.patch +++ b/patches/server/0002-Akarin-POM-changes.patch @@ -1,4 +1,4 @@ -From 9ef8c6991bb852a356245afb1ed1e6977e8c34ce Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Fri, 14 Dec 2018 21:53:58 -0800 @@ -6,7 +6,7 @@ Subject: [PATCH] Akarin POM changes diff --git a/pom.xml b/pom.xml -index 55679af92..19f87edb5 100644 +index 55679af926485eca6bb0b9ed368a4c91c8a7e37e..19f87edb55a48b151f81f899cedbc573aec66405 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,11 @@ @@ -67,7 +67,7 @@ index 55679af92..19f87edb5 100644 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java -index 674096cab..9a7235b8e 100644 +index 674096cab190d62622f9947853b056f57d43a2a5..9a7235b8e525fbc52ff7ce53156816f9bbdb5d6f 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 { @@ -79,6 +79,3 @@ index 674096cab..9a7235b8e 100644 Properties properties = new Properties(); if (stream != null) { --- -2.20.1 - diff --git a/patches/server/0003-Akarin-configuration.patch b/patches/server/0003-Akarin-configuration.patch index 86805c45b..b9d19fe8e 100644 --- a/patches/server/0003-Akarin-configuration.patch +++ b/patches/server/0003-Akarin-configuration.patch @@ -1,4 +1,4 @@ -From 149a02a4f64b6d1fded947d53a4550e9732e343e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Fri, 3 Apr 2020 14:59:22 +0800 @@ -7,7 +7,7 @@ Subject: [PATCH] Akarin configuration diff --git a/src/main/java/io/akarin/server/Config.java b/src/main/java/io/akarin/server/Config.java new file mode 100644 -index 000000000..2ac8f02a9 +index 0000000000000000000000000000000000000000..2ac8f02a97429f04f3e5c9206ec228edccaf24c9 --- /dev/null +++ b/src/main/java/io/akarin/server/Config.java @@ -0,0 +1,183 @@ @@ -195,7 +195,7 @@ index 000000000..2ac8f02a9 + +} diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 1ef7890da..9d82885dc 100644 +index 1ef7890da599d13e784861035e7891efcc4cd504..9d82885dcf5bb9309bbf136180551ed12930f59b 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -194,6 +194,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -207,7 +207,7 @@ index 1ef7890da..9d82885dc 100644 this.setSpawnAnimals(dedicatedserverproperties.spawnAnimals); this.setSpawnNPCs(dedicatedserverproperties.spawnNpcs); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index d554d4cf0..839ddb14e 100644 +index d554d4cf0f0a13b598c6b14d618ba463c9895f35..839ddb14efe621c0fdd4d43c03084a9d49683997 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -82,6 +82,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -228,7 +228,7 @@ index d554d4cf0..839ddb14e 100644 this.world = new CraftWorld((WorldServer) this, gen, env); this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 8cc0f66ce..ed684cc0d 100644 +index 8cc0f66ce52d2c0cedef682b530a852fde38526a..ed684cc0d56d8f8e79f4553f6552921953e1b4b0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -806,6 +806,7 @@ public final class CraftServer implements Server { @@ -263,7 +263,7 @@ index 8cc0f66ce..ed684cc0d 100644 public void restart() { org.spigotmc.RestartCommand.restart(); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index cb60310e6..04694464b 100644 +index cb60310e63ce0f55f5e706edf9e1ef61a3732600..04694464b105aba007718e7b5933df8709d98b33 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -138,6 +138,14 @@ public class Main { @@ -281,6 +281,3 @@ index cb60310e6..04694464b 100644 // Paper start acceptsAll(asList("server-name"), "Name of the server") .withRequiredArg() --- -2.20.1 - diff --git a/patches/server/0004-Akarin-brand-changes.patch b/patches/server/0004-Akarin-brand-changes.patch index d798f9738..95b0f35ec 100644 --- a/patches/server/0004-Akarin-brand-changes.patch +++ b/patches/server/0004-Akarin-brand-changes.patch @@ -1,4 +1,4 @@ -From 5e0412cac58685905d67438d3d6da85ac5b17e25 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Tue, 18 Dec 2018 06:27:02 -0800 @@ -6,7 +6,7 @@ Subject: [PATCH] Akarin brand changes diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java -index cf00f35a5..a45e63a02 100644 +index cf00f35a5b7c2d2f6b6989e0855de8b882dcef50..a45e63a02759305e119a41eac55a7f40488dd12c 100644 --- a/src/main/java/net/minecraft/server/EULA.java +++ b/src/main/java/net/minecraft/server/EULA.java @@ -70,7 +70,7 @@ public class EULA { @@ -19,7 +19,7 @@ index cf00f35a5..a45e63a02 100644 throwable = throwable1; throw throwable1; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index a9b533751..c562c8ce7 100644 +index a9b5337512c5c7d71be68826cafb6c3c5528bd3e..c562c8ce7fd260760d1b855a9feffed904e2978b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1511,7 +1511,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 13 Apr 2020 13:18:27 +0800 @@ -6,7 +6,7 @@ Subject: [PATCH] Akarin Metrics diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java -index e257d6b36..81f0aef68 100644 +index e257d6b36e0e78dac5b8320017d92776171e1bb0..81f0aef68c97263560839ef4bcb3df9647f5df06 100644 --- a/src/main/java/com/destroystokyo/paper/Metrics.java +++ b/src/main/java/com/destroystokyo/paper/Metrics.java @@ -578,7 +578,7 @@ public class Metrics { @@ -18,6 +18,3 @@ index e257d6b36..81f0aef68 100644 metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> { String minecraftVersion = Bukkit.getVersion(); --- -2.20.1 - diff --git a/patches/server/0006-Disable-the-Snooper.patch b/patches/server/0006-Disable-the-Snooper.patch index 823042d52..75932bcf3 100644 --- a/patches/server/0006-Disable-the-Snooper.patch +++ b/patches/server/0006-Disable-the-Snooper.patch @@ -1,11 +1,11 @@ -From f86852c95674cd7052effb5c77efb8101b073354 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sotr Date: Wed, 15 Apr 2020 22:17:18 +0700 Subject: [PATCH] Disable the Snooper diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index c562c8ce7..63865f767 100644 +index c562c8ce7fd260760d1b855a9feffed904e2978b..63865f767b58e71180f1d5f01dddba5e8e4a346c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1169,6 +1169,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Thu, 2 Apr 2020 11:29:08 +0800 @@ -6,7 +6,7 @@ Subject: [PATCH] Avoid double I/O operation on load player file diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java -index 350ac42d6..65cc7b205 100644 +index 350ac42d6b45a1023f6254de7706818775b7957b..65cc7b2052fcb6f349dad9177ba975d75d720462 100644 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java @@ -165,7 +165,8 @@ public class WorldNBTStorage implements IPlayerFileData { @@ -28,6 +28,3 @@ index 350ac42d6..65cc7b205 100644 nbttagcompound = NBTCompressedStreamTools.a((InputStream) (new FileInputStream(file))); } // Spigot Start --- -2.20.1 - diff --git a/patches/server/0008-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch b/patches/server/0008-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch index 1831cc31b..c391f5647 100644 --- a/patches/server/0008-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch +++ b/patches/server/0008-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch @@ -1,4 +1,4 @@ -From c1eaa4a319bdac8b0e36da3a0f77d86c2bb4f0ab Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Thu, 2 Apr 2020 11:43:20 +0800 @@ -6,7 +6,7 @@ Subject: [PATCH] Don't trigger Lootable Refresh for non player interaction diff --git a/src/main/java/net/minecraft/server/TileEntityLootable.java b/src/main/java/net/minecraft/server/TileEntityLootable.java -index d4cbce324..0ff6ebbf9 100644 +index d4cbce3243fe1f4973c9c0ae0dbdab10e3390897..0ff6ebbf971651fff0d3504a458e81df8e915389 100644 --- a/src/main/java/net/minecraft/server/TileEntityLootable.java +++ b/src/main/java/net/minecraft/server/TileEntityLootable.java @@ -49,6 +49,7 @@ public abstract class TileEntityLootable extends TileEntityContainer { @@ -17,6 +17,3 @@ index d4cbce324..0ff6ebbf9 100644 if (this.lootableData.shouldReplenish(entityhuman) && this.world.getMinecraftServer() != null) { // Paper LootTable loottable = this.world.getMinecraftServer().getLootTableRegistry().getLootTable(this.lootTable); --- -2.20.1 - diff --git a/patches/server/0009-Never-drop-items-on-command-give.patch b/patches/server/0009-Never-drop-items-on-command-give.patch index e57aab679..2514b17de 100644 --- a/patches/server/0009-Never-drop-items-on-command-give.patch +++ b/patches/server/0009-Never-drop-items-on-command-give.patch @@ -1,4 +1,4 @@ -From 9e10846ad746cc3625232c6e808b671d338c56e3 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Thu, 2 Apr 2020 11:35:19 +0800 @@ -6,7 +6,7 @@ Subject: [PATCH] Never drop items on command "/give" diff --git a/src/main/java/net/minecraft/server/CommandGive.java b/src/main/java/net/minecraft/server/CommandGive.java -index 81b26bb4d..1f3097c94 100644 +index 81b26bb4d094f8aede9d5432671936ab3ee42c84..1f3097c9450b5903c35d3b36fd642ddd131786d7 100644 --- a/src/main/java/net/minecraft/server/CommandGive.java +++ b/src/main/java/net/minecraft/server/CommandGive.java @@ -36,6 +36,7 @@ public class CommandGive { @@ -17,6 +17,3 @@ index 81b26bb4d..1f3097c94 100644 if (flag && itemstack.isEmpty()) { itemstack.setCount(1); entityitem = entityplayer.drop(itemstack, false); --- -2.20.1 - diff --git a/patches/server/0010-Save-Json-list-asynchronously.patch b/patches/server/0010-Save-Json-list-asynchronously.patch index 40e9945f1..c346c32da 100644 --- a/patches/server/0010-Save-Json-list-asynchronously.patch +++ b/patches/server/0010-Save-Json-list-asynchronously.patch @@ -1,4 +1,4 @@ -From 123a20482feb2e8fbf59c007b729a4eb18d9984a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Thu, 2 Apr 2020 11:16:18 +0800 @@ -6,7 +6,7 @@ Subject: [PATCH] Save Json list asynchronously diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java -index c97be42dd..370841cad 100644 +index c97be42dd7b4c6ea2cadcc97f47185c7f02e2cce..370841cad06121651d0c981c23f3a5e268dc3f59 100644 --- a/src/main/java/net/minecraft/server/JsonList.java +++ b/src/main/java/net/minecraft/server/JsonList.java @@ -168,6 +168,7 @@ public class JsonList> { @@ -32,6 +32,3 @@ index c97be42dd..370841cad 100644 } public void load() throws FileNotFoundException { --- -2.20.1 - diff --git a/patches/server/0011-Remove-vanilla-profiler-callers.patch b/patches/server/0011-Remove-vanilla-profiler-callers.patch index 96f0fb9c6..90b401d97 100644 --- a/patches/server/0011-Remove-vanilla-profiler-callers.patch +++ b/patches/server/0011-Remove-vanilla-profiler-callers.patch @@ -1,11 +1,11 @@ -From addfa3784039c4fe1b0dee826172a608a4e1e21a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sotr Date: Wed, 15 Apr 2020 22:18:01 +0700 Subject: [PATCH] Remove vanilla profiler callers diff --git a/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java -index ce653f6b4..21e28b98b 100644 +index ce653f6b4be3ab6c6d35cb3e9222e7f8c8759e25..21e28b98b4efc792dc187d77cde262ea3077f14c 100644 --- a/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java +++ b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java @@ -271,7 +271,7 @@ public final class PaperTickList extends TickListServer { // extend to avo @@ -36,7 +36,7 @@ index ce653f6b4..21e28b98b 100644 // finished ticking, actual cleanup time diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index f741a034e..04ffecd06 100644 +index f741a034e8eae0a250aa16b26e56f173c88a9769..04ffecd0615b85e080a828d32db7821c022dff69 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -368,9 +368,9 @@ public class ChunkProviderServer extends IChunkProvider { @@ -206,7 +206,7 @@ index f741a034e..04ffecd06 100644 } diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java -index 2414b0a55..1b0a878d2 100644 +index 2414b0a552e5d6fb449bca163add7a9bac39e943..1b0a878d2a186bceba11b08ef28c1c040d4d78ce 100644 --- a/src/main/java/net/minecraft/server/CommandDispatcher.java +++ b/src/main/java/net/minecraft/server/CommandDispatcher.java @@ -168,7 +168,7 @@ public class CommandDispatcher { @@ -228,7 +228,7 @@ index 2414b0a55..1b0a878d2 100644 return b0; diff --git a/src/main/java/net/minecraft/server/CustomFunctionData.java b/src/main/java/net/minecraft/server/CustomFunctionData.java -index ee42e1dfa..68dc7cdfb 100644 +index ee42e1dfa493c3d7f5af8cc7b8e17e80fcb32b71..68dc7cdfbca341234245d0b8c1643f56a1beac06 100644 --- a/src/main/java/net/minecraft/server/CustomFunctionData.java +++ b/src/main/java/net/minecraft/server/CustomFunctionData.java @@ -58,10 +58,10 @@ public class CustomFunctionData implements IResourcePackListener { @@ -290,7 +290,7 @@ index ee42e1dfa..68dc7cdfb 100644 ++k; diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 9cb4e5a1e..b290f64fa 100644 +index 9cb4e5a1e6eca84955948f474f92467c0681968c..b290f64fa13c2ff4c8555370c57c38667ba09c26 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -395,7 +395,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -408,7 +408,7 @@ index 9cb4e5a1e..b290f64fa 100644 } else { return null; diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 1991cee43..bb20398ab 100644 +index 1991cee43d429574f2c0889f807e7cd090f7d7dd..bb20398abc65d3f7e54867bdf930480af0941ada 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -223,13 +223,13 @@ public abstract class EntityInsentient extends EntityLiving { @@ -493,7 +493,7 @@ index 1991cee43..bb20398ab 100644 } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index ad474500e..284826897 100644 +index ad474500e2f6fd6ad6db7bf2436b74c2d9d6136a..284826897995c278c0b76a4114fad4e60309a1f9 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -242,7 +242,7 @@ public abstract class EntityLiving extends Entity { @@ -592,7 +592,7 @@ index ad474500e..284826897 100644 private void n() { diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index cd8df622f..4f0ae1bc4 100644 +index cd8df622f02051ad997664c670447b225361bbc3..4f0ae1bc453e44b65dba50273913cf0c91c13017 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -825,7 +825,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -625,7 +625,7 @@ index cd8df622f..4f0ae1bc4 100644 PlayerTeleportEvent tpEvent = new PlayerTeleportEvent(this.getBukkitEntity(), enter, exit, cause); Bukkit.getServer().getPluginManager().callEvent(tpEvent); diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 6e0020ae0..a7a07ffc4 100644 +index 6e0020ae0b4d2f2597843129b83fff0d194de337..a7a07ffc43d4e95af59da1194ae90394580bb242 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -144,9 +144,9 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -641,7 +641,7 @@ index 6e0020ae0..a7a07ffc4 100644 --this.bB; if (this.bB <= 0) { diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java -index a353f3d5f..5f976a17c 100644 +index a353f3d5fa5a5f54335f73584589de3f5cb20d3e..5f976a17c7aa36286ee1132597e480f591749a45 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -285,7 +285,7 @@ public class Explosion { @@ -663,7 +663,7 @@ index a353f3d5f..5f976a17c 100644 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 63865f767..82aa50bf8 100644 +index 63865f767b58e71180f1d5f01dddba5e8e4a346c..82aa50bf85b18599cf72ca1fbe59eceeebc1dc61 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -933,18 +933,18 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant c() { diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index c38d31faf..e23008762 100644 +index c38d31fafee81904ecfa43b90f75a6c8f5fd2ede..e230087620c23f87d16cd021875ad9edc3e0982e 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -537,20 +537,20 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -947,7 +947,7 @@ index c38d31faf..e23008762 100644 try (co.aikar.timings.Timing ignored1 = this.world.timings.chunkSaveDataSerialization.startTiming()) { // Paper nbttagcompound = ChunkRegionLoader.saveChunk(this.world, ichunkaccess); diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 7929fcc80..6dfbbc67d 100644 +index 7929fcc800064fa23b260c3ecbed75f846bb375a..6dfbbc67dd9cc60355dcf5ef751cd1a5b259be6b 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -185,7 +185,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -969,7 +969,7 @@ index 7929fcc80..6dfbbc67d 100644 for (int spam; (spam = this.chatThrottle) > 0 && !chatSpamField.compareAndSet(this, spam, spam - 1); ) ; if (tabSpamLimiter.get() > 0) tabSpamLimiter.getAndDecrement(); // Paper - split to seperate variable diff --git a/src/main/java/net/minecraft/server/TickListServer.java b/src/main/java/net/minecraft/server/TickListServer.java -index 3f1aa5ced..a7f2dee2c 100644 +index 3f1aa5ced697490b5481ba992cf5af5dc98b8166..a7f2dee2c424b5da66a7c86319f6fa3a6a619087 100644 --- a/src/main/java/net/minecraft/server/TickListServer.java +++ b/src/main/java/net/minecraft/server/TickListServer.java @@ -65,7 +65,7 @@ public class TickListServer implements TickList { @@ -1000,7 +1000,7 @@ index 3f1aa5ced..a7f2dee2c 100644 this.h.clear(); this.g.clear(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 839ddb14e..11629c4ce 100644 +index 839ddb14efe621c0fdd4d43c03084a9d49683997..11629c4ce8b7e3924ae7cd44a3c03e1898142de9 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -378,9 +378,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -1105,7 +1105,7 @@ index 839ddb14e..11629c4ce 100644 int j = MathHelper.f((axisalignedbb.maxX + 2.0D) / 16.0D); int k = MathHelper.floor((axisalignedbb.minZ - 2.0D) / 16.0D); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index a0db38b58..78fdacdaf 100644 +index a0db38b5880c849514b89f8b47648de0e5b1273f..78fdacdaf119b9c3fab477ee98089bbad5da2d73 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -274,12 +274,12 @@ public class WorldServer extends World { @@ -1356,6 +1356,3 @@ index a0db38b58..78fdacdaf 100644 } @Override --- -2.20.1 - diff --git a/patches/server/0012-Asynchronous-pathfinding.patch b/patches/server/0012-Asynchronous-pathfinding.patch index 958e49ad0..8d4054e8e 100644 --- a/patches/server/0012-Asynchronous-pathfinding.patch +++ b/patches/server/0012-Asynchronous-pathfinding.patch @@ -1,4 +1,4 @@ -From c5a951c9c8105d4a990a4fb09d7486379216297e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Sun, 5 Apr 2020 13:01:13 +0800 @@ -6,7 +6,7 @@ Subject: [PATCH] Asynchronous pathfinding diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index bb20398ab..cd8b46286 100644 +index bb20398abc65d3f7e54867bdf930480af0941ada..cd8b462866f3f89405aabad692466483da64b49b 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -686,7 +686,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -19,7 +19,7 @@ index bb20398ab..cd8b46286 100644 // this.world.getMethodProfiler().enter("mob tick"); // Akarin - remove caller this.mobTick(); diff --git a/src/main/java/net/minecraft/server/Navigation.java b/src/main/java/net/minecraft/server/Navigation.java -index abf450917..4f7f40d5e 100644 +index abf450917e605972d84cb603b966feb013ae0002..4f7f40d5e7050d9b2da29c6e6efe7c5bef560d55 100644 --- a/src/main/java/net/minecraft/server/Navigation.java +++ b/src/main/java/net/minecraft/server/Navigation.java @@ -183,7 +183,7 @@ public class Navigation extends NavigationAbstract { @@ -32,7 +32,7 @@ index abf450917..4f7f40d5e 100644 if (pathtype == PathType.WATER) { return false; diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index cd8a631d7..c134a9608 100644 +index cd8a631d7d3c6fbdd2470635173659f0eddddae2..c134a96080b3826342f54db41e8d80981db8c101 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -29,6 +29,15 @@ public abstract class NavigationAbstract { @@ -221,7 +221,7 @@ index cd8a631d7..c134a9608 100644 public boolean n() { return !this.m(); diff --git a/src/main/java/net/minecraft/server/Pathfinder.java b/src/main/java/net/minecraft/server/Pathfinder.java -index 67c63cfe3..848e2fe8b 100644 +index 67c63cfe333e328cbd00ada970bd81efebfe30b6..848e2fe8b84bfec5be332fd051512eda3838c108 100644 --- a/src/main/java/net/minecraft/server/Pathfinder.java +++ b/src/main/java/net/minecraft/server/Pathfinder.java @@ -27,7 +27,7 @@ public class Pathfinder { @@ -234,7 +234,7 @@ index 67c63cfe3..848e2fe8b 100644 this.e.a(chunkcache, entityinsentient); PathPoint pathpoint = this.e.b(); diff --git a/src/main/java/net/minecraft/server/PathfinderTurtle.java b/src/main/java/net/minecraft/server/PathfinderTurtle.java -index 59b1fe289..1790878ae 100644 +index 59b1fe289c57b9e9f21b74c26cc1836255dad78b..1790878ae9ac33be86bed0b962b8171bf666d119 100644 --- a/src/main/java/net/minecraft/server/PathfinderTurtle.java +++ b/src/main/java/net/minecraft/server/PathfinderTurtle.java @@ -148,7 +148,7 @@ public class PathfinderTurtle extends PathfinderNormal { @@ -247,7 +247,7 @@ index 59b1fe289..1790878ae 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderWater.java b/src/main/java/net/minecraft/server/PathfinderWater.java -index 075b63ef5..a3473ddcf 100644 +index 075b63ef57a1528118f03a00c7156b3cb7744969..a3473ddcfe15d329eba78bbd60c00541cb1b88bb 100644 --- a/src/main/java/net/minecraft/server/PathfinderWater.java +++ b/src/main/java/net/minecraft/server/PathfinderWater.java @@ -63,7 +63,7 @@ public class PathfinderWater extends PathfinderAbstract { @@ -259,6 +259,3 @@ index 075b63ef5..a3473ddcf 100644 float f = this.b.a(pathtype); if (f >= 0.0F) { --- -2.20.1 - diff --git a/patches/server/0013-Optimizations-for-network.patch b/patches/server/0013-Optimizations-for-network.patch index b25171e06..d79f1d9f0 100644 --- a/patches/server/0013-Optimizations-for-network.patch +++ b/patches/server/0013-Optimizations-for-network.patch @@ -1,4 +1,4 @@ -From d91e4f6b4a10855593e1cc4ab5d7f30940b032b5 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Sun, 5 Apr 2020 14:59:10 +0800 @@ -6,7 +6,7 @@ Subject: [PATCH] Optimizations for network diff --git a/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java -index a85466bc7..324af1a12 100644 +index a85466bc7e0a8aa54b9eff14077fe6c992ae2902..324af1a12a5780170f8cd6e060ff2f2f9d152c3d 100644 --- a/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java +++ b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java @@ -106,7 +106,7 @@ public final class StandardPaperServerListPingEventImpl extends PaperServerListP @@ -19,7 +19,7 @@ index a85466bc7..324af1a12 100644 } diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java -index 0532f975b..e7be1074b 100644 +index 0532f975b7af5b3f2916c26141221cd3701765d0..e7be1074b1b8fde3590b1323508965961824e671 100644 --- a/src/main/java/net/minecraft/server/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/HandshakeListener.java @@ -39,7 +39,7 @@ public class HandshakeListener implements PacketHandshakingInListener { @@ -46,7 +46,7 @@ index 0532f975b..e7be1074b 100644 } else { this.b.setPacketListener(new LoginListener(this.a, this.b)); diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index f1222fcb2..522cfed4c 100644 +index f1222fcb2bd52b8781d0f92c94e1472fa7b1e493..522cfed4cb09bc9ecc48b6313da47f9af7a5e1d8 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -111,6 +111,19 @@ public class LoginListener implements PacketLoginInListener { @@ -106,7 +106,7 @@ index f1222fcb2..522cfed4c 100644 protected GameProfile a(GameProfile gameprofile) { diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 96a785af2..fd1d5fe3b 100644 +index 96a785af27e1924b0cc1959254d4ae3cdd0385a1..fd1d5fe3bf40950d5dbdd9fa79cf5828c7b42d57 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -43,6 +43,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -273,7 +273,7 @@ index 96a785af2..fd1d5fe3b 100644 if (this.t++ % 20 == 0) { this.s = this.s * 0.75F + (float) this.q * 0.25F; diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java -index 8d0965a05..7e27cd280 100644 +index 8d0965a0535b16f19eda21b97a44464b85b05460..7e27cd280fa889f6178d46aa9f9d3a613d9702e6 100644 --- a/src/main/java/net/minecraft/server/Packet.java +++ b/src/main/java/net/minecraft/server/Packet.java @@ -20,4 +20,10 @@ public interface Packet { @@ -288,7 +288,7 @@ index 8d0965a05..7e27cd280 100644 + // Akarin end } diff --git a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java -index 7eb230f1b..d01cac0bd 100644 +index 7eb230f1b27eddf48f1b12fc78877a3678d802df..d01cac0bd40a11d82fa0d6874d87ad3f576a4e20 100644 --- a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java +++ b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java @@ -41,4 +41,11 @@ public class PacketLoginOutCustomPayload implements Packet @@ -320,7 +320,7 @@ index e5094f55f..a5d9b6d94 100644 + // Akarin end } diff --git a/src/main/java/net/minecraft/server/PacketLoginOutEncryptionBegin.java b/src/main/java/net/minecraft/server/PacketLoginOutEncryptionBegin.java -index b0d6342c3..eeabb54c4 100644 +index b0d6342c319a48290fd8bf6aa07a16d108feae18..eeabb54c44d39197f34a7171884cc7e885bce453 100644 --- a/src/main/java/net/minecraft/server/PacketLoginOutEncryptionBegin.java +++ b/src/main/java/net/minecraft/server/PacketLoginOutEncryptionBegin.java @@ -34,4 +34,11 @@ public class PacketLoginOutEncryptionBegin implements Packet { @@ -368,7 +368,7 @@ index 54c290471..75d7bc196 100644 + // Akarin end } diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java -index 4bb21c48b..06af567fc 100644 +index 4bb21c48bd50353370ec3c3546a00a5d20e4b9d8..06af567fc1fb3a2053eb4e8af6d93dbb2391616a 100644 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java @@ -143,7 +143,7 @@ public class PacketStatusListener implements PacketStatusInListener { @@ -381,7 +381,7 @@ index 4bb21c48b..06af567fc 100644 } } diff --git a/src/main/java/net/minecraft/server/PacketStatusOutPong.java b/src/main/java/net/minecraft/server/PacketStatusOutPong.java -index 94a0da87d..577c6ef9c 100644 +index 94a0da87db34ee5131686e4fa813500794ffc30d..577c6ef9cfe26d38783cd38353720b0fe457d7f5 100644 --- a/src/main/java/net/minecraft/server/PacketStatusOutPong.java +++ b/src/main/java/net/minecraft/server/PacketStatusOutPong.java @@ -25,4 +25,11 @@ public class PacketStatusOutPong implements Packet { @@ -397,7 +397,7 @@ index 94a0da87d..577c6ef9c 100644 + // Akarin end } diff --git a/src/main/java/net/minecraft/server/PacketStatusOutServerInfo.java b/src/main/java/net/minecraft/server/PacketStatusOutServerInfo.java -index 50d5fb62e..4da7a2c1a 100644 +index 50d5fb62efa7c89c7a73ccf072a0e7e433bcc650..4da7a2c1a4f84661e1018c7233b7a52449532d5b 100644 --- a/src/main/java/net/minecraft/server/PacketStatusOutServerInfo.java +++ b/src/main/java/net/minecraft/server/PacketStatusOutServerInfo.java @@ -28,4 +28,11 @@ public class PacketStatusOutServerInfo implements Packet Date: Fri, 10 Apr 2020 15:47:15 +0800 @@ -6,7 +6,7 @@ Subject: [PATCH] Swaps the predicate order of collision diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index b290f64fa..fb21da032 100644 +index b290f64fa13c2ff4c8555370c57c38667ba09c26..fb21da032a222d91f7840be1426e809fbd633345 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1403,8 +1403,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -20,6 +20,3 @@ index b290f64fa..fb21da032 100644 double d0 = entity.locX() - this.locX(); double d1 = entity.locZ() - this.locZ(); double d2 = MathHelper.a(d0, d1); --- -2.20.1 - diff --git a/patches/server/0015-Tuinity-Use-ArrayDeque-for-pendingChunkUpdates-in-Ch.patch b/patches/server/0015-Tuinity-Use-ArrayDeque-for-pendingChunkUpdates-in-Ch.patch index 4890e9395..0e5ed77f7 100644 --- a/patches/server/0015-Tuinity-Use-ArrayDeque-for-pendingChunkUpdates-in-Ch.patch +++ b/patches/server/0015-Tuinity-Use-ArrayDeque-for-pendingChunkUpdates-in-Ch.patch @@ -1,4 +1,4 @@ -From f79355679035b382e7d6ba970e77102160d02939 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sotr Date: Wed, 15 Apr 2020 02:39:12 +0700 Subject: [PATCH] Tuinity Use ArrayDeque for pendingChunkUpdates in @@ -6,7 +6,7 @@ Subject: [PATCH] Tuinity Use ArrayDeque for pendingChunkUpdates in diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java -index 0244768f7..13d113aee 100644 +index 0244768f76d83af427a07bd235c9bcec8ad5429e..13d113aee5e174fc4558173a19a0cda23166c5e9 100644 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java @@ -33,7 +33,7 @@ public abstract class ChunkMapDistance { @@ -18,6 +18,3 @@ index 0244768f7..13d113aee 100644 private final ChunkTaskQueueSorter i; private final Mailbox> j; private final Mailbox k; --- -2.20.1 - diff --git a/patches/server/0016-Tuinity-Optimise-ArraySetSorted-removeIf.patch b/patches/server/0016-Tuinity-Optimise-ArraySetSorted-removeIf.patch index 713972ec3..3dcc2ff4d 100644 --- a/patches/server/0016-Tuinity-Optimise-ArraySetSorted-removeIf.patch +++ b/patches/server/0016-Tuinity-Optimise-ArraySetSorted-removeIf.patch @@ -1,4 +1,4 @@ -From d11cfc8c845748f4a3ffbdd4c102a1b350f532cc Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sotr Date: Wed, 15 Apr 2020 02:44:07 +0700 Subject: [PATCH] Tuinity Optimise ArraySetSorted#removeIf @@ -6,7 +6,7 @@ Subject: [PATCH] Tuinity Optimise ArraySetSorted#removeIf Remove iterator allocation and ensure the call is always O(n) diff --git a/src/main/java/net/minecraft/server/ArraySetSorted.java b/src/main/java/net/minecraft/server/ArraySetSorted.java -index 85f799a71..f23ddb9e0 100644 +index 85f799a713db0c822d46b689010f9f6bd43f5280..f23ddb9e0ca41eef0dacc0e6e0072b78dfdd9e44 100644 --- a/src/main/java/net/minecraft/server/ArraySetSorted.java +++ b/src/main/java/net/minecraft/server/ArraySetSorted.java @@ -11,7 +11,9 @@ public class ArraySetSorted extends AbstractSet { @@ -62,6 +62,3 @@ index 85f799a71..f23ddb9e0 100644 public static > ArraySetSorted a(int i) { return new ArraySetSorted<>(i, (Comparator)Comparator.naturalOrder()); // Paper - decompile fix } --- -2.20.1 - diff --git a/patches/server/0017-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0017-Don-t-run-entity-collision-code-if-not-needed.patch index 1c9082072..a028b4aec 100644 --- a/patches/server/0017-Don-t-run-entity-collision-code-if-not-needed.patch +++ b/patches/server/0017-Don-t-run-entity-collision-code-if-not-needed.patch @@ -1,4 +1,4 @@ -From 8bb733f7e5a75ca89b0fdf2dda187b923ca07432 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sotr Date: Wed, 15 Apr 2020 02:49:56 +0700 Subject: [PATCH] Don't run entity collision code if not needed @@ -9,7 +9,7 @@ the max collisions per entity is less than or equal to 0 This commit was basically referenced on Tuinity#7131da4. diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 284826897..c1c7e7dca 100644 +index 284826897995c278c0b76a4114fad4e60309a1f9..c1c7e7dca3599353793bbfa4635f93554d9c737c 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2663,10 +2663,16 @@ public abstract class EntityLiving extends Entity { @@ -30,6 +30,3 @@ index 284826897..c1c7e7dca 100644 int j; if (i > 0 && list.size() > i - 1 && this.random.nextInt(4) == 0) { --- -2.20.1 - diff --git a/patches/server/0018-Optimize-door-interact-with-pathfinding.patch b/patches/server/0018-Optimize-door-interact-with-pathfinding.patch index 61d0f16a7..ae2606e9f 100644 --- a/patches/server/0018-Optimize-door-interact-with-pathfinding.patch +++ b/patches/server/0018-Optimize-door-interact-with-pathfinding.patch @@ -1,4 +1,4 @@ -From b3d09522e40d1fda731e4c6c55f70fbd405aab06 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sotr Date: Wed, 15 Apr 2020 03:51:50 +0700 Subject: [PATCH] Optimize door interact with pathfinding @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize door interact with pathfinding diff --git a/src/main/java/io/akarin/server/IndexedBlockPosition.java b/src/main/java/io/akarin/server/IndexedBlockPosition.java new file mode 100644 -index 000000000..83bf1d4ca +index 0000000000000000000000000000000000000000..83bf1d4cab653a9edcc8352609433a8fd12bd1b3 --- /dev/null +++ b/src/main/java/io/akarin/server/IndexedBlockPosition.java @@ -0,0 +1,35 @@ @@ -46,7 +46,7 @@ index 000000000..83bf1d4ca + } +} diff --git a/src/main/java/net/minecraft/server/BehaviorInteractDoor.java b/src/main/java/net/minecraft/server/BehaviorInteractDoor.java -index 01d9c2d92..3db22c5f4 100644 +index 01d9c2d92c580c9fabbb8bb4e8c93f3cc511ccf9..3db22c5f4df6fe68474839c3889ffbe5440f54dc 100644 --- a/src/main/java/net/minecraft/server/BehaviorInteractDoor.java +++ b/src/main/java/net/minecraft/server/BehaviorInteractDoor.java @@ -1,7 +1,9 @@ @@ -147,7 +147,7 @@ index 01d9c2d92..3db22c5f4 100644 if (worldserver.getWorldProvider().getDimensionManager() != globalpos.getDimensionManager()) { iterator.remove(); diff --git a/src/main/java/net/minecraft/server/BehaviorSleep.java b/src/main/java/net/minecraft/server/BehaviorSleep.java -index dfe0f6650..46eb63308 100644 +index dfe0f66500ab2ea733fd5ef84d7d80f32e2dfaab..46eb633084a2eb48cb0a42c5df2b69b9e93b22e1 100644 --- a/src/main/java/net/minecraft/server/BehaviorSleep.java +++ b/src/main/java/net/minecraft/server/BehaviorSleep.java @@ -57,7 +57,7 @@ public class BehaviorSleep extends Behavior { @@ -159,6 +159,3 @@ index dfe0f6650..46eb63308 100644 }); entityliving.entitySleep(((GlobalPos) entityliving.getBehaviorController().getMemory(MemoryModuleType.HOME).get()).getBlockPosition()); } --- -2.20.1 - diff --git a/patches/server/0019-Remove-stream-for-ender-teleport.patch b/patches/server/0019-Remove-stream-for-ender-teleport.patch index bb9ddbc93..d6534fa42 100644 --- a/patches/server/0019-Remove-stream-for-ender-teleport.patch +++ b/patches/server/0019-Remove-stream-for-ender-teleport.patch @@ -1,11 +1,11 @@ -From de67219af39f3c7cbf541a6dcb46f4fce1fdaa49 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sotr Date: Wed, 15 Apr 2020 04:16:44 +0700 Subject: [PATCH] Remove stream for ender teleport diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index fb21da032..6b43c41a8 100644 +index fb21da032a222d91f7840be1426e809fbd633345..6b43c41a85061058b49207d2762c2aeabc20a2c4 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2842,7 +2842,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -32,6 +32,3 @@ index fb21da032..6b43c41a8 100644 public boolean hasSinglePlayerPassenger() { Set set = Sets.newHashSet(); --- -2.20.1 - diff --git a/patches/server/0020-Cache-hashcode-for-BlockPosition.patch b/patches/server/0020-Cache-hashcode-for-BlockPosition.patch index 075a0839b..21479b0ce 100644 --- a/patches/server/0020-Cache-hashcode-for-BlockPosition.patch +++ b/patches/server/0020-Cache-hashcode-for-BlockPosition.patch @@ -1,11 +1,11 @@ -From 853c375c1977fca6c0a4e87e4c3de748ed720658 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sotr Date: Wed, 15 Apr 2020 04:28:25 +0700 Subject: [PATCH] Cache hashcode for BlockPosition diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java -index c439a8d01..cc1856043 100644 +index c439a8d0191c8667c881b2111b8c640ca13e5e7c..cc18560431d65f13f28b45025a702afe13c86cdd 100644 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java @@ -18,6 +18,7 @@ public class BaseBlockPosition implements Comparable { @@ -39,7 +39,7 @@ index c439a8d01..cc1856043 100644 public int compareTo(BaseBlockPosition baseblockposition) { return this.getY() == baseblockposition.getY() ? (this.getZ() == baseblockposition.getZ() ? this.getX() - baseblockposition.getX() : this.getZ() - baseblockposition.getZ()) : this.getY() - baseblockposition.getY(); diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index 2d07d350d..43e7e5c27 100644 +index 2d07d350d2b73197b6ea73cf90ff59679da7e0e7..43e7e5c27b454db3289407f14f6568d1d8944b69 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -439,6 +439,7 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali @@ -70,6 +70,3 @@ index 2d07d350d..43e7e5c27 100644 } @Override --- -2.20.1 - diff --git a/patches/server/0021-Remove-stream-and-simplify-operation-in-pathfinder.patch b/patches/server/0021-Remove-stream-and-simplify-operation-in-pathfinder.patch index de08e8753..9c4639182 100644 --- a/patches/server/0021-Remove-stream-and-simplify-operation-in-pathfinder.patch +++ b/patches/server/0021-Remove-stream-and-simplify-operation-in-pathfinder.patch @@ -1,11 +1,11 @@ -From f2d1556bf8e5f431debcc65ab9f0065caea2d284 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sotr Date: Wed, 15 Apr 2020 17:49:07 +0700 Subject: [PATCH] Remove stream and simplify operation in pathfinder diff --git a/src/main/java/net/minecraft/server/PathDestination.java b/src/main/java/net/minecraft/server/PathDestination.java -index 9071d43d8..2f33aafe3 100644 +index 9071d43d8b85a64a11566b2b535c3f6db65028f8..2f33aafe34d9cfd664abf006f8dbdf5cb981b692 100644 --- a/src/main/java/net/minecraft/server/PathDestination.java +++ b/src/main/java/net/minecraft/server/PathDestination.java @@ -5,6 +5,7 @@ public class PathDestination extends PathPoint { @@ -17,7 +17,7 @@ index 9071d43d8..2f33aafe3 100644 public PathDestination(PathPoint pathpoint) { super(pathpoint.a, pathpoint.b, pathpoint.c); diff --git a/src/main/java/net/minecraft/server/Pathfinder.java b/src/main/java/net/minecraft/server/Pathfinder.java -index 848e2fe8b..379ee96b0 100644 +index 848e2fe8b84bfec5be332fd051512eda3838c108..379ee96b0801faaffc83c9f1b7473bc4b493bb6f 100644 --- a/src/main/java/net/minecraft/server/Pathfinder.java +++ b/src/main/java/net/minecraft/server/Pathfinder.java @@ -2,7 +2,9 @@ package net.minecraft.server; @@ -149,6 +149,3 @@ index 848e2fe8b..379ee96b0 100644 private PathEntity a(PathPoint pathpoint, BlockPosition blockposition, boolean flag) { List list = Lists.newArrayList(); PathPoint pathpoint1 = pathpoint; --- -2.20.1 - diff --git a/patches/server/0022-Remove-a-few-more-streams.patch b/patches/server/0022-Remove-a-few-more-streams.patch index 68074625f..5466482e6 100644 --- a/patches/server/0022-Remove-a-few-more-streams.patch +++ b/patches/server/0022-Remove-a-few-more-streams.patch @@ -1,11 +1,11 @@ -From b95f268f3afd58685ccb76b4800b81eb36030eac Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sotr Date: Wed, 15 Apr 2020 22:45:48 +0700 Subject: [PATCH] Remove a few more streams diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java -index 13d113aee..1890fad9e 100644 +index 13d113aee5e174fc4558173a19a0cda23166c5e9..1890fad9ed10c514b7b5982d2c112f7dc52866a5 100644 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java @@ -108,9 +108,15 @@ public abstract class ChunkMapDistance { @@ -48,7 +48,7 @@ index 13d113aee..1890fad9e 100644 this.l.clear(); diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java -index 9c31edade..eb3f45d8b 100644 +index 9c31edade247baac6811ef3ec98e88a332bcffba..eb3f45d8b707002ebeca20a6857ed41473cdeb3e 100644 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java @@ -92,12 +92,23 @@ public class EntityTNTPrimed extends Entity { @@ -76,7 +76,7 @@ index 9c31edade..eb3f45d8b 100644 } // Paper end diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index a7a07ffc4..c9f0f7787 100644 +index a7a07ffc43d4e95af59da1194ae90394580bb242..c9f0f7787fd73ca28b45e4c21d33d50965c65860 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -548,11 +548,20 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -100,6 +100,3 @@ index a7a07ffc4..c9f0f7787 100644 } } } --- -2.20.1 - diff --git a/scripts/generateImports.sh b/scripts/generateImports.sh index 1eb2ff7cc..622aead79 100755 --- a/scripts/generateImports.sh +++ b/scripts/generateImports.sh @@ -9,8 +9,6 @@ basedir=$1 source "$basedir/scripts/functions.sh" -paperVer=$(cat current-paper) - paperworkdir="$basedir/Paper/work" minecraftversion=$(cat $paperworkdir/BuildData/info.json | grep minecraftVersion | cut -d '"' -f 4) decompile="$paperworkdir/Minecraft/$minecraftversion/spigot" @@ -43,6 +41,6 @@ done # push the dev project cd $basedir/mc-dev $gitcmd add . -A -$gitcmd commit . -m "$paperVer" -$gitcmd tag -a "$paperVer" -m "$paperVer" 2>/dev/null +$gitcmd commit . -m "akarin-base" +$gitcmd tag -a "akarin-base" -m "akarin-base" 2>/dev/null # gitpush . $MCDEV_REPO $paperVer diff --git a/scripts/rebuildPatches.sh b/scripts/rebuildPatches.sh index bca03b2c6..a6360bdea 100755 --- a/scripts/rebuildPatches.sh +++ b/scripts/rebuildPatches.sh @@ -35,7 +35,7 @@ function savePatches { fi cd "$basedir/$targetname" - $gitcmd format-patch --no-stat -N -o "$basedir/patches/$2" upstream/upstream >/dev/null + $gitcmd format-patch --no-signature --zero-commit --full-index --no-stat -N -o "$basedir/patches/$2" upstream/upstream >/dev/null basedir $gitcmd add -A "$basedir/patches/$2" echo " $(bashcolor 1 32)($3/$4)$(bashcolorend) - Patches saved for $targetname to patches/$2"