From 5ee75e7aa4dd3f9e1b6e75df2f67d17daeab7ed8 Mon Sep 17 00:00:00 2001 From: Sotr Date: Wed, 15 Apr 2020 22:10:13 +0700 Subject: [PATCH] Clarify patch titles --- patches/api/0001-POM-Changes.patch | 2 +- patches/api/0002-Add-server-configuration.patch | 2 +- ...patch => 0001-Fix-errors-on-editors-and-add-ignores.patch} | 4 ++-- .../{0002-POM-Changes.patch => 0002-Akarin-POM-changes.patch} | 4 ++-- ...03-Brand-changes.patch => 0003-Akarin-brand-changes.patch} | 4 ++-- .../0004-Avoid-double-I-O-operation-on-load-player-file.patch | 2 +- ...Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch | 2 +- patches/server/0006-Never-drop-items-on-command-give.patch | 2 +- patches/server/0007-Save-json-list-async.patch | 4 ++-- patches/server/0008-Remove-method-profiler-callers.patch | 2 +- patches/server/0009-Disable-Snooper.patch | 2 +- patches/server/0010-Server-Config.patch | 2 +- patches/server/0011-Async-pathfinder.patch | 2 +- patches/server/0012-Optimizations-for-network.patch | 2 +- .../server/0013-Swaps-the-predicate-order-of-collision.patch | 2 +- patches/server/0014-Akarin-Metrics.patch | 2 +- ...Tuinity-Use-ArrayDeque-for-pendingChunkUpdates-in-Ch.patch | 2 +- .../0016-Tuinity-Optimise-ArraySetSorted-removeIf.patch | 2 +- .../0017-Don-t-run-entity-collision-code-if-not-needed.patch | 2 +- patches/server/0018-Optimize-door-interact-pathfinding.patch | 2 +- patches/server/0019-Remove-stream-for-ender-teleport.patch | 2 +- patches/server/0020-Cache-Hashcode-for-BlockPosition.patch | 2 +- ...1-Remove-stream-and-simplify-operation-in-pathfinder.patch | 2 +- 23 files changed, 27 insertions(+), 27 deletions(-) rename patches/server/{0001-Fix-errors-on-eclipse.patch => 0001-Fix-errors-on-editors-and-add-ignores.patch} (95%) rename patches/server/{0002-POM-Changes.patch => 0002-Akarin-POM-changes.patch} (97%) rename patches/server/{0003-Brand-changes.patch => 0003-Akarin-brand-changes.patch} (96%) diff --git a/patches/api/0001-POM-Changes.patch b/patches/api/0001-POM-Changes.patch index 874aeef18..250622824 100644 --- a/patches/api/0001-POM-Changes.patch +++ b/patches/api/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From 6fdab507792e9ac082dd7457892281f6eb4e9965 Mon Sep 17 00:00:00 2001 +From 56759aad2b78d8a4db1621f0b67acd6d57cc715c 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 a0cb7a22f..209ce4529 100644 --- a/patches/api/0002-Add-server-configuration.patch +++ b/patches/api/0002-Add-server-configuration.patch @@ -1,4 +1,4 @@ -From 338a5004ab830b533e2d2fd19012e312ae6812c4 Mon Sep 17 00:00:00 2001 +From d7c702f0bb802341021672f7b2f00849806caf44 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-eclipse.patch b/patches/server/0001-Fix-errors-on-editors-and-add-ignores.patch similarity index 95% rename from patches/server/0001-Fix-errors-on-eclipse.patch rename to patches/server/0001-Fix-errors-on-editors-and-add-ignores.patch index 9133b8c82..7b01a63df 100644 --- a/patches/server/0001-Fix-errors-on-eclipse.patch +++ b/patches/server/0001-Fix-errors-on-editors-and-add-ignores.patch @@ -1,7 +1,7 @@ -From 77578fc0cd72835f1556313fd221975e393d0b21 Mon Sep 17 00:00:00 2001 +From 2a283176f574b2b85e9c6281e55db4053ad37247 Mon Sep 17 00:00:00 2001 From: Sotr Date: Wed, 15 Apr 2020 00:52:56 +0700 -Subject: [PATCH] Fix errors on eclipse +Subject: [PATCH] Fix errors on editors and add ignores diff --git a/.gitignore b/.gitignore diff --git a/patches/server/0002-POM-Changes.patch b/patches/server/0002-Akarin-POM-changes.patch similarity index 97% rename from patches/server/0002-POM-Changes.patch rename to patches/server/0002-Akarin-POM-changes.patch index b5541dca4..5ce6aaec4 100644 --- a/patches/server/0002-POM-Changes.patch +++ b/patches/server/0002-Akarin-POM-changes.patch @@ -1,8 +1,8 @@ -From c3757a0b1aecc6357f67340454fcfef19b7452ad Mon Sep 17 00:00:00 2001 +From da4c94eec26121e06ae48a1341a6399b9bbc4924 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 -Subject: [PATCH] POM Changes +Subject: [PATCH] Akarin POM changes diff --git a/pom.xml b/pom.xml diff --git a/patches/server/0003-Brand-changes.patch b/patches/server/0003-Akarin-brand-changes.patch similarity index 96% rename from patches/server/0003-Brand-changes.patch rename to patches/server/0003-Akarin-brand-changes.patch index 640c49150..41c2f1526 100644 --- a/patches/server/0003-Brand-changes.patch +++ b/patches/server/0003-Akarin-brand-changes.patch @@ -1,8 +1,8 @@ -From f81de8b443e6731fda1260619087595fbe352014 Mon Sep 17 00:00:00 2001 +From e57e06602dc3b49abbcd1a655f62b1e88c635290 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 -Subject: [PATCH] Brand changes +Subject: [PATCH] Akarin brand changes diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java diff --git a/patches/server/0004-Avoid-double-I-O-operation-on-load-player-file.patch b/patches/server/0004-Avoid-double-I-O-operation-on-load-player-file.patch index f2e6149d7..da81beaf7 100644 --- a/patches/server/0004-Avoid-double-I-O-operation-on-load-player-file.patch +++ b/patches/server/0004-Avoid-double-I-O-operation-on-load-player-file.patch @@ -1,4 +1,4 @@ -From 5b765acc7e6819d97ca292b14852d421cefa9d87 Mon Sep 17 00:00:00 2001 +From ff921bf1847779ff7cb77d3e9741dbc29723a48c 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/0005-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch b/patches/server/0005-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch index e73136c0e..94397571f 100644 --- a/patches/server/0005-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch +++ b/patches/server/0005-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch @@ -1,4 +1,4 @@ -From 0690a04bb879160b0156e3e78dbe0adad4b49411 Mon Sep 17 00:00:00 2001 +From aaee4920aa9d14b730979b9d041c79b0414d76d3 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/0006-Never-drop-items-on-command-give.patch b/patches/server/0006-Never-drop-items-on-command-give.patch index ee82b9467..13e274e56 100644 --- a/patches/server/0006-Never-drop-items-on-command-give.patch +++ b/patches/server/0006-Never-drop-items-on-command-give.patch @@ -1,4 +1,4 @@ -From fe67812ce5fad9493ec941ce50d00fae2a9190f2 Mon Sep 17 00:00:00 2001 +From f958e7285e8da43abd74ddf253853cef63050822 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/0007-Save-json-list-async.patch b/patches/server/0007-Save-json-list-async.patch index ef55526be..0ec63cbc1 100644 --- a/patches/server/0007-Save-json-list-async.patch +++ b/patches/server/0007-Save-json-list-async.patch @@ -1,8 +1,8 @@ -From 705f02ed90347293e72adb8938a13d40216a7c1e Mon Sep 17 00:00:00 2001 +From ceddb60c64f6b387808fbddaff6ee566b54f7046 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 -Subject: [PATCH] Save json list async +Subject: [PATCH] Save Json list asynchronously diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java diff --git a/patches/server/0008-Remove-method-profiler-callers.patch b/patches/server/0008-Remove-method-profiler-callers.patch index a9e062f7f..a79490135 100644 --- a/patches/server/0008-Remove-method-profiler-callers.patch +++ b/patches/server/0008-Remove-method-profiler-callers.patch @@ -1,4 +1,4 @@ -From 35e92c1df1d901885f697ad4f6eaed94b33ca3c3 Mon Sep 17 00:00:00 2001 +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?= Date: Thu, 2 Apr 2020 12:30:35 +0800 diff --git a/patches/server/0009-Disable-Snooper.patch b/patches/server/0009-Disable-Snooper.patch index d4c730aae..9c6cdae7c 100644 --- a/patches/server/0009-Disable-Snooper.patch +++ b/patches/server/0009-Disable-Snooper.patch @@ -1,4 +1,4 @@ -From 4253abd52b52b73db96228c487016a4c8c2ca38c Mon Sep 17 00:00:00 2001 +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?= Date: Thu, 2 Apr 2020 14:03:29 +0800 diff --git a/patches/server/0010-Server-Config.patch b/patches/server/0010-Server-Config.patch index 24cce9a5c..0e4f00246 100644 --- a/patches/server/0010-Server-Config.patch +++ b/patches/server/0010-Server-Config.patch @@ -1,4 +1,4 @@ -From 4d8cdc79a38c9d8b55b5a4f0f18895869b8babc3 Mon Sep 17 00:00:00 2001 +From 46b39846bb2bfd9cfa5fc41973cd774bc3fed412 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 diff --git a/patches/server/0011-Async-pathfinder.patch b/patches/server/0011-Async-pathfinder.patch index d63b5036f..b8d19948a 100644 --- a/patches/server/0011-Async-pathfinder.patch +++ b/patches/server/0011-Async-pathfinder.patch @@ -1,4 +1,4 @@ -From eab6cc99c967ba0a74803168baaada529e009cf4 Mon Sep 17 00:00:00 2001 +From 21633196b40b9a96edefd70e8d9cc5d01dc1a675 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 diff --git a/patches/server/0012-Optimizations-for-network.patch b/patches/server/0012-Optimizations-for-network.patch index ca9712dc4..7282b59a3 100644 --- a/patches/server/0012-Optimizations-for-network.patch +++ b/patches/server/0012-Optimizations-for-network.patch @@ -1,4 +1,4 @@ -From 06fb298ba836bd6e45b9df6a476130fe01c5477c Mon Sep 17 00:00:00 2001 +From 919043ab22fdc8a0323d2d4815c7413205cc0640 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/0013-Swaps-the-predicate-order-of-collision.patch b/patches/server/0013-Swaps-the-predicate-order-of-collision.patch index 04a7b3fb3..beda2704b 100644 --- a/patches/server/0013-Swaps-the-predicate-order-of-collision.patch +++ b/patches/server/0013-Swaps-the-predicate-order-of-collision.patch @@ -1,4 +1,4 @@ -From 8c75c45cc803d5db37e3a7fc7e03cb3c5032fc56 Mon Sep 17 00:00:00 2001 +From 3c722468b1e75186e945bf20807f5521dd904602 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/0014-Akarin-Metrics.patch b/patches/server/0014-Akarin-Metrics.patch index 6ab9680a1..97e1b68fd 100644 --- a/patches/server/0014-Akarin-Metrics.patch +++ b/patches/server/0014-Akarin-Metrics.patch @@ -1,4 +1,4 @@ -From 617da22d95039dffd66180630a7bce3f162ea3f6 Mon Sep 17 00:00:00 2001 +From bc972d9f660d6a645db8fb7841ed27bf1970d30e 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/0015-Tuinity-Use-ArrayDeque-for-pendingChunkUpdates-in-Ch.patch b/patches/server/0015-Tuinity-Use-ArrayDeque-for-pendingChunkUpdates-in-Ch.patch index 6a1ec96a6..994c6f8e0 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 5282d649eb1404ef3fe94792f01b2e6df6581e21 Mon Sep 17 00:00:00 2001 +From 97782e67bbd821c17b3fa77a35c86e3b727a937c 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 5129d7f48..2110d37c3 100644 --- a/patches/server/0016-Tuinity-Optimise-ArraySetSorted-removeIf.patch +++ b/patches/server/0016-Tuinity-Optimise-ArraySetSorted-removeIf.patch @@ -1,4 +1,4 @@ -From 1eb63058ff56e49ad0918786543a7787d0c93e6c Mon Sep 17 00:00:00 2001 +From 7bf955013e1000bc3a1283a762b5a4f70e99574e 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 19f4322ed..b89b1758e 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 2c52a91c87f0fe742d01183d15ac97a79dc06034 Mon Sep 17 00:00:00 2001 +From 5b5043ed6b816c44c3371f771c705244f60b9daf 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-pathfinding.patch index e748c7d24..0fb33de07 100644 --- a/patches/server/0018-Optimize-door-interact-pathfinding.patch +++ b/patches/server/0018-Optimize-door-interact-pathfinding.patch @@ -1,4 +1,4 @@ -From 64a548a9bc7c044323e88a99a9494b4e023629d4 Mon Sep 17 00:00:00 2001 +From 35285496af940f4d3e637f40441304382f7942c5 Mon Sep 17 00:00:00 2001 From: Sotr Date: Wed, 15 Apr 2020 03:51:50 +0700 Subject: [PATCH] Optimize door interact pathfinding diff --git a/patches/server/0019-Remove-stream-for-ender-teleport.patch b/patches/server/0019-Remove-stream-for-ender-teleport.patch index 6c9db1915..f73a6e946 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 05fdf463f83d5a5f85a4b4bfcb8561db760dc8ae Mon Sep 17 00:00:00 2001 +From ca25caefb5d5551f89b0d8058fd24e9a4fdcc4e1 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 d32b1bea0..9540608d8 100644 --- a/patches/server/0020-Cache-Hashcode-for-BlockPosition.patch +++ b/patches/server/0020-Cache-Hashcode-for-BlockPosition.patch @@ -1,4 +1,4 @@ -From 9c4f314f268580548dc68c00a6f65c77a0a6d7e6 Mon Sep 17 00:00:00 2001 +From bda2fc2fde32f266195cf363d30fe3bdcaf8835c 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 64b9dd788..d584dcd27 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 53d6044c5eef40fe43c288df1aaa100ac6088453 Mon Sep 17 00:00:00 2001 +From b534932358ff7eaee37af9bb27af1990f4f9adc7 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