diff --git a/patches/api/0001-POM-Changes.patch b/patches/api/0001-POM-Changes.patch index 60b822113..f1a82653d 100644 --- a/patches/api/0001-POM-Changes.patch +++ b/patches/api/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From 27cf91060430b01a21ffd92698be222b930aecc7 Mon Sep 17 00:00:00 2001 +From fdf164a1b0a70f9a0dc56bd363637a894814145a 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 diff --git a/patches/api/0002-Add-server-configuration.patch b/patches/api/0002-Add-server-configuration.patch index 3cb854ee1..c1316af7d 100644 --- a/patches/api/0002-Add-server-configuration.patch +++ b/patches/api/0002-Add-server-configuration.patch @@ -1,4 +1,4 @@ -From 2fd33c2095a0d17b655a4e96db14f8ee18f1e743 Mon Sep 17 00:00:00 2001 +From 5a32a7baf818149553c639e88f3ee451a14ca4c6 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 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 ba5ffdbb6..4f2907e22 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,4 +1,4 @@ -From d5167363e223f5e97b9ddc357ce08798fd5c6131 Mon Sep 17 00:00:00 2001 +From 5d8b21db725f0384be1a1c87e29d3b1d80d0c48e 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/patches/server/0002-Akarin-POM-changes.patch b/patches/server/0002-Akarin-POM-changes.patch index 30f9b6e9e..09ec28eff 100644 --- a/patches/server/0002-Akarin-POM-changes.patch +++ b/patches/server/0002-Akarin-POM-changes.patch @@ -1,4 +1,4 @@ -From 27b6bb82218f72a45f74810f48148cbccb4b7c08 Mon Sep 17 00:00:00 2001 +From fa496fcaa75f52cf5c014c2be32258bf5ed09248 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 diff --git a/patches/server/0003-Server-Config.patch b/patches/server/0003-Akarin-configuration.patch similarity index 99% rename from patches/server/0003-Server-Config.patch rename to patches/server/0003-Akarin-configuration.patch index 0349cad3d..ed2daf261 100644 --- a/patches/server/0003-Server-Config.patch +++ b/patches/server/0003-Akarin-configuration.patch @@ -1,8 +1,8 @@ -From e21569dd3542272523aa74111fe90fad1cf17279 Mon Sep 17 00:00:00 2001 +From f37a682eebccac39f0ce89dcb43c9f87a80affea 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 -Subject: [PATCH] Server Config +Subject: [PATCH] Akarin configuration diff --git a/src/main/java/io/akarin/server/Config.java b/src/main/java/io/akarin/server/Config.java diff --git a/patches/server/0004-Akarin-brand-changes.patch b/patches/server/0004-Akarin-brand-changes.patch index 96f52a7bc..920fabc90 100644 --- a/patches/server/0004-Akarin-brand-changes.patch +++ b/patches/server/0004-Akarin-brand-changes.patch @@ -1,4 +1,4 @@ -From 0634db2d5b61a0fd487c86a8ae7d7b599d75a7cf Mon Sep 17 00:00:00 2001 +From 868590b212275cc01b1e64f216e81a485c69e86a 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 diff --git a/patches/server/0005-Akarin-Metrics.patch b/patches/server/0005-Akarin-Metrics.patch index bc2cfb65b..1dbc13886 100644 --- a/patches/server/0005-Akarin-Metrics.patch +++ b/patches/server/0005-Akarin-Metrics.patch @@ -1,4 +1,4 @@ -From f1bcff1bb128345c205059fe0b29c0064945942e Mon Sep 17 00:00:00 2001 +From ab692ebe1e8f0c01c164c0bf6c9cf78a953102e6 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: Mon, 13 Apr 2020 13:18:27 +0800 diff --git a/patches/server/0006-Disable-Snooper.patch b/patches/server/0006-Disable-the-Snooper.patch similarity index 91% rename from patches/server/0006-Disable-Snooper.patch rename to patches/server/0006-Disable-the-Snooper.patch index b47f89162..c988bc9e3 100644 --- a/patches/server/0006-Disable-Snooper.patch +++ b/patches/server/0006-Disable-the-Snooper.patch @@ -1,7 +1,7 @@ -From f865ed828d710212f043db1ce1dd14475d4ea3ae Mon Sep 17 00:00:00 2001 +From 984f3d6eaf05d6e072d57a7c8506132e354a3915 Mon Sep 17 00:00:00 2001 From: Sotr Date: Wed, 15 Apr 2020 22:17:18 +0700 -Subject: [PATCH] Disable Snooper +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 diff --git a/patches/server/0007-Avoid-double-I-O-operation-on-load-player-file.patch b/patches/server/0007-Avoid-double-I-O-operation-on-load-player-file.patch index e0e4fb3cb..493f231a5 100644 --- a/patches/server/0007-Avoid-double-I-O-operation-on-load-player-file.patch +++ b/patches/server/0007-Avoid-double-I-O-operation-on-load-player-file.patch @@ -1,4 +1,4 @@ -From af599857b5230b3b9fb3734b51db15a73e36000a Mon Sep 17 00:00:00 2001 +From c91e028a222ebd9a8af02c6d49278a8148f27750 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:29:08 +0800 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 65a78e1e9..04f4a53cb 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 7937bee0a958674d3568ede0e8f49b3ddc2bbff4 Mon Sep 17 00:00:00 2001 +From 3148f17301d4566782712d11493e4bac5af13b09 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 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 7b28b3b40..731c70435 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 a24bb59b51f10e203094456df8f80e496e47b63a Mon Sep 17 00:00:00 2001 +From bf2ec65d61c2633c8696fb24ca866bf0c271e147 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 diff --git a/patches/server/0010-Save-Json-list-asynchronously.patch b/patches/server/0010-Save-Json-list-asynchronously.patch index 9cb3870be..dbeb29d4b 100644 --- a/patches/server/0010-Save-Json-list-asynchronously.patch +++ b/patches/server/0010-Save-Json-list-asynchronously.patch @@ -1,4 +1,4 @@ -From aff3e04b4d4cf331217fb59d678dc8abbad6aea4 Mon Sep 17 00:00:00 2001 +From a6a58b1cf9a25ab78cf00bca9ab050dfe9d41397 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 diff --git a/patches/server/0011-Remove-method-profiler-callers.patch b/patches/server/0011-Remove-vanilla-profiler-callers.patch similarity index 99% rename from patches/server/0011-Remove-method-profiler-callers.patch rename to patches/server/0011-Remove-vanilla-profiler-callers.patch index b1c7cedc6..70ee59982 100644 --- a/patches/server/0011-Remove-method-profiler-callers.patch +++ b/patches/server/0011-Remove-vanilla-profiler-callers.patch @@ -1,7 +1,7 @@ -From 0beb791a340ae1dd6d3a43babebd1e6d37ea36b9 Mon Sep 17 00:00:00 2001 +From 24a16168874efef0d75d669be78f42404b211390 Mon Sep 17 00:00:00 2001 From: Sotr Date: Wed, 15 Apr 2020 22:18:01 +0700 -Subject: [PATCH] Remove method profiler callers +Subject: [PATCH] Remove vanilla 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/patches/server/0012-Async-pathfinder.patch b/patches/server/0012-Asynchronous-pathfinding.patch similarity index 99% rename from patches/server/0012-Async-pathfinder.patch rename to patches/server/0012-Asynchronous-pathfinding.patch index ab8649570..c6ae91a4e 100644 --- a/patches/server/0012-Async-pathfinder.patch +++ b/patches/server/0012-Asynchronous-pathfinding.patch @@ -1,8 +1,8 @@ -From 21259e466a404ebf8d46ff4c24724f74b93ee50e Mon Sep 17 00:00:00 2001 +From 47d6741745087c605a3a8f9f36475e6912ef3269 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 -Subject: [PATCH] Async pathfinder +Subject: [PATCH] Asynchronous pathfinding diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java diff --git a/patches/server/0013-Optimizations-for-network.patch b/patches/server/0013-Optimizations-for-network.patch index 15f889c1d..2eb580ba5 100644 --- a/patches/server/0013-Optimizations-for-network.patch +++ b/patches/server/0013-Optimizations-for-network.patch @@ -1,4 +1,4 @@ -From 73627adb69e7cbbea68e6a070122adb641f99bf4 Mon Sep 17 00:00:00 2001 +From 2abe117f02389d2add1b31e7112924b4c636e36a 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 diff --git a/patches/server/0014-Swaps-the-predicate-order-of-collision.patch b/patches/server/0014-Swaps-the-predicate-order-of-collision.patch index 431b9705a..4cad422e8 100644 --- a/patches/server/0014-Swaps-the-predicate-order-of-collision.patch +++ b/patches/server/0014-Swaps-the-predicate-order-of-collision.patch @@ -1,4 +1,4 @@ -From 5b87c497859c1b0127fd79dd439a7765a3dc188a Mon Sep 17 00:00:00 2001 +From 1177c075f73dc22b1cf6e469943399ca82ed2043 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, 10 Apr 2020 15:47:15 +0800 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 f364923b3..994738a69 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 beb8baffb0140c446cfeb518ae61925298a47325 Mon Sep 17 00:00:00 2001 +From f1f04b873cb66c439078daafc39633701e6b5da2 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 diff --git a/patches/server/0016-Tuinity-Optimise-ArraySetSorted-removeIf.patch b/patches/server/0016-Tuinity-Optimise-ArraySetSorted-removeIf.patch index 3b3eb8ab6..1e0565ece 100644 --- a/patches/server/0016-Tuinity-Optimise-ArraySetSorted-removeIf.patch +++ b/patches/server/0016-Tuinity-Optimise-ArraySetSorted-removeIf.patch @@ -1,4 +1,4 @@ -From 8e0201054e6da7574f6df1142ed28bad08be626b Mon Sep 17 00:00:00 2001 +From b57ae569df4d5aa81dd8ff0ed82c99b213782d76 Mon Sep 17 00:00:00 2001 From: Sotr Date: Wed, 15 Apr 2020 02:44:07 +0700 Subject: [PATCH] Tuinity Optimise ArraySetSorted#removeIf 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 a8527b3f4..7512f7f60 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 b16dd9adf27b2567f14057ab25f9812e70cea75d Mon Sep 17 00:00:00 2001 +From 98d9d6f8c907c2dfbbc41f46431e7a7f641c95cf 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 diff --git a/patches/server/0018-Optimize-door-interact-pathfinding.patch b/patches/server/0018-Optimize-door-interact-with-pathfinding.patch similarity index 98% rename from patches/server/0018-Optimize-door-interact-pathfinding.patch rename to patches/server/0018-Optimize-door-interact-with-pathfinding.patch index 33fcd0d9b..95d51d484 100644 --- a/patches/server/0018-Optimize-door-interact-pathfinding.patch +++ b/patches/server/0018-Optimize-door-interact-with-pathfinding.patch @@ -1,7 +1,7 @@ -From 272a544f13387faacb64b82ea3a30a60ade2cb77 Mon Sep 17 00:00:00 2001 +From 3d244bbf77d894086740106726c99f3e7e0dcdf1 Mon Sep 17 00:00:00 2001 From: Sotr Date: Wed, 15 Apr 2020 03:51:50 +0700 -Subject: [PATCH] Optimize door interact pathfinding +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 diff --git a/patches/server/0019-Remove-stream-for-ender-teleport.patch b/patches/server/0019-Remove-stream-for-ender-teleport.patch index 03c202580..82e36ca12 100644 --- a/patches/server/0019-Remove-stream-for-ender-teleport.patch +++ b/patches/server/0019-Remove-stream-for-ender-teleport.patch @@ -1,4 +1,4 @@ -From 237b5d67d51b19415344941091274092356a623b Mon Sep 17 00:00:00 2001 +From 29faf80a84d84dc29d1634b65ac30aa7cf5b254c 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/patches/server/0020-Cache-Hashcode-for-BlockPosition.patch b/patches/server/0020-Cache-Hashcode-for-BlockPosition.patch index 9d0295a7a..5eeab1a6d 100644 --- a/patches/server/0020-Cache-Hashcode-for-BlockPosition.patch +++ b/patches/server/0020-Cache-Hashcode-for-BlockPosition.patch @@ -1,4 +1,4 @@ -From dc519a9f410da9b8912f98bab9fd0433fc25f66c Mon Sep 17 00:00:00 2001 +From a11885fc836b82d7814b94906226ad667a277af9 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/patches/server/0021-Remove-stream-and-simplify-operation-in-pathfinder.patch b/patches/server/0021-Remove-stream-and-simplify-operation-in-pathfinder.patch index e585a9de2..cd1ee7449 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,4 +1,4 @@ -From edc76140531322c57055473b2a2050462640a7d9 Mon Sep 17 00:00:00 2001 +From 7b73ac0a5b62071f1a2a074ead1000b7ec2c1188 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