Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove stream and simplify op in pathfinder & fix scripts

Browse Source
This commit is contained in:
Sotr
2020-04-15 18:57:08 +07:00
parent 790aedb67b
commit 4d0ea06a78
28 changed files with 176 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 81706e6268...78871d07dc

1
akarin
View File

@@ -23,6 +23,7 @@ case "$1" in
( (
set -e set -e
basedir basedir
$scriptdir/importSources.sh "$basedir" || exit 1
$scriptdir/rebuildPatches.sh "$basedir" || exit 1 $scriptdir/rebuildPatches.sh "$basedir" || exit 1
) || failed=1 ) || failed=1
;; ;;

2
patches/api/0001-POM-Changes.patch
View File

@@ -1,4 +1,4 @@
From f5a5fe00b23e0c495628950ddb91201d00b6f935 Mon Sep 17 00:00:00 2001 From 0f1e037ddc71266d18a78ef599658254407c3dd9 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?= From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
<tsao-chi@the-lingo.org> <tsao-chi@the-lingo.org>
Date: Fri, 14 Dec 2018 21:52:29 -0800 Date: Fri, 14 Dec 2018 21:52:29 -0800

2
patches/api/0002-Add-server-configuration.patch
View File

@@ -1,4 +1,4 @@
From 672fe7fbce1691ab799b3f4ac67c890f124674b5 Mon Sep 17 00:00:00 2001 From 44b9b1dd369d2b505c83336d6537b779fd9cfec8 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?= From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
<tsao-chi@the-lingo.org> <tsao-chi@the-lingo.org>
Date: Fri, 3 Apr 2020 15:18:38 +0800 Date: Fri, 3 Apr 2020 15:18:38 +0800

8
patches/server/0001-Fix-errors-on-eclipse.patch
View File

@@ -1,11 +1,11 @@
From 5f55a4f0caca2406dd04d3a39d29508508f2cdf0 Mon Sep 17 00:00:00 2001 From e60b30372fd2b79601e8dd18b5e36ec7d608caa6 Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk> From: Sotr <i@omc.hk>
Date: Wed, 15 Apr 2020 00:52:56 +0700 Date: Wed, 15 Apr 2020 00:52:56 +0700
Subject: [PATCH] Fix errors on eclipse Subject: [PATCH] Fix errors on eclipse
diff --git a/.gitignore b/.gitignore diff --git a/.gitignore b/.gitignore
index 67fb370ca..9b8966343 100644 index 67fb370cad..9b89663438 100644
--- a/.gitignore --- a/.gitignore
+++ b/.gitignore +++ b/.gitignore
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
@@ -17,7 +17,7 @@ index 67fb370ca..9b8966343 100644
# netbeans # netbeans
/nbproject /nbproject
diff --git a/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java b/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java 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 9ebd7ecb7a..677ccffd00 100644
--- a/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java --- a/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java
+++ b/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 { @@ -76,7 +76,7 @@ public final class PlayerMobDistanceMap {
@@ -30,7 +30,7 @@ index 9ebd7ecb7..677ccffd0 100644
final PooledHashSets.PooledObjectLinkedOpenHashSet<EntityPlayer> map = entry.getValue(); final PooledHashSets.PooledObjectLinkedOpenHashSet<EntityPlayer> 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 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 f625da9f09..3f128565b4 100644
--- a/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java --- a/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java
+++ b/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<E> { @@ -134,10 +134,10 @@ public abstract class AreaMap<E> {

6
patches/server/0002-POM-Changes.patch
View File

@@ -1,4 +1,4 @@
From 703ec6b515d695de0e19a61ddc5752c9d124bb40 Mon Sep 17 00:00:00 2001 From c5290cf9e102048ab6befd461c5ad4fb6a207a69 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?= From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
<tsao-chi@the-lingo.org> <tsao-chi@the-lingo.org>
Date: Fri, 14 Dec 2018 21:53:58 -0800 Date: Fri, 14 Dec 2018 21:53:58 -0800
@@ -6,7 +6,7 @@ Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 55679af92..19f87edb5 100644 index 55679af926..19f87edb55 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -1,12 +1,11 @@ @@ -1,12 +1,11 @@
@@ -67,7 +67,7 @@ index 55679af92..19f87edb5 100644
</configuration> </configuration>
<executions> <executions>
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java 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 674096cab1..9a7235b8e5 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
+++ b/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 { @@ -11,7 +11,7 @@ public final class Versioning {

8
patches/server/0003-Brand-changes.patch
View File

@@ -1,4 +1,4 @@
From 06a482394f671e532d4f514c453550745b548c2e Mon Sep 17 00:00:00 2001 From 178a508e5e92c3562aaaa3e0dbfeecb6405acbda 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?= From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
<tsao-chi@the-lingo.org> <tsao-chi@the-lingo.org>
Date: Tue, 18 Dec 2018 06:27:02 -0800 Date: Tue, 18 Dec 2018 06:27:02 -0800
@@ -6,7 +6,7 @@ Subject: [PATCH] Brand changes
diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java 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 cf00f35a5b..a45e63a027 100644
--- a/src/main/java/net/minecraft/server/EULA.java --- a/src/main/java/net/minecraft/server/EULA.java
+++ b/src/main/java/net/minecraft/server/EULA.java +++ b/src/main/java/net/minecraft/server/EULA.java
@@ -70,7 +70,7 @@ public class EULA { @@ -70,7 +70,7 @@ public class EULA {
@@ -19,7 +19,7 @@ index cf00f35a5..a45e63a02 100644
throwable = throwable1; throwable = throwable1;
throw throwable1; throw throwable1;
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java 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 a9b5337512..c562c8ce7f 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/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<TickTas @@ -1511,7 +1511,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -32,7 +32,7 @@ index a9b533751..c562c8ce7 100644
public CrashReport b(CrashReport crashreport) { public CrashReport b(CrashReport crashreport) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 8cc0f66ce..b381514d9 100644 index 8cc0f66ce5..b381514d9f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -203,7 +203,7 @@ import javax.annotation.Nullable; // Paper @@ -203,7 +203,7 @@ import javax.annotation.Nullable; // Paper

4
patches/server/0004-Avoid-double-I-O-operation-on-load-player-file.patch
View File

@@ -1,4 +1,4 @@
From 92e94da95f2bfb8ea088edf8a59adf9fa7785d7b Mon Sep 17 00:00:00 2001 From 4fdac6d235064f8d515fdccc14f829931e7ab959 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?= From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
<tsao-chi@the-lingo.org> <tsao-chi@the-lingo.org>
Date: Thu, 2 Apr 2020 11:29:08 +0800 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 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 350ac42d6b..65cc7b2052 100644
--- a/src/main/java/net/minecraft/server/WorldNBTStorage.java --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
+++ b/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 { @@ -165,7 +165,8 @@ public class WorldNBTStorage implements IPlayerFileData {

4
patches/server/0005-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch
View File

@@ -1,4 +1,4 @@
From d0eb604ebe6f20a250dd72f9d39f065b716e509f Mon Sep 17 00:00:00 2001 From 65fe2ee4002ec257d9efbff8db1218c6e183d251 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?= From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
<tsao-chi@the-lingo.org> <tsao-chi@the-lingo.org>
Date: Thu, 2 Apr 2020 11:43:20 +0800 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 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 d4cbce3243..0ff6ebbf97 100644
--- a/src/main/java/net/minecraft/server/TileEntityLootable.java --- a/src/main/java/net/minecraft/server/TileEntityLootable.java
+++ b/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 { @@ -49,6 +49,7 @@ public abstract class TileEntityLootable extends TileEntityContainer {

4
patches/server/0006-Never-drop-items-on-command-give.patch
View File

@@ -1,4 +1,4 @@
From c923d8349615f5173b094aee61cad8d043e17584 Mon Sep 17 00:00:00 2001 From 0e436814a06d9dadf90fa53bc017ac98adde4632 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?= From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
<tsao-chi@the-lingo.org> <tsao-chi@the-lingo.org>
Date: Thu, 2 Apr 2020 11:35:19 +0800 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 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 81b26bb4d0..1f3097c945 100644
--- a/src/main/java/net/minecraft/server/CommandGive.java --- a/src/main/java/net/minecraft/server/CommandGive.java
+++ b/src/main/java/net/minecraft/server/CommandGive.java +++ b/src/main/java/net/minecraft/server/CommandGive.java
@@ -36,6 +36,7 @@ public class CommandGive { @@ -36,6 +36,7 @@ public class CommandGive {

4
patches/server/0007-Save-json-list-async.patch
View File

@@ -1,4 +1,4 @@
From 903c98556da491303cedec003086dd0d754f0a5a Mon Sep 17 00:00:00 2001 From bcc260c3234d1b19a631752753ad02b59397a01d 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?= From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
<tsao-chi@the-lingo.org> <tsao-chi@the-lingo.org>
Date: Thu, 2 Apr 2020 11:16:18 +0800 Date: Thu, 2 Apr 2020 11:16:18 +0800
@@ -6,7 +6,7 @@ Subject: [PATCH] Save json list async
diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java 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 c97be42dd7..370841cad0 100644
--- a/src/main/java/net/minecraft/server/JsonList.java --- a/src/main/java/net/minecraft/server/JsonList.java
+++ b/src/main/java/net/minecraft/server/JsonList.java +++ b/src/main/java/net/minecraft/server/JsonList.java
@@ -168,6 +168,7 @@ public class JsonList<K, V extends JsonListEntry<K>> { @@ -168,6 +168,7 @@ public class JsonList<K, V extends JsonListEntry<K>> {

30
patches/server/0008-Remove-method-profiler-callers.patch
View File

@@ -1,4 +1,4 @@
From 0d43199b18ae6b7d3662d56e2dd00a94d50866ed Mon Sep 17 00:00:00 2001 From c94d0908daa1841e7dce31350a743858183d658c 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?= From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
<tsao-chi@the-lingo.org> <tsao-chi@the-lingo.org>
Date: Thu, 2 Apr 2020 12:30:35 +0800 Date: Thu, 2 Apr 2020 12:30:35 +0800
@@ -6,7 +6,7 @@ Subject: [PATCH] Remove method profiler callers
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index f741a034e..ae40078d0 100644 index f741a034e8..ae40078d0f 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -602,33 +602,33 @@ public class ChunkProviderServer extends IChunkProvider { @@ -602,33 +602,33 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -128,7 +128,7 @@ index f741a034e..ae40078d0 100644
this.playerChunkMap.g(); this.playerChunkMap.g();
diff --git a/src/main/java/net/minecraft/server/CustomFunctionData.java b/src/main/java/net/minecraft/server/CustomFunctionData.java diff --git a/src/main/java/net/minecraft/server/CustomFunctionData.java b/src/main/java/net/minecraft/server/CustomFunctionData.java
index ee42e1dfa..bd9684c4e 100644 index ee42e1dfa4..bd9684c4ed 100644
--- a/src/main/java/net/minecraft/server/CustomFunctionData.java --- a/src/main/java/net/minecraft/server/CustomFunctionData.java
+++ b/src/main/java/net/minecraft/server/CustomFunctionData.java +++ b/src/main/java/net/minecraft/server/CustomFunctionData.java
@@ -70,7 +70,7 @@ public class CustomFunctionData implements IResourcePackListener { @@ -70,7 +70,7 @@ public class CustomFunctionData implements IResourcePackListener {
@@ -159,7 +159,7 @@ index ee42e1dfa..bd9684c4e 100644
++k; ++k;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 9cb4e5a1e..34aac6031 100644 index 9cb4e5a1e6..34aac60312 100644
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/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 @@ -395,7 +395,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -268,7 +268,7 @@ index 9cb4e5a1e..34aac6031 100644
} else { } else {
return null; return null;
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 1991cee43..e9f00a1e1 100644 index 1991cee43d..e9f00a1e13 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java --- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/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 { @@ -223,13 +223,13 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -353,7 +353,7 @@ index 1991cee43..e9f00a1e1 100644
} }
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index ad474500e..e93b7b280 100644 index ad474500e2..e93b7b2809 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java --- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/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 { @@ -242,7 +242,7 @@ public abstract class EntityLiving extends Entity {
@@ -452,7 +452,7 @@ index ad474500e..e93b7b280 100644
private void n() { private void n() {
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 6e0020ae0..9d94aa135 100644 index 6e0020ae0b..9d94aa135e 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java --- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/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 @@ -144,9 +144,9 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -468,7 +468,7 @@ index 6e0020ae0..9d94aa135 100644
--this.bB; --this.bB;
if (this.bB <= 0) { if (this.bB <= 0) {
diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
index a353f3d5f..81e699b40 100644 index a353f3d5fa..81e699b404 100644
--- a/src/main/java/net/minecraft/server/Explosion.java --- a/src/main/java/net/minecraft/server/Explosion.java
+++ b/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java
@@ -285,7 +285,7 @@ public class Explosion { @@ -285,7 +285,7 @@ public class Explosion {
@@ -490,7 +490,7 @@ index a353f3d5f..81e699b40 100644
} }
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index c562c8ce7..7a74a0a53 100644 index c562c8ce7f..7a74a0a53a 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -937,13 +937,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas @@ -937,13 +937,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -625,7 +625,7 @@ index c562c8ce7..7a74a0a53 100644
public boolean getAllowNether() { public boolean getAllowNether() {
diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
index dc32107ec..b763d7f37 100644 index dc32107ec3..b763d7f37e 100644
--- a/src/main/java/net/minecraft/server/NavigationAbstract.java --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
+++ b/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
@@ -137,14 +137,14 @@ public abstract class NavigationAbstract { @@ -137,14 +137,14 @@ public abstract class NavigationAbstract {
@@ -646,7 +646,7 @@ index dc32107ec..b763d7f37 100644
this.q = pathentity.k(); this.q = pathentity.k();
this.r = j; this.r = j;
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
index 90319909e..c09c5440b 100644 index 90319909e5..c09c5440b3 100644
--- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java --- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
@@ -77,7 +77,7 @@ public class PathfinderGoalSelector { @@ -77,7 +77,7 @@ public class PathfinderGoalSelector {
@@ -690,7 +690,7 @@ index 90319909e..c09c5440b 100644
public Stream<PathfinderGoalWrapped> c() { public Stream<PathfinderGoalWrapped> c() {
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 7929fcc80..e1225d501 100644 index 7929fcc800..e1225d5017 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java --- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/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 { @@ -185,7 +185,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -712,7 +712,7 @@ index 7929fcc80..e1225d501 100644
for (int spam; (spam = this.chatThrottle) > 0 && !chatSpamField.compareAndSet(this, spam, spam - 1); ) ; for (int spam; (spam = this.chatThrottle) > 0 && !chatSpamField.compareAndSet(this, spam, spam - 1); ) ;
if (tabSpamLimiter.get() > 0) tabSpamLimiter.getAndDecrement(); // Paper - split to seperate variable 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 diff --git a/src/main/java/net/minecraft/server/TickListServer.java b/src/main/java/net/minecraft/server/TickListServer.java
index 3f1aa5ced..af705e6c6 100644 index 3f1aa5ced6..af705e6c65 100644
--- a/src/main/java/net/minecraft/server/TickListServer.java --- a/src/main/java/net/minecraft/server/TickListServer.java
+++ b/src/main/java/net/minecraft/server/TickListServer.java +++ b/src/main/java/net/minecraft/server/TickListServer.java
@@ -65,7 +65,7 @@ public class TickListServer<T> implements TickList<T> { @@ -65,7 +65,7 @@ public class TickListServer<T> implements TickList<T> {
@@ -743,7 +743,7 @@ index 3f1aa5ced..af705e6c6 100644
this.h.clear(); this.h.clear();
this.g.clear(); this.g.clear();
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index d554d4cf0..ef632a5f9 100644 index d554d4cf0f..ef632a5f9c 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -375,9 +375,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -375,9 +375,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -759,7 +759,7 @@ index d554d4cf0..ef632a5f9 100644
/* /*
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index a0db38b58..03cfc7f0b 100644 index a0db38b588..03cfc7f0bc 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -849,7 +849,7 @@ public class WorldServer extends World { @@ -849,7 +849,7 @@ public class WorldServer extends World {

4
patches/server/0009-Disable-Snooper.patch
View File

@@ -1,4 +1,4 @@
From 691963558f805f3a9cc0902b0ad6e30126a9f757 Mon Sep 17 00:00:00 2001 From f7e6383d04e10e96b6bc79ac294521492a1ec250 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?= From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
<tsao-chi@the-lingo.org> <tsao-chi@the-lingo.org>
Date: Thu, 2 Apr 2020 14:03:29 +0800 Date: Thu, 2 Apr 2020 14:03:29 +0800
@@ -6,7 +6,7 @@ Subject: [PATCH] Disable Snooper
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 7a74a0a53..c275944c0 100644 index 7a74a0a53a..c275944c05 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/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<TickTas @@ -1169,6 +1169,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

12
patches/server/0010-Server-Config.patch
View File

@@ -1,4 +1,4 @@
From 3cc7ee78a00b931cc3c008778d14e5784f911a15 Mon Sep 17 00:00:00 2001 From d6a82ab04ab9531194fad151a08069e893c958ab 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?= From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
<tsao-chi@the-lingo.org> <tsao-chi@the-lingo.org>
Date: Fri, 3 Apr 2020 14:59:22 +0800 Date: Fri, 3 Apr 2020 14:59:22 +0800
@@ -7,7 +7,7 @@ Subject: [PATCH] Server Config
diff --git a/src/main/java/io/akarin/server/Config.java b/src/main/java/io/akarin/server/Config.java diff --git a/src/main/java/io/akarin/server/Config.java b/src/main/java/io/akarin/server/Config.java
new file mode 100644 new file mode 100644
index 000000000..2ac8f02a9 index 0000000000..2ac8f02a97
--- /dev/null --- /dev/null
+++ b/src/main/java/io/akarin/server/Config.java +++ b/src/main/java/io/akarin/server/Config.java
@@ -0,0 +1,183 @@ @@ -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 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 1ef7890da5..9d82885dcf 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java --- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/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 @@ -194,6 +194,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -207,7 +207,7 @@ index 1ef7890da..9d82885dc 100644
this.setSpawnAnimals(dedicatedserverproperties.spawnAnimals); this.setSpawnAnimals(dedicatedserverproperties.spawnAnimals);
this.setSpawnNPCs(dedicatedserverproperties.spawnNpcs); this.setSpawnNPCs(dedicatedserverproperties.spawnNpcs);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index ef632a5f9..9708d61fd 100644 index ef632a5f9c..9708d61fd3 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/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 { @@ -82,6 +82,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -228,7 +228,7 @@ index ef632a5f9..9708d61fd 100644
this.world = new CraftWorld((WorldServer) this, gen, env); this.world = new CraftWorld((WorldServer) this, gen, env);
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit 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 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b381514d9..765b865b8 100644 index b381514d9f..765b865b85 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/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 { @@ -806,6 +806,7 @@ public final class CraftServer implements Server {
@@ -263,7 +263,7 @@ index b381514d9..765b865b8 100644
public void restart() { public void restart() {
org.spigotmc.RestartCommand.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 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 cb60310e63..04694464b1 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java --- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -138,6 +138,14 @@ public class Main { @@ -138,6 +138,14 @@ public class Main {

16
patches/server/0011-Async-pathfinder.patch
View File

@@ -1,4 +1,4 @@
From 937dbb928b747217d1b3097e69cf1fd6b3cdf20a Mon Sep 17 00:00:00 2001 From d248632e777b854bcb65fd6f1c3094e6287a08ee 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?= From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
<tsao-chi@the-lingo.org> <tsao-chi@the-lingo.org>
Date: Sun, 5 Apr 2020 13:01:13 +0800 Date: Sun, 5 Apr 2020 13:01:13 +0800
@@ -6,7 +6,7 @@ Subject: [PATCH] Async pathfinder
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index e9f00a1e1..72fa93d75 100644 index e9f00a1e13..72fa93d75f 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java --- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/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 { @@ -686,7 +686,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -19,7 +19,7 @@ index e9f00a1e1..72fa93d75 100644
//this.world.getMethodProfiler().enter("mob tick"); // Akarin - remove caller //this.world.getMethodProfiler().enter("mob tick"); // Akarin - remove caller
this.mobTick(); this.mobTick();
diff --git a/src/main/java/net/minecraft/server/Navigation.java b/src/main/java/net/minecraft/server/Navigation.java 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 abf450917e..4f7f40d5e7 100644
--- a/src/main/java/net/minecraft/server/Navigation.java --- a/src/main/java/net/minecraft/server/Navigation.java
+++ b/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 { @@ -183,7 +183,7 @@ public class Navigation extends NavigationAbstract {
@@ -32,7 +32,7 @@ index abf450917..4f7f40d5e 100644
if (pathtype == PathType.WATER) { if (pathtype == PathType.WATER) {
return false; return false;
diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
index b763d7f37..e1f3baa7b 100644 index b763d7f37e..e1f3baa7bb 100644
--- a/src/main/java/net/minecraft/server/NavigationAbstract.java --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
+++ b/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
@@ -22,13 +22,15 @@ public abstract class NavigationAbstract { @@ -22,13 +22,15 @@ public abstract class NavigationAbstract {
@@ -250,7 +250,7 @@ index b763d7f37..e1f3baa7b 100644
protected boolean p() { protected boolean p() {
return this.a.az() || this.a.aH(); return this.a.az() || this.a.aH();
diff --git a/src/main/java/net/minecraft/server/PathEntity.java b/src/main/java/net/minecraft/server/PathEntity.java diff --git a/src/main/java/net/minecraft/server/PathEntity.java b/src/main/java/net/minecraft/server/PathEntity.java
index dcb4e2508..265b6df4f 100644 index dcb4e25080..265b6df4f6 100644
--- a/src/main/java/net/minecraft/server/PathEntity.java --- a/src/main/java/net/minecraft/server/PathEntity.java
+++ b/src/main/java/net/minecraft/server/PathEntity.java +++ b/src/main/java/net/minecraft/server/PathEntity.java
@@ -110,7 +110,7 @@ public class PathEntity { @@ -110,7 +110,7 @@ public class PathEntity {
@@ -263,7 +263,7 @@ index dcb4e2508..265b6df4f 100644
} }
diff --git a/src/main/java/net/minecraft/server/Pathfinder.java b/src/main/java/net/minecraft/server/Pathfinder.java diff --git a/src/main/java/net/minecraft/server/Pathfinder.java b/src/main/java/net/minecraft/server/Pathfinder.java
index 67c63cfe3..00bd2327f 100644 index 67c63cfe33..00bd2327f2 100644
--- a/src/main/java/net/minecraft/server/Pathfinder.java --- a/src/main/java/net/minecraft/server/Pathfinder.java
+++ b/src/main/java/net/minecraft/server/Pathfinder.java +++ b/src/main/java/net/minecraft/server/Pathfinder.java
@@ -15,9 +15,9 @@ import javax.annotation.Nullable; @@ -15,9 +15,9 @@ import javax.annotation.Nullable;
@@ -315,7 +315,7 @@ index 67c63cfe3..00bd2327f 100644
List<PathPoint> list = Lists.newArrayList(); List<PathPoint> list = Lists.newArrayList();
PathPoint pathpoint1 = pathpoint; PathPoint pathpoint1 = pathpoint;
diff --git a/src/main/java/net/minecraft/server/PathfinderTurtle.java b/src/main/java/net/minecraft/server/PathfinderTurtle.java 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 59b1fe289c..1790878ae9 100644
--- a/src/main/java/net/minecraft/server/PathfinderTurtle.java --- a/src/main/java/net/minecraft/server/PathfinderTurtle.java
+++ b/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 { @@ -148,7 +148,7 @@ public class PathfinderTurtle extends PathfinderNormal {
@@ -328,7 +328,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 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 075b63ef57..a3473ddcfe 100644
--- a/src/main/java/net/minecraft/server/PathfinderWater.java --- a/src/main/java/net/minecraft/server/PathfinderWater.java
+++ b/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 { @@ -63,7 +63,7 @@ public class PathfinderWater extends PathfinderAbstract {

32
patches/server/0012-Optimizations-for-network.patch
View File

@@ -1,4 +1,4 @@
From 92f29e4176f1a5817960c22e8f43a827c6cd0a3e Mon Sep 17 00:00:00 2001 From d684fdf99760e63673130bea2ad607d2b5293af8 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?= From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
<tsao-chi@the-lingo.org> <tsao-chi@the-lingo.org>
Date: Sun, 5 Apr 2020 14:59:10 +0800 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 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 a85466bc7e..324af1a12a 100644
--- a/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java --- a/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java
+++ b/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 @@ -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 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 0532f975b7..e7be1074b1 100644
--- a/src/main/java/net/minecraft/server/HandshakeListener.java --- a/src/main/java/net/minecraft/server/HandshakeListener.java
+++ b/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 { @@ -39,7 +39,7 @@ public class HandshakeListener implements PacketHandshakingInListener {
@@ -46,7 +46,7 @@ index 0532f975b..e7be1074b 100644
} else { } else {
this.b.setPacketListener(new LoginListener(this.a, this.b)); 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 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 f1222fcb2b..522cfed4cb 100644
--- a/src/main/java/net/minecraft/server/LoginListener.java --- a/src/main/java/net/minecraft/server/LoginListener.java
+++ b/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 { @@ -111,6 +111,19 @@ public class LoginListener implements PacketLoginInListener {
@@ -106,7 +106,7 @@ index f1222fcb2..522cfed4c 100644
protected GameProfile a(GameProfile gameprofile) { 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 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
index 96a785af2..c5e32e424 100644 index 96a785af27..c5e32e4246 100644
--- a/src/main/java/net/minecraft/server/NetworkManager.java --- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -43,6 +43,8 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> { @@ -43,6 +43,8 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -221,7 +221,7 @@ index 96a785af2..c5e32e424 100644
if (this.t++ % 20 == 0) { if (this.t++ % 20 == 0) {
this.s = this.s * 0.75F + (float) this.q * 0.25F; 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 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 8d0965a053..7e27cd280f 100644
--- a/src/main/java/net/minecraft/server/Packet.java --- a/src/main/java/net/minecraft/server/Packet.java
+++ b/src/main/java/net/minecraft/server/Packet.java +++ b/src/main/java/net/minecraft/server/Packet.java
@@ -20,4 +20,10 @@ public interface Packet<T extends PacketListener> { @@ -20,4 +20,10 @@ public interface Packet<T extends PacketListener> {
@@ -236,7 +236,7 @@ index 8d0965a05..7e27cd280 100644
+ // Akarin end + // Akarin end
} }
diff --git a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java 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 7eb230f1b2..d01cac0bd4 100644
--- a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java --- a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
+++ b/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<PacketLoginOutListene @@ -41,4 +41,11 @@ public class PacketLoginOutCustomPayload implements Packet<PacketLoginOutListene
@@ -252,7 +252,7 @@ index 7eb230f1b..d01cac0bd 100644
+ // Akarin end + // Akarin end
} }
diff --git a/src/main/java/net/minecraft/server/PacketLoginOutDisconnect.java b/src/main/java/net/minecraft/server/PacketLoginOutDisconnect.java diff --git a/src/main/java/net/minecraft/server/PacketLoginOutDisconnect.java b/src/main/java/net/minecraft/server/PacketLoginOutDisconnect.java
index e5094f55f..a5d9b6d94 100644 index e5094f55f1..a5d9b6d94c 100644
--- a/src/main/java/net/minecraft/server/PacketLoginOutDisconnect.java --- a/src/main/java/net/minecraft/server/PacketLoginOutDisconnect.java
+++ b/src/main/java/net/minecraft/server/PacketLoginOutDisconnect.java +++ b/src/main/java/net/minecraft/server/PacketLoginOutDisconnect.java
@@ -25,4 +25,11 @@ public class PacketLoginOutDisconnect implements Packet<PacketLoginOutListener> @@ -25,4 +25,11 @@ public class PacketLoginOutDisconnect implements Packet<PacketLoginOutListener>
@@ -268,7 +268,7 @@ index e5094f55f..a5d9b6d94 100644
+ // Akarin end + // Akarin end
} }
diff --git a/src/main/java/net/minecraft/server/PacketLoginOutEncryptionBegin.java b/src/main/java/net/minecraft/server/PacketLoginOutEncryptionBegin.java 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 b0d6342c31..eeabb54c44 100644
--- a/src/main/java/net/minecraft/server/PacketLoginOutEncryptionBegin.java --- a/src/main/java/net/minecraft/server/PacketLoginOutEncryptionBegin.java
+++ b/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<PacketLoginOutListe @@ -34,4 +34,11 @@ public class PacketLoginOutEncryptionBegin implements Packet<PacketLoginOutListe
@@ -284,7 +284,7 @@ index b0d6342c3..eeabb54c4 100644
+ // Akarin end + // Akarin end
} }
diff --git a/src/main/java/net/minecraft/server/PacketLoginOutSetCompression.java b/src/main/java/net/minecraft/server/PacketLoginOutSetCompression.java diff --git a/src/main/java/net/minecraft/server/PacketLoginOutSetCompression.java b/src/main/java/net/minecraft/server/PacketLoginOutSetCompression.java
index fa0653a7e..d3b5f83d5 100644 index fa0653a7e4..d3b5f83d56 100644
--- a/src/main/java/net/minecraft/server/PacketLoginOutSetCompression.java --- a/src/main/java/net/minecraft/server/PacketLoginOutSetCompression.java
+++ b/src/main/java/net/minecraft/server/PacketLoginOutSetCompression.java +++ b/src/main/java/net/minecraft/server/PacketLoginOutSetCompression.java
@@ -25,4 +25,11 @@ public class PacketLoginOutSetCompression implements Packet<PacketLoginOutListen @@ -25,4 +25,11 @@ public class PacketLoginOutSetCompression implements Packet<PacketLoginOutListen
@@ -300,7 +300,7 @@ index fa0653a7e..d3b5f83d5 100644
+ // Akarin end + // Akarin end
} }
diff --git a/src/main/java/net/minecraft/server/PacketLoginOutSuccess.java b/src/main/java/net/minecraft/server/PacketLoginOutSuccess.java diff --git a/src/main/java/net/minecraft/server/PacketLoginOutSuccess.java b/src/main/java/net/minecraft/server/PacketLoginOutSuccess.java
index 54c290471..75d7bc196 100644 index 54c2904718..75d7bc1968 100644
--- a/src/main/java/net/minecraft/server/PacketLoginOutSuccess.java --- a/src/main/java/net/minecraft/server/PacketLoginOutSuccess.java
+++ b/src/main/java/net/minecraft/server/PacketLoginOutSuccess.java +++ b/src/main/java/net/minecraft/server/PacketLoginOutSuccess.java
@@ -34,4 +34,11 @@ public class PacketLoginOutSuccess implements Packet<PacketLoginOutListener> { @@ -34,4 +34,11 @@ public class PacketLoginOutSuccess implements Packet<PacketLoginOutListener> {
@@ -316,7 +316,7 @@ index 54c290471..75d7bc196 100644
+ // Akarin end + // Akarin end
} }
diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java 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 4bb21c48bd..06af567fc1 100644
--- a/src/main/java/net/minecraft/server/PacketStatusListener.java --- a/src/main/java/net/minecraft/server/PacketStatusListener.java
+++ b/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 { @@ -143,7 +143,7 @@ public class PacketStatusListener implements PacketStatusInListener {
@@ -329,7 +329,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 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 94a0da87db..577c6ef9cf 100644
--- a/src/main/java/net/minecraft/server/PacketStatusOutPong.java --- a/src/main/java/net/minecraft/server/PacketStatusOutPong.java
+++ b/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<PacketStatusOutListener> { @@ -25,4 +25,11 @@ public class PacketStatusOutPong implements Packet<PacketStatusOutListener> {
@@ -345,7 +345,7 @@ index 94a0da87d..577c6ef9c 100644
+ // Akarin end + // Akarin end
} }
diff --git a/src/main/java/net/minecraft/server/PacketStatusOutServerInfo.java b/src/main/java/net/minecraft/server/PacketStatusOutServerInfo.java 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 50d5fb62ef..4da7a2c1a4 100644
--- a/src/main/java/net/minecraft/server/PacketStatusOutServerInfo.java --- a/src/main/java/net/minecraft/server/PacketStatusOutServerInfo.java
+++ b/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<PacketStatusOutListener @@ -28,4 +28,11 @@ public class PacketStatusOutServerInfo implements Packet<PacketStatusOutListener
@@ -361,7 +361,7 @@ index 50d5fb62e..4da7a2c1a 100644
+ // Akarin end + // Akarin end
} }
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index e1225d501..3d0397620 100644 index e1225d5017..3d03976203 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java --- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -284,9 +284,9 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -284,9 +284,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -377,7 +377,7 @@ index e1225d501..3d0397620 100644
@Override @Override
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 6d6fbf2f5..4b549ccc4 100644 index 6d6fbf2f50..4b549ccc41 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java --- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -159,13 +159,15 @@ public abstract class PlayerList { @@ -159,13 +159,15 @@ public abstract class PlayerList {

4
patches/server/0013-Swaps-the-predicate-order-of-collision.patch
View File

@@ -1,4 +1,4 @@
From 3d8e8c89b13f5bc5140a4843feeedba688749a89 Mon Sep 17 00:00:00 2001 From 0813729083aa4a9428d942948949aceb6a7c6f14 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?= From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
<tsao-chi@the-lingo.org> <tsao-chi@the-lingo.org>
Date: Fri, 10 Apr 2020 15:47:15 +0800 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 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 34aac6031..3de2d40a4 100644 index 34aac60312..3de2d40a4d 100644
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/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 @@ -1403,8 +1403,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

4
patches/server/0014-Akarin-Metrics.patch
View File

@@ -1,4 +1,4 @@
From ab1369b91460adfb60c4350a634a9ebfb5efb7ec Mon Sep 17 00:00:00 2001 From 519ffa752cbbc7d21d51e138408b5709088efa09 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?= From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
<tsao-chi@the-lingo.org> <tsao-chi@the-lingo.org>
Date: Mon, 13 Apr 2020 13:18:27 +0800 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 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 e257d6b36e..81f0aef68c 100644
--- a/src/main/java/com/destroystokyo/paper/Metrics.java --- a/src/main/java/com/destroystokyo/paper/Metrics.java
+++ b/src/main/java/com/destroystokyo/paper/Metrics.java +++ b/src/main/java/com/destroystokyo/paper/Metrics.java
@@ -578,7 +578,7 @@ public class Metrics { @@ -578,7 +578,7 @@ public class Metrics {

4
patches/server/0015-Tuinity-Use-ArrayDeque-for-pendingChunkUpdates-in-Ch.patch
View File

@@ -1,4 +1,4 @@
From e26c7cbb36ac3392a50ea53e5c30bfa128a7a6be Mon Sep 17 00:00:00 2001 From 2aee08384e8e66b46549aad18f1f0a5d3c8cb907 Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk> From: Sotr <i@omc.hk>
Date: Wed, 15 Apr 2020 02:39:12 +0700 Date: Wed, 15 Apr 2020 02:39:12 +0700
Subject: [PATCH] Tuinity Use ArrayDeque for pendingChunkUpdates in 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 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 0244768f76..13d113aee5 100644
--- a/src/main/java/net/minecraft/server/ChunkMapDistance.java --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
+++ b/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 { @@ -33,7 +33,7 @@ public abstract class ChunkMapDistance {

4
patches/server/0016-Tuinity-Optimise-ArraySetSorted-removeIf.patch
View File

@@ -1,4 +1,4 @@
From 07cdb53d17bf4558f6e188e17af68826131ace49 Mon Sep 17 00:00:00 2001 From dc576ed9118409b58d8a1fdb73b36ddc717d9549 Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk> From: Sotr <i@omc.hk>
Date: Wed, 15 Apr 2020 02:44:07 +0700 Date: Wed, 15 Apr 2020 02:44:07 +0700
Subject: [PATCH] Tuinity Optimise ArraySetSorted#removeIf 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) 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 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 85f799a713..f23ddb9e0c 100644
--- a/src/main/java/net/minecraft/server/ArraySetSorted.java --- a/src/main/java/net/minecraft/server/ArraySetSorted.java
+++ b/src/main/java/net/minecraft/server/ArraySetSorted.java +++ b/src/main/java/net/minecraft/server/ArraySetSorted.java
@@ -11,7 +11,9 @@ public class ArraySetSorted<T> extends AbstractSet<T> { @@ -11,7 +11,9 @@ public class ArraySetSorted<T> extends AbstractSet<T> {

4
patches/server/0017-Don-t-run-entity-collision-code-if-not-needed.patch
View File

@@ -1,4 +1,4 @@
From c9c8324d357057b71daaf5b72f417b17bf108bf0 Mon Sep 17 00:00:00 2001 From 7a0d54b371124fb3ebde16772a8ffa64ae6518e4 Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk> From: Sotr <i@omc.hk>
Date: Wed, 15 Apr 2020 02:49:56 +0700 Date: Wed, 15 Apr 2020 02:49:56 +0700
Subject: [PATCH] Don't run entity collision code if not needed 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 Tunity#7131da4. This commit was basically referenced on Tunity#7131da4.
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index e93b7b280..3beeb05b1 100644 index e93b7b2809..3beeb05b14 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java --- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/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 { @@ -2663,10 +2663,16 @@ public abstract class EntityLiving extends Entity {

8
patches/server/0018-Optimize-door-interact-pathfinding.patch
View File

@@ -1,4 +1,4 @@
From 2176d6a89e597569a040ec060106ce99713f591a Mon Sep 17 00:00:00 2001 From 4a1b791e1a4960a90fa5a44318de4c08489245c8 Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk> From: Sotr <i@omc.hk>
Date: Wed, 15 Apr 2020 03:51:50 +0700 Date: Wed, 15 Apr 2020 03:51:50 +0700
Subject: [PATCH] Optimize door interact pathfinding Subject: [PATCH] Optimize door interact pathfinding
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize door interact pathfinding
diff --git a/src/main/java/io/akarin/server/IndexedBlockPosition.java b/src/main/java/io/akarin/server/IndexedBlockPosition.java diff --git a/src/main/java/io/akarin/server/IndexedBlockPosition.java b/src/main/java/io/akarin/server/IndexedBlockPosition.java
new file mode 100644 new file mode 100644
index 000000000..83bf1d4ca index 0000000000..83bf1d4cab
--- /dev/null --- /dev/null
+++ b/src/main/java/io/akarin/server/IndexedBlockPosition.java +++ b/src/main/java/io/akarin/server/IndexedBlockPosition.java
@@ -0,0 +1,35 @@ @@ -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 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 01d9c2d92c..3db22c5f4d 100644
--- a/src/main/java/net/minecraft/server/BehaviorInteractDoor.java --- a/src/main/java/net/minecraft/server/BehaviorInteractDoor.java
+++ b/src/main/java/net/minecraft/server/BehaviorInteractDoor.java +++ b/src/main/java/net/minecraft/server/BehaviorInteractDoor.java
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
@@ -147,7 +147,7 @@ index 01d9c2d92..3db22c5f4 100644
if (worldserver.getWorldProvider().getDimensionManager() != globalpos.getDimensionManager()) { if (worldserver.getWorldProvider().getDimensionManager() != globalpos.getDimensionManager()) {
iterator.remove(); iterator.remove();
diff --git a/src/main/java/net/minecraft/server/BehaviorSleep.java b/src/main/java/net/minecraft/server/BehaviorSleep.java 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 dfe0f66500..46eb633084 100644
--- a/src/main/java/net/minecraft/server/BehaviorSleep.java --- a/src/main/java/net/minecraft/server/BehaviorSleep.java
+++ b/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<EntityLiving> { @@ -57,7 +57,7 @@ public class BehaviorSleep extends Behavior<EntityLiving> {

4
patches/server/0019-Remove-stream-for-ender-teleport.patch
View File

@@ -1,11 +1,11 @@
From 6b522ba6a95bf21369dc3f41f9b2ddbcc6e93740 Mon Sep 17 00:00:00 2001 From d35e42710ea9d7b74e606995f955fca9605cc750 Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk> From: Sotr <i@omc.hk>
Date: Wed, 15 Apr 2020 04:16:44 +0700 Date: Wed, 15 Apr 2020 04:16:44 +0700
Subject: [PATCH] Remove stream for ender teleport 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 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 3de2d40a4..c31bed6ac 100644 index 3de2d40a4d..c31bed6ac2 100644
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/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 @@ -2842,7 +2842,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

6
patches/server/0020-Cache-Hashcode-for-BlockPosition.patch
View File

@@ -1,11 +1,11 @@
From 2bc88b8902b17a4ae0e22010f4591b500296e6b9 Mon Sep 17 00:00:00 2001 From b6acf84069f78250453e7f0f609a1ce5021fe9d8 Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk> From: Sotr <i@omc.hk>
Date: Wed, 15 Apr 2020 04:28:25 +0700 Date: Wed, 15 Apr 2020 04:28:25 +0700
Subject: [PATCH] Cache Hashcode for BlockPosition 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 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
index c439a8d01..808f2eb6c 100644 index c439a8d019..808f2eb6cb 100644
--- a/src/main/java/net/minecraft/server/BaseBlockPosition.java --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
+++ b/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<BaseBlockPosition> { @@ -18,6 +18,7 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
@@ -37,7 +37,7 @@ index c439a8d01..808f2eb6c 100644
public int compareTo(BaseBlockPosition baseblockposition) { 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(); 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 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 2d07d350d2..43e7e5c27b 100644
--- a/src/main/java/net/minecraft/server/BlockPosition.java --- a/src/main/java/net/minecraft/server/BlockPosition.java
+++ b/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 @@ -439,6 +439,7 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali

60
patches/server/0021-Remove-stream-and-simplify-op-in-pathfinder.patch Normal file
View File

@@ -0,0 +1,60 @@
From 2cb5743ec13a1dae4f1c9546497b045428bea23b Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk>
Date: Wed, 15 Apr 2020 17:49:07 +0700
Subject: [PATCH] Remove stream and simplify op in pathfinder
diff --git a/src/main/java/net/minecraft/server/Pathfinder.java b/src/main/java/net/minecraft/server/Pathfinder.java
index 00bd2327f2..e645ee7422 100644
--- a/src/main/java/net/minecraft/server/Pathfinder.java
+++ b/src/main/java/net/minecraft/server/Pathfinder.java
@@ -32,9 +32,20 @@ public class Pathfinder {
this.a.a();
this.e.a(chunkcache, entityinsentient);
PathPoint pathpoint = this.e.b();
+ // Akarin start - remove stream, add BlockPosition
+ /*
Map<PathDestination, BlockPosition> map = (Map) set.stream().collect(Collectors.toMap((blockposition) -> {
- return this.e.a((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ());
+ return this.e.a((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ());
}, Function.identity()));
+ */
+ Set<PathDestination> map = new java.util.HashSet<PathDestination>(set.size());
+ for (BlockPosition position : set) {
+ PathDestination dest = this.e.a((double) position.getX(), position.getY(), position.getZ());
+ dest.position = position;
+
+ map.add(dest);
+ }
+ // Akarin end
PathEntity pathentity = this.a(pathpoint, map, f, i, f1);
this.e.a();
@@ -43,8 +54,8 @@ public class Pathfinder {
private PathEntity findPaths0(PathPoint pathpoint, Map<PathDestination, BlockPosition> map, float f, int i, float f1) { return a(pathpoint, map, f, i, f1); } // Akarin - OBFHELPER
@Nullable
- private PathEntity a(PathPoint pathpoint, Map<PathDestination, BlockPosition> map, float f, int i, float f1) {
- Set<PathDestination> set = map.keySet();
+ private PathEntity a(PathPoint pathpoint, Set<PathDestination> map, float f, int i, float f1) { // Akarin - Map -> Set
+ Set<PathDestination> set = map; // Akarin - Map -> Set
pathpoint.e = 0.0F;
pathpoint.f = this.a(pathpoint, set);
@@ -100,11 +111,11 @@ public class Pathfinder {
if (set.stream().anyMatch(PathDestination::f)) {
stream = set.stream().filter(PathDestination::f).map((pathdestination) -> {
- return this.a(pathdestination.d(), (BlockPosition) map.get(pathdestination), true);
+ return this.a(pathdestination.d(), (BlockPosition) pathdestination.position, true); // Akarin - add BlockPosition
}).sorted(Comparator.comparingInt(PathEntity::e));
} else {
stream = set.stream().map((pathdestination) -> {
- return this.a(pathdestination.d(), (BlockPosition) map.get(pathdestination), false);
+ return this.a(pathdestination.d(), (BlockPosition) pathdestination.position, false); // Akarin - add BlockPosition
}).sorted(Comparator.comparingDouble(PathEntity::l).thenComparingInt(PathEntity::e));
}
--
2.25.1.windows.1

18
scripts/applyPatches.sh
View File

@@ -37,12 +37,12 @@ function applyPatch {
cd "$basedir/$baseproject" cd "$basedir/$baseproject"
$gitcmd fetch --all &> /dev/null $gitcmd fetch --all &> /dev/null
# Create the upstream branch in Paper project with current state # Create the upstream branch in Paper project with current state
$gitcmd checkout master >/dev/null # possibly already in $gitcmd checkout master >/dev/null 2>&1 # possibly already in
$gitcmd branch -D upstream >/dev/null &> /dev/null $gitcmd branch -D upstream &> /dev/null
$gitcmd branch -f upstream "$branch" &> /dev/null && $gitcmd checkout upstream &> /dev/null $gitcmd branch -f upstream "$branch" &> /dev/null && $gitcmd checkout upstream &> /dev/null
if [[ $needimport != "1" ]]; then if [[ $needimport != "1" ]]; then
if [ $baseproject != "${FORK_NAME}-API" ]; then if [ $baseproject != "Paper/Paper-API" ]; then
echo " $(bashcolor 1 32)($5/$6)$(bashcolorend) - Import new introduced NMS files.." echo " $(bashcolor 1 32)($5/$6)$(bashcolorend) - Import new introduced NMS files.."
basedir && $scriptdir/importSources.sh $basedir 1 || exit 1 basedir && $scriptdir/importSources.sh $basedir 1 || exit 1
fi fi
@@ -58,15 +58,17 @@ function applyPatch {
cd "$basedir/$target" cd "$basedir/$target"
$gitcmd init > /dev/null 2>&1 $gitcmd init > /dev/null 2>&1
echo " "
echo " $(bashcolor 1 32)($5/$6)$(bashcolorend) - Reset $target to $basename.." echo " $(bashcolor 1 32)($5/$6)$(bashcolorend) - Reset $target to $basename.."
# Add the generated Paper project as the upstream remote of subproject # Add the generated Paper project as the upstream remote of subproject
$gitcmd remote rm upstream >/dev/null 2>&1 $gitcmd remote rm upstream &> /dev/null
$gitcmd remote add upstream "$basedir/$baseproject" >/dev/null 2>&1 $gitcmd remote add upstream "$basedir/$baseproject" &> /dev/null
# Ensure that we are in the branch we want so not overriding things # Ensure that we are in the branch we want so not overriding things
$gitcmd checkout master 2>/dev/null || $gitcmd checkout -b master $gitcmd checkout master &> /dev/null || $gitcmd checkout -b master &> /dev/null
$gitcmd fetch upstream >/dev/null 2>&1 $gitcmd fetch upstream &> /dev/null
# Reset our source project to Paper # Reset our source project to Paper
cd "$basedir/$target" && $gitcmd reset --hard upstream/upstream cd "$basedir/$target" && $gitcmd reset --hard upstream/upstream &> /dev/null
echo " "
echo " $(bashcolor 1 32)($5/$6)$(bashcolorend) - Apply patches to $target.." echo " $(bashcolor 1 32)($5/$6)$(bashcolorend) - Apply patches to $target.."
# Abort previous applying operation # Abort previous applying operation

20
scripts/importSources.sh
View File

@@ -40,7 +40,7 @@ basedir
function importToPaperWorkspace { function importToPaperWorkspace {
if [ -f "$papernmsdir/$1.java" ]; then if [ -f "$papernmsdir/$1.java" ]; then
echo " $(bashcolor 1 33)Skipped$(bashcolorend) - Already imported $1.java" # echo " $(bashcolor 1 33)Skipped$(bashcolorend) - Already imported $1.java"
return 0 return 0
fi fi
@@ -92,6 +92,16 @@ patchedFiles=$(cat patches/server/* | grep "+++ b/src/main/java/net/minecraft/se
patchedFilesNonNMS=$(cat patches/server/* | grep "create mode " | grep -Po "src/main/java/net/minecraft/server/(.*?).java" | sort | uniq | sed 's/src\/main\/java\/net\/minecraft\/server\///g' | sed 's/.java//g') patchedFilesNonNMS=$(cat patches/server/* | grep "create mode " | grep -Po "src/main/java/net/minecraft/server/(.*?).java" | sort | uniq | sed 's/src\/main\/java\/net\/minecraft\/server\///g' | sed 's/.java//g')
(
cd "$paperserverdir"
$gitcmd fetch --all &> /dev/null
# Create the upstream branch in Paper project with current state
$gitcmd checkout master >/dev/null 2>&1 # possibly already in
$gitcmd branch -D upstream &>/dev/null
$gitcmd branch -f upstream HEAD && $gitcmd checkout upstream
)
basedir
for f in $patchedFiles; do for f in $patchedFiles; do
containsElement "$f" ${patchedFilesNonNMS[@]} containsElement "$f" ${patchedFilesNonNMS[@]}
if [ "$?" == "1" ]; then if [ "$?" == "1" ]; then
@@ -107,7 +117,10 @@ for f in $patchedFiles; do
done done
# NMS import format: # NMS import format:
# importToPaperWorkspace MinecraftServer.java # importToPaperWorkspace MinecraftServer
importToPaperWorkspace CommandGive
importToPaperWorkspace PathDestination
# Library import format (multiple files are supported): # Library import format (multiple files are supported):
# importLibraryToPaperWorkspace com.mojang datafixerupper com/mojang/datafixers/util Either.java # importLibraryToPaperWorkspace com.mojang datafixerupper com/mojang/datafixers/util Either.java
@@ -118,12 +131,11 @@ done
# rm -rf nms-patches # rm -rf nms-patches
git add . &> /dev/null git add . &> /dev/null
echo -e "Extra dev imports of Akarin\n\n$IMPORT_LOG" | git commit src -F - &> /dev/null echo -e "Extra dev imports of Akarin\n\n$IMPORT_LOG" | git commit src -F - &> /dev/null
echo " $(bashcolor 1 32)Succeed$(bashcolorend) - Sources have been imported to Paper/Paper-Server" echo " $(bashcolor 1 32)Succeed$(bashcolorend) - Sources have been imported to Paper/Paper-Server (branch upstream)"
if [[ $maintask != "0" ]]; then # this is magical if [[ $maintask != "0" ]]; then # this is magical
echo "----------------------------------------" echo "----------------------------------------"
echo " Subtask finished" echo " Subtask finished"
echo "----------------------------------------" echo "----------------------------------------"
fi fi
echo " "
) )

2
scripts/updateUpstream.sh
View File

@@ -29,7 +29,7 @@ subtasks=1
updatepaper=$2 updatepaper=$2
if [ "$updatepaper" == "1" ]; then if [ "$updatepaper" == "1" ]; then
echo " $(bashcolor 1 32)(0/$subtasks)$(bashcolorend) - Update Git submodules.." echo " $(bashcolor 1 32)(0/$subtasks)$(bashcolorend) - Update Git submodules.."
$gitcmd submodule update --init --recursive $gitcmd submodule update --init --remote
fi fi
if [[ "$2" == "--resetPaper" ]]; then if [[ "$2" == "--resetPaper" ]]; then