From acc8a0241c0707a3af5b990cde76be036c7bbdd2 Mon Sep 17 00:00:00 2001 From: MartijnMuijsers Date: Wed, 30 Nov 2022 16:59:35 +0100 Subject: [PATCH] Skip cloning advancement criteria --- ...70-Skip-cloning-advancement-criteria.patch | 26 +++++++++++++++++++ ...> 0071-Player-canSee-by-entity-UUID.patch} | 0 ...-Spread-out-sending-all-player-info.patch} | 0 ...player-list-for-sending-player-info.patch} | 0 ...dSendEvent-if-there-are-no-listener.patch} | 0 ...75-Send-multiple-keep-alive-packets.patch} | 0 ...h => 0076-Specific-interval-TPS-API.patch} | 0 ....patch => 0077-5-second-TPS-average.patch} | 0 ...atch => 0078-Measure-last-tick-time.patch} | 0 ...PI.patch => 0079-Last-tick-time-API.patch} | 0 ...-Show-last-tick-time-in-tps-command.patch} | 0 ...-physics-check-before-vehicle-check.patch} | 0 ...082-Variable-main-thread-task-delay.patch} | 0 ... 0083-Reduce-RandomSource-instances.patch} | 0 ....patch => 0084-CPU-cores-estimation.patch} | 0 ... 0085-Add-centralized-AsyncExecutor.patch} | 0 ...=> 0086-Remove-Paper-async-executor.patch} | 0 ... 0087-Remove-Paper-cleaner-executor.patch} | 0 ... => 0088-Remove-background-executor.patch} | 0 ...h => 0089-Remove-bootstrap-executor.patch} | 0 ...0090-Remove-world-upgrade-executors.patch} | 0 ...> 0091-Remove-tab-complete-executor.patch} | 0 ...=> 0092-Remove-text-filter-executor.patch} | 0 23 files changed, 26 insertions(+) create mode 100644 patches/server/0070-Skip-cloning-advancement-criteria.patch rename patches/server/{0070-Player-canSee-by-entity-UUID.patch => 0071-Player-canSee-by-entity-UUID.patch} (100%) rename patches/server/{0071-Spread-out-sending-all-player-info.patch => 0072-Spread-out-sending-all-player-info.patch} (100%) rename patches/server/{0072-Optimize-player-list-for-sending-player-info.patch => 0073-Optimize-player-list-for-sending-player-info.patch} (100%) rename patches/server/{0073-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch => 0074-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch} (100%) rename patches/server/{0074-Send-multiple-keep-alive-packets.patch => 0075-Send-multiple-keep-alive-packets.patch} (100%) rename patches/server/{0075-Specific-interval-TPS-API.patch => 0076-Specific-interval-TPS-API.patch} (100%) rename patches/server/{0076-5-second-TPS-average.patch => 0077-5-second-TPS-average.patch} (100%) rename patches/server/{0077-Measure-last-tick-time.patch => 0078-Measure-last-tick-time.patch} (100%) rename patches/server/{0078-Last-tick-time-API.patch => 0079-Last-tick-time-API.patch} (100%) rename patches/server/{0079-Show-last-tick-time-in-tps-command.patch => 0080-Show-last-tick-time-in-tps-command.patch} (100%) rename patches/server/{0080-Collision-physics-check-before-vehicle-check.patch => 0081-Collision-physics-check-before-vehicle-check.patch} (100%) rename patches/server/{0081-Variable-main-thread-task-delay.patch => 0082-Variable-main-thread-task-delay.patch} (100%) rename patches/server/{0082-Reduce-RandomSource-instances.patch => 0083-Reduce-RandomSource-instances.patch} (100%) rename patches/server/{0083-CPU-cores-estimation.patch => 0084-CPU-cores-estimation.patch} (100%) rename patches/server/{0084-Add-centralized-AsyncExecutor.patch => 0085-Add-centralized-AsyncExecutor.patch} (100%) rename patches/server/{0085-Remove-Paper-async-executor.patch => 0086-Remove-Paper-async-executor.patch} (100%) rename patches/server/{0086-Remove-Paper-cleaner-executor.patch => 0087-Remove-Paper-cleaner-executor.patch} (100%) rename patches/server/{0087-Remove-background-executor.patch => 0088-Remove-background-executor.patch} (100%) rename patches/server/{0088-Remove-bootstrap-executor.patch => 0089-Remove-bootstrap-executor.patch} (100%) rename patches/server/{0089-Remove-world-upgrade-executors.patch => 0090-Remove-world-upgrade-executors.patch} (100%) rename patches/server/{0090-Remove-tab-complete-executor.patch => 0091-Remove-tab-complete-executor.patch} (100%) rename patches/server/{0091-Remove-text-filter-executor.patch => 0092-Remove-text-filter-executor.patch} (100%) diff --git a/patches/server/0070-Skip-cloning-advancement-criteria.patch b/patches/server/0070-Skip-cloning-advancement-criteria.patch new file mode 100644 index 0000000..b5c4103 --- /dev/null +++ b/patches/server/0070-Skip-cloning-advancement-criteria.patch @@ -0,0 +1,26 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MartijnMuijsers +Date: Wed, 30 Nov 2022 16:54:28 +0100 +Subject: [PATCH] Skip cloning advancement criteria + +License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) + +This patch is based on the following patch: +"Skip cloning loot parameters" [sic] +By: etil2jz <81570777+etil2jz@users.noreply.github.com> +As part of: Mirai (https://github.com/etil2jz/Mirai) +Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) + +diff --git a/src/main/java/net/minecraft/advancements/Advancement.java b/src/main/java/net/minecraft/advancements/Advancement.java +index 2c01231dcfbb992c9d2f034fcfd4af52fe8ac265..b84c69e722ae120c38c3b7c4cc7c5584496f13ab 100644 +--- a/src/main/java/net/minecraft/advancements/Advancement.java ++++ b/src/main/java/net/minecraft/advancements/Advancement.java +@@ -45,7 +45,7 @@ public class Advancement { + public Advancement(ResourceLocation id, @Nullable Advancement parent, @Nullable DisplayInfo display, AdvancementRewards rewards, Map criteria, String[][] requirements) { + this.id = id; + this.display = display; +- this.criteria = ImmutableMap.copyOf(criteria); ++ this.criteria = criteria; // Gale - Mirai - skip cloning advancement criteria + this.parent = parent; + this.rewards = rewards; + this.requirements = requirements; diff --git a/patches/server/0070-Player-canSee-by-entity-UUID.patch b/patches/server/0071-Player-canSee-by-entity-UUID.patch similarity index 100% rename from patches/server/0070-Player-canSee-by-entity-UUID.patch rename to patches/server/0071-Player-canSee-by-entity-UUID.patch diff --git a/patches/server/0071-Spread-out-sending-all-player-info.patch b/patches/server/0072-Spread-out-sending-all-player-info.patch similarity index 100% rename from patches/server/0071-Spread-out-sending-all-player-info.patch rename to patches/server/0072-Spread-out-sending-all-player-info.patch diff --git a/patches/server/0072-Optimize-player-list-for-sending-player-info.patch b/patches/server/0073-Optimize-player-list-for-sending-player-info.patch similarity index 100% rename from patches/server/0072-Optimize-player-list-for-sending-player-info.patch rename to patches/server/0073-Optimize-player-list-for-sending-player-info.patch diff --git a/patches/server/0073-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0074-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch similarity index 100% rename from patches/server/0073-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch rename to patches/server/0074-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch diff --git a/patches/server/0074-Send-multiple-keep-alive-packets.patch b/patches/server/0075-Send-multiple-keep-alive-packets.patch similarity index 100% rename from patches/server/0074-Send-multiple-keep-alive-packets.patch rename to patches/server/0075-Send-multiple-keep-alive-packets.patch diff --git a/patches/server/0075-Specific-interval-TPS-API.patch b/patches/server/0076-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0075-Specific-interval-TPS-API.patch rename to patches/server/0076-Specific-interval-TPS-API.patch diff --git a/patches/server/0076-5-second-TPS-average.patch b/patches/server/0077-5-second-TPS-average.patch similarity index 100% rename from patches/server/0076-5-second-TPS-average.patch rename to patches/server/0077-5-second-TPS-average.patch diff --git a/patches/server/0077-Measure-last-tick-time.patch b/patches/server/0078-Measure-last-tick-time.patch similarity index 100% rename from patches/server/0077-Measure-last-tick-time.patch rename to patches/server/0078-Measure-last-tick-time.patch diff --git a/patches/server/0078-Last-tick-time-API.patch b/patches/server/0079-Last-tick-time-API.patch similarity index 100% rename from patches/server/0078-Last-tick-time-API.patch rename to patches/server/0079-Last-tick-time-API.patch diff --git a/patches/server/0079-Show-last-tick-time-in-tps-command.patch b/patches/server/0080-Show-last-tick-time-in-tps-command.patch similarity index 100% rename from patches/server/0079-Show-last-tick-time-in-tps-command.patch rename to patches/server/0080-Show-last-tick-time-in-tps-command.patch diff --git a/patches/server/0080-Collision-physics-check-before-vehicle-check.patch b/patches/server/0081-Collision-physics-check-before-vehicle-check.patch similarity index 100% rename from patches/server/0080-Collision-physics-check-before-vehicle-check.patch rename to patches/server/0081-Collision-physics-check-before-vehicle-check.patch diff --git a/patches/server/0081-Variable-main-thread-task-delay.patch b/patches/server/0082-Variable-main-thread-task-delay.patch similarity index 100% rename from patches/server/0081-Variable-main-thread-task-delay.patch rename to patches/server/0082-Variable-main-thread-task-delay.patch diff --git a/patches/server/0082-Reduce-RandomSource-instances.patch b/patches/server/0083-Reduce-RandomSource-instances.patch similarity index 100% rename from patches/server/0082-Reduce-RandomSource-instances.patch rename to patches/server/0083-Reduce-RandomSource-instances.patch diff --git a/patches/server/0083-CPU-cores-estimation.patch b/patches/server/0084-CPU-cores-estimation.patch similarity index 100% rename from patches/server/0083-CPU-cores-estimation.patch rename to patches/server/0084-CPU-cores-estimation.patch diff --git a/patches/server/0084-Add-centralized-AsyncExecutor.patch b/patches/server/0085-Add-centralized-AsyncExecutor.patch similarity index 100% rename from patches/server/0084-Add-centralized-AsyncExecutor.patch rename to patches/server/0085-Add-centralized-AsyncExecutor.patch diff --git a/patches/server/0085-Remove-Paper-async-executor.patch b/patches/server/0086-Remove-Paper-async-executor.patch similarity index 100% rename from patches/server/0085-Remove-Paper-async-executor.patch rename to patches/server/0086-Remove-Paper-async-executor.patch diff --git a/patches/server/0086-Remove-Paper-cleaner-executor.patch b/patches/server/0087-Remove-Paper-cleaner-executor.patch similarity index 100% rename from patches/server/0086-Remove-Paper-cleaner-executor.patch rename to patches/server/0087-Remove-Paper-cleaner-executor.patch diff --git a/patches/server/0087-Remove-background-executor.patch b/patches/server/0088-Remove-background-executor.patch similarity index 100% rename from patches/server/0087-Remove-background-executor.patch rename to patches/server/0088-Remove-background-executor.patch diff --git a/patches/server/0088-Remove-bootstrap-executor.patch b/patches/server/0089-Remove-bootstrap-executor.patch similarity index 100% rename from patches/server/0088-Remove-bootstrap-executor.patch rename to patches/server/0089-Remove-bootstrap-executor.patch diff --git a/patches/server/0089-Remove-world-upgrade-executors.patch b/patches/server/0090-Remove-world-upgrade-executors.patch similarity index 100% rename from patches/server/0089-Remove-world-upgrade-executors.patch rename to patches/server/0090-Remove-world-upgrade-executors.patch diff --git a/patches/server/0090-Remove-tab-complete-executor.patch b/patches/server/0091-Remove-tab-complete-executor.patch similarity index 100% rename from patches/server/0090-Remove-tab-complete-executor.patch rename to patches/server/0091-Remove-tab-complete-executor.patch diff --git a/patches/server/0091-Remove-text-filter-executor.patch b/patches/server/0092-Remove-text-filter-executor.patch similarity index 100% rename from patches/server/0091-Remove-text-filter-executor.patch rename to patches/server/0092-Remove-text-filter-executor.patch