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

Format patches

Browse Source
This commit is contained in:
Sotr
2020-04-15 22:19:01 +07:00
parent 5ee75e7aa4
commit 17c797f817
23 changed files with 48 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 56759aad2b78d8a4db1621f0b67acd6d57cc715c Mon Sep 17 00:00:00 2001
From 27cf91060430b01a21ffd92698be222b930aecc7 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?=
<tsao-chi@the-lingo.org>
Date: Fri, 14 Dec 2018 21:52:29 -0800

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

@@ -1,4 +1,4 @@
From d7c702f0bb802341021672f7b2f00849806caf44 Mon Sep 17 00:00:00 2001
From 2fd33c2095a0d17b655a4e96db14f8ee18f1e743 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?=
<tsao-chi@the-lingo.org>
Date: Fri, 3 Apr 2020 15:18:38 +0800

2
patches/server/0001-Fix-errors-on-editors-and-add-ignores.patch
View File

@@ -1,4 +1,4 @@
From 2a283176f574b2b85e9c6281e55db4053ad37247 Mon Sep 17 00:00:00 2001
From d5167363e223f5e97b9ddc357ce08798fd5c6131 Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk>
Date: Wed, 15 Apr 2020 00:52:56 +0700
Subject: [PATCH] Fix errors on editors and add ignores

2
patches/server/0002-Akarin-POM-changes.patch
View File

@@ -1,4 +1,4 @@
From da4c94eec26121e06ae48a1341a6399b9bbc4924 Mon Sep 17 00:00:00 2001
From 27b6bb82218f72a45f74810f48148cbccb4b7c08 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?=
<tsao-chi@the-lingo.org>
Date: Fri, 14 Dec 2018 21:53:58 -0800

6
patches/server/0010-Server-Config.patch → patches/server/0003-Server-Config.patch
View File

@@ -1,4 +1,4 @@
From 46b39846bb2bfd9cfa5fc41973cd774bc3fed412 Mon Sep 17 00:00:00 2001
From e21569dd3542272523aa74111fe90fad1cf17279 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?=
<tsao-chi@the-lingo.org>
Date: Fri, 3 Apr 2020 14:59:22 +0800
@@ -207,7 +207,7 @@ index 1ef7890da5..9d82885dcf 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 ef632a5f9c..9708d61fd3 100644
index d554d4cf0f..839ddb14ef 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 ef632a5f9c..9708d61fd3 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 b381514d9f..765b865b85 100644
index 8cc0f66ce5..ed684cc0d5 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 {

4
patches/server/0003-Akarin-brand-changes.patch → patches/server/0004-Akarin-brand-changes.patch
View File

@@ -1,4 +1,4 @@
From e57e06602dc3b49abbcd1a655f62b1e88c635290 Mon Sep 17 00:00:00 2001
From 0634db2d5b61a0fd487c86a8ae7d7b599d75a7cf 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?=
<tsao-chi@the-lingo.org>
Date: Tue, 18 Dec 2018 06:27:02 -0800
@@ -32,7 +32,7 @@ index a9b5337512..c562c8ce7f 100644
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
index 8cc0f66ce5..b381514d9f 100644
index ed684cc0d5..765b865b85 100644
--- a/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

2
patches/server/0014-Akarin-Metrics.patch → patches/server/0005-Akarin-Metrics.patch
View File

@@ -1,4 +1,4 @@
From bc972d9f660d6a645db8fb7841ed27bf1970d30e Mon Sep 17 00:00:00 2001
From f1bcff1bb128345c205059fe0b29c0064945942e 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?=
<tsao-chi@the-lingo.org>
Date: Mon, 13 Apr 2020 13:18:27 +0800

15
patches/server/0009-Disable-Snooper.patch → patches/server/0006-Disable-Snooper.patch
View File

@@ -1,18 +1,17 @@
From 2c72d201b24703cba5424fc6cd071c86d39d900e 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?=
<tsao-chi@the-lingo.org>
Date: Thu, 2 Apr 2020 14:03:29 +0800
From f865ed828d710212f043db1ce1dd14475d4ea3ae Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk>
Date: Wed, 15 Apr 2020 22:17:18 +0700
Subject: [PATCH] Disable Snooper
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 7a74a0a53a..c275944c05 100644
index c562c8ce7f..63865f767b 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<TickTas
//} // Paper
//this.methodProfiler.enter("snooper"); // Akarin - remove caller
this.methodProfiler.enter("snooper");
+ // Akarin - Disable Snooper
+ /*
if (((DedicatedServer) this).getDedicatedServerProperties().snooperEnabled && !this.snooper.d() && this.ticks > 100) { // Spigot
@@ -24,8 +23,8 @@ index 7a74a0a53a..c275944c05 100644
}
+ */
//this.methodProfiler.exit(); // Akarin - remove caller
//this.methodProfiler.enter("tallying"); // Akarin - remove caller
this.methodProfiler.exit();
this.methodProfiler.enter("tallying");
--
2.25.1.windows.1

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

@@ -1,4 +1,4 @@
From ff921bf1847779ff7cb77d3e9741dbc29723a48c Mon Sep 17 00:00:00 2001
From af599857b5230b3b9fb3734b51db15a73e36000a 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?=
<tsao-chi@the-lingo.org>
Date: Thu, 2 Apr 2020 11:29:08 +0800

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

@@ -1,4 +1,4 @@
From aaee4920aa9d14b730979b9d041c79b0414d76d3 Mon Sep 17 00:00:00 2001
From 7937bee0a958674d3568ede0e8f49b3ddc2bbff4 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?=
<tsao-chi@the-lingo.org>
Date: Thu, 2 Apr 2020 11:43:20 +0800

2
patches/server/0006-Never-drop-items-on-command-give.patch → patches/server/0009-Never-drop-items-on-command-give.patch
View File

@@ -1,4 +1,4 @@
From f958e7285e8da43abd74ddf253853cef63050822 Mon Sep 17 00:00:00 2001
From a24bb59b51f10e203094456df8f80e496e47b63a 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?=
<tsao-chi@the-lingo.org>
Date: Thu, 2 Apr 2020 11:35:19 +0800

2
patches/server/0007-Save-json-list-async.patch → patches/server/0010-Save-Json-list-asynchronously.patch
View File

@@ -1,4 +1,4 @@
From ceddb60c64f6b387808fbddaff6ee566b54f7046 Mon Sep 17 00:00:00 2001
From aff3e04b4d4cf331217fb59d678dc8abbad6aea4 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?=
<tsao-chi@the-lingo.org>
Date: Thu, 2 Apr 2020 11:16:18 +0800

33
patches/server/0008-Remove-method-profiler-callers.patch → patches/server/0011-Remove-method-profiler-callers.patch
View File

@@ -1,7 +1,6 @@
From eb1114c0c52b64a566a0748f2079f9483760d466 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?=
<tsao-chi@the-lingo.org>
Date: Thu, 2 Apr 2020 12:30:35 +0800
From 0beb791a340ae1dd6d3a43babebd1e6d37ea36b9 Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk>
Date: Wed, 15 Apr 2020 22:18:01 +0700
Subject: [PATCH] Remove method profiler callers
@@ -490,7 +489,7 @@ index a353f3d5fa..81e699b404 100644
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index c562c8ce7f..7a74a0a53a 100644
index 63865f767b..4f0cad71bd 100644
--- a/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
@@ -530,12 +529,12 @@ index c562c8ce7f..7a74a0a53a 100644
- this.methodProfiler.enter("snooper");
+ // this.methodProfiler.enter("snooper"); // Akarin - remove caller
// Akarin - Disable Snooper
/*
if (((DedicatedServer) this).getDedicatedServerProperties().snooperEnabled && !this.snooper.d() && this.ticks > 100) { // Spigot
this.snooper.a();
}
@@ -1177,8 +1177,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
this.snooper.b();
@@ -1180,8 +1180,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
*/
- this.methodProfiler.exit();
- this.methodProfiler.enter("tallying");
@@ -544,7 +543,7 @@ index c562c8ce7f..7a74a0a53a 100644
long l = this.f[this.ticks % 100] = SystemUtils.getMonotonicNanos() - i;
// Paper start
@@ -1191,7 +1191,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1194,7 +1194,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
long i1 = SystemUtils.getMonotonicNanos();
this.circularTimer.a(i1 - i);
@@ -553,7 +552,7 @@ index c562c8ce7f..7a74a0a53a 100644
org.spigotmc.WatchdogThread.tick(); // Spigot
this.slackActivityAccountant.tickEnded(l); // Spigot
// Paper start - move executeAll() into full server tick timing
@@ -1211,11 +1211,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1214,11 +1214,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
MinecraftTimings.bukkitSchedulerTimer.startTiming(); // Spigot // Paper
this.server.getScheduler().mainThreadHeartbeat(this.ticks); // CraftBukkit
MinecraftTimings.bukkitSchedulerTimer.stopTiming(); // Spigot // Paper
@@ -567,7 +566,7 @@ index c562c8ce7f..7a74a0a53a 100644
Iterator iterator = this.getWorlds().iterator();
// CraftBukkit start
@@ -1259,13 +1259,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1262,13 +1262,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
});
/* Drop global time updates
if (this.ticks % 20 == 0) {
@@ -584,7 +583,7 @@ index c562c8ce7f..7a74a0a53a 100644
try {
worldserver.timings.doTick.startTiming(); // Spigot
@@ -1285,17 +1285,17 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1288,17 +1288,17 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
throw new ReportedException(crashreport);
}
@@ -606,7 +605,7 @@ index c562c8ce7f..7a74a0a53a 100644
MinecraftTimings.playerListTimer.startTiming(); // Spigot // Paper
this.playerList.tick();
MinecraftTimings.playerListTimer.stopTiming(); // Spigot // Paper
@@ -1303,7 +1303,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1306,7 +1306,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
GameTestHarnessTicker.a.b();
}
@@ -615,7 +614,7 @@ index c562c8ce7f..7a74a0a53a 100644
MinecraftTimings.tickablesTimer.startTiming(); // Spigot // Paper
for (int i = 0; i < this.tickables.size(); ++i) {
@@ -1311,7 +1311,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1314,7 +1314,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
MinecraftTimings.tickablesTimer.stopTiming(); // Spigot // Paper
@@ -743,10 +742,10 @@ index 3f1aa5ced6..af705e6c65 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 d554d4cf0f..ef632a5f9c 100644
index 839ddb14ef..9708d61fd3 100644
--- a/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 {
@@ -378,9 +378,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
IBlockData iblockdata2 = this.getType(blockposition);
if (iblockdata2 != iblockdata1 && (iblockdata2.b((IBlockAccess) this, blockposition) != iblockdata1.b((IBlockAccess) this, blockposition) || iblockdata2.h() != iblockdata1.h() || iblockdata2.g() || iblockdata1.g())) {

2
patches/server/0011-Async-pathfinder.patch → patches/server/0012-Async-pathfinder.patch
View File

@@ -1,4 +1,4 @@
From 21633196b40b9a96edefd70e8d9cc5d01dc1a675 Mon Sep 17 00:00:00 2001
From 21259e466a404ebf8d46ff4c24724f74b93ee50e 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?=
<tsao-chi@the-lingo.org>
Date: Sun, 5 Apr 2020 13:01:13 +0800

2
patches/server/0012-Optimizations-for-network.patch → patches/server/0013-Optimizations-for-network.patch
View File

@@ -1,4 +1,4 @@
From 919043ab22fdc8a0323d2d4815c7413205cc0640 Mon Sep 17 00:00:00 2001
From 73627adb69e7cbbea68e6a070122adb641f99bf4 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?=
<tsao-chi@the-lingo.org>
Date: Sun, 5 Apr 2020 14:59:10 +0800

2
patches/server/0013-Swaps-the-predicate-order-of-collision.patch → patches/server/0014-Swaps-the-predicate-order-of-collision.patch
View File

@@ -1,4 +1,4 @@
From 3c722468b1e75186e945bf20807f5521dd904602 Mon Sep 17 00:00:00 2001
From 5b87c497859c1b0127fd79dd439a7765a3dc188a 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?=
<tsao-chi@the-lingo.org>
Date: Fri, 10 Apr 2020 15:47:15 +0800

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

@@ -1,4 +1,4 @@
From 97782e67bbd821c17b3fa77a35c86e3b727a937c Mon Sep 17 00:00:00 2001
From beb8baffb0140c446cfeb518ae61925298a47325 Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk>
Date: Wed, 15 Apr 2020 02:39:12 +0700
Subject: [PATCH] Tuinity Use ArrayDeque for pendingChunkUpdates in

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

@@ -1,4 +1,4 @@
From 7bf955013e1000bc3a1283a762b5a4f70e99574e Mon Sep 17 00:00:00 2001
From 8e0201054e6da7574f6df1142ed28bad08be626b Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk>
Date: Wed, 15 Apr 2020 02:44:07 +0700
Subject: [PATCH] Tuinity Optimise ArraySetSorted#removeIf

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

@@ -1,4 +1,4 @@
From 5b5043ed6b816c44c3371f771c705244f60b9daf Mon Sep 17 00:00:00 2001
From b16dd9adf27b2567f14057ab25f9812e70cea75d Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk>
Date: Wed, 15 Apr 2020 02:49:56 +0700
Subject: [PATCH] Don't run entity collision code if not needed

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

@@ -1,4 +1,4 @@
From 35285496af940f4d3e637f40441304382f7942c5 Mon Sep 17 00:00:00 2001
From 272a544f13387faacb64b82ea3a30a60ade2cb77 Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk>
Date: Wed, 15 Apr 2020 03:51:50 +0700
Subject: [PATCH] Optimize door interact pathfinding

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

@@ -1,4 +1,4 @@
From ca25caefb5d5551f89b0d8058fd24e9a4fdcc4e1 Mon Sep 17 00:00:00 2001
From 237b5d67d51b19415344941091274092356a623b Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk>
Date: Wed, 15 Apr 2020 04:16:44 +0700
Subject: [PATCH] Remove stream for ender teleport

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

@@ -1,4 +1,4 @@
From bda2fc2fde32f266195cf363d30fe3bdcaf8835c Mon Sep 17 00:00:00 2001
From dc519a9f410da9b8912f98bab9fd0433fc25f66c Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk>
Date: Wed, 15 Apr 2020 04:28:25 +0700
Subject: [PATCH] Cache hashcode for BlockPosition

2
patches/server/0021-Remove-stream-and-simplify-operation-in-pathfinder.patch
View File

@@ -1,4 +1,4 @@
From b534932358ff7eaee37af9bb27af1990f4f9adc7 Mon Sep 17 00:00:00 2001
From edc76140531322c57055473b2a2050462640a7d9 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 operation in pathfinder