From 05c59cb50f570c3c0ec3d0431dd4b7dde54d4179 Mon Sep 17 00:00:00 2001 From: MartijnMuijsers Date: Wed, 30 Nov 2022 21:06:43 +0100 Subject: [PATCH] Replace class map with optimized collection --- .../0002-Dev-import-deobfuscation-fixes.patch | 23 ++++++++++-- ...-class-map-with-optimized-collection.patch | 35 +++++++++++++++++++ ...> 0069-Cache-BlockStatePairKey-hash.patch} | 0 ...70-Cache-CubeVoxelShape-shape-array.patch} | 0 ...by-multiplication-in-CubePointRange.patch} | 0 ...ace-parts-by-size-in-CubePointRange.patch} | 0 ...k-frozen-ticks-before-landing-block.patch} | 0 ...kip-entity-move-if-movement-is-zero.patch} | 0 ...> 0075-Store-mob-counts-in-an-array.patch} | 0 ...h => 0076-Optimize-noise-generation.patch} | 0 ...durability-change-equipment-updates.patch} | 0 ...es-on-entities-with-fire-resistance.patch} | 0 ...9-Skip-cloning-advancement-criteria.patch} | 0 ...> 0080-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 ...84-Send-multiple-keep-alive-packets.patch} | 0 ...m-strolling-into-non-ticking-chunks.patch} | 0 ...h => 0086-Specific-interval-TPS-API.patch} | 0 ....patch => 0087-5-second-TPS-average.patch} | 0 ...atch => 0088-Measure-last-tick-time.patch} | 0 ...PI.patch => 0089-Last-tick-time-API.patch} | 0 ...-Show-last-tick-time-in-tps-command.patch} | 0 ...eck-has-physics-before-same-vehicle.patch} | 0 ...092-Variable-main-thread-task-delay.patch} | 0 ... 0093-Reduce-RandomSource-instances.patch} | 0 ....patch => 0094-CPU-cores-estimation.patch} | 0 ... 0095-Add-centralized-AsyncExecutor.patch} | 0 ...=> 0096-Remove-Paper-async-executor.patch} | 0 ... 0097-Remove-Paper-cleaner-executor.patch} | 0 ... => 0098-Remove-background-executor.patch} | 0 ...h => 0099-Remove-bootstrap-executor.patch} | 0 ...0100-Remove-world-upgrade-executors.patch} | 0 ...> 0101-Remove-tab-complete-executor.patch} | 0 ...=> 0102-Remove-text-filter-executor.patch} | 2 +- 36 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 patches/server/0068-Replace-class-map-with-optimized-collection.patch rename patches/server/{0068-Cache-BlockStatePairKey-hash.patch => 0069-Cache-BlockStatePairKey-hash.patch} (100%) rename patches/server/{0069-Cache-CubeVoxelShape-shape-array.patch => 0070-Cache-CubeVoxelShape-shape-array.patch} (100%) rename patches/server/{0070-Replace-division-by-multiplication-in-CubePointRange.patch => 0071-Replace-division-by-multiplication-in-CubePointRange.patch} (100%) rename patches/server/{0071-Replace-parts-by-size-in-CubePointRange.patch => 0072-Replace-parts-by-size-in-CubePointRange.patch} (100%) rename patches/server/{0072-Check-frozen-ticks-before-landing-block.patch => 0073-Check-frozen-ticks-before-landing-block.patch} (100%) rename patches/server/{0073-Skip-entity-move-if-movement-is-zero.patch => 0074-Skip-entity-move-if-movement-is-zero.patch} (100%) rename patches/server/{0074-Store-mob-counts-in-an-array.patch => 0075-Store-mob-counts-in-an-array.patch} (100%) rename patches/server/{0075-Optimize-noise-generation.patch => 0076-Optimize-noise-generation.patch} (100%) rename patches/server/{0076-Ignore-durability-change-equipment-updates.patch => 0077-Ignore-durability-change-equipment-updates.patch} (100%) rename patches/server/{0077-Hide-flames-on-entities-with-fire-resistance.patch => 0078-Hide-flames-on-entities-with-fire-resistance.patch} (100%) rename patches/server/{0078-Skip-cloning-advancement-criteria.patch => 0079-Skip-cloning-advancement-criteria.patch} (100%) rename patches/server/{0079-Player-canSee-by-entity-UUID.patch => 0080-Player-canSee-by-entity-UUID.patch} (100%) rename patches/server/{0080-Spread-out-sending-all-player-info.patch => 0081-Spread-out-sending-all-player-info.patch} (100%) rename patches/server/{0081-Optimize-player-list-for-sending-player-info.patch => 0082-Optimize-player-list-for-sending-player-info.patch} (100%) rename patches/server/{0082-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch => 0083-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch} (100%) rename patches/server/{0083-Send-multiple-keep-alive-packets.patch => 0084-Send-multiple-keep-alive-packets.patch} (100%) rename patches/server/{0084-Prevent-random-strolling-into-non-ticking-chunks.patch => 0085-Prevent-random-strolling-into-non-ticking-chunks.patch} (100%) rename patches/server/{0085-Specific-interval-TPS-API.patch => 0086-Specific-interval-TPS-API.patch} (100%) rename patches/server/{0086-5-second-TPS-average.patch => 0087-5-second-TPS-average.patch} (100%) rename patches/server/{0087-Measure-last-tick-time.patch => 0088-Measure-last-tick-time.patch} (100%) rename patches/server/{0088-Last-tick-time-API.patch => 0089-Last-tick-time-API.patch} (100%) rename patches/server/{0089-Show-last-tick-time-in-tps-command.patch => 0090-Show-last-tick-time-in-tps-command.patch} (100%) rename patches/server/{0090-For-collision-check-has-physics-before-same-vehicle.patch => 0091-For-collision-check-has-physics-before-same-vehicle.patch} (100%) rename patches/server/{0091-Variable-main-thread-task-delay.patch => 0092-Variable-main-thread-task-delay.patch} (100%) rename patches/server/{0092-Reduce-RandomSource-instances.patch => 0093-Reduce-RandomSource-instances.patch} (100%) rename patches/server/{0093-CPU-cores-estimation.patch => 0094-CPU-cores-estimation.patch} (100%) rename patches/server/{0094-Add-centralized-AsyncExecutor.patch => 0095-Add-centralized-AsyncExecutor.patch} (100%) rename patches/server/{0095-Remove-Paper-async-executor.patch => 0096-Remove-Paper-async-executor.patch} (100%) rename patches/server/{0096-Remove-Paper-cleaner-executor.patch => 0097-Remove-Paper-cleaner-executor.patch} (100%) rename patches/server/{0097-Remove-background-executor.patch => 0098-Remove-background-executor.patch} (100%) rename patches/server/{0098-Remove-bootstrap-executor.patch => 0099-Remove-bootstrap-executor.patch} (100%) rename patches/server/{0099-Remove-world-upgrade-executors.patch => 0100-Remove-world-upgrade-executors.patch} (100%) rename patches/server/{0100-Remove-tab-complete-executor.patch => 0101-Remove-tab-complete-executor.patch} (100%) rename patches/server/{0101-Remove-text-filter-executor.patch => 0102-Remove-text-filter-executor.patch} (93%) diff --git a/patches/server/0002-Dev-import-deobfuscation-fixes.patch b/patches/server/0002-Dev-import-deobfuscation-fixes.patch index 7c48b20..4c88d50 100644 --- a/patches/server/0002-Dev-import-deobfuscation-fixes.patch +++ b/patches/server/0002-Dev-import-deobfuscation-fixes.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Dev import deobfuscation fixes diff --git a/src/main/java/net/minecraft/server/network/TextFilterClient.java b/src/main/java/net/minecraft/server/network/TextFilterClient.java -index 92a60fc35145b7dd5fe17ea9b6823a919f483945..a6941c39802bd1b50e32a7ad00c65cfd59191bcf 100644 +index 92a60fc35145b7dd5fe17ea9b6823a919f483945..2393b6a5f3f12c2b17b172ee8ca42ead218e2a10 100644 --- a/src/main/java/net/minecraft/server/network/TextFilterClient.java +++ b/src/main/java/net/minecraft/server/network/TextFilterClient.java -@@ -98,38 +98,38 @@ public class TextFilterClient implements AutoCloseable { +@@ -98,38 +98,44 @@ public class TextFilterClient implements AutoCloseable { URL uRL2 = getEndpoint(uRI, jsonObject2, "join", "v1/join"); URL uRL3 = getEndpoint(uRI, jsonObject2, "leave", "v1/leave"); TextFilterClient.JoinOrLeaveEncoder joinOrLeaveEncoder = (profile) -> { @@ -18,12 +18,14 @@ index 92a60fc35145b7dd5fe17ea9b6823a919f483945..a6941c39802bd1b50e32a7ad00c65cfd - jsonObject.addProperty("user_id", profile.getId().toString()); - jsonObject.addProperty("user_display_name", profile.getName()); - return jsonObject; ++ // Gale start - dev import deobfuscation fixes + JsonObject jsonObject1 = new JsonObject(); + jsonObject1.addProperty("server", string2); + jsonObject1.addProperty("room", string3); + jsonObject1.addProperty("user_id", profile.getId().toString()); + jsonObject1.addProperty("user_display_name", profile.getName()); + return jsonObject1; ++ // Gale end - dev import deobfuscation fixes }; TextFilterClient.MessageEncoder messageEncoder; if (bl) { @@ -37,6 +39,7 @@ index 92a60fc35145b7dd5fe17ea9b6823a919f483945..a6941c39802bd1b50e32a7ad00c65cfd - jsonObject.addProperty("text", message); - jsonObject.addProperty("language", "*"); - return jsonObject; ++ // Gale start - dev import deobfuscation fixes + JsonObject jsonObject1 = new JsonObject(); + jsonObject1.addProperty("rule", i); + jsonObject1.addProperty("server", string2); @@ -46,6 +49,7 @@ index 92a60fc35145b7dd5fe17ea9b6823a919f483945..a6941c39802bd1b50e32a7ad00c65cfd + jsonObject1.addProperty("text", message); + jsonObject1.addProperty("language", "*"); + return jsonObject1; ++ // Gale end - dev import deobfuscation fixes }; } else { String string5 = String.valueOf(i); @@ -59,6 +63,7 @@ index 92a60fc35145b7dd5fe17ea9b6823a919f483945..a6941c39802bd1b50e32a7ad00c65cfd - jsonObject.addProperty("text", message); - jsonObject.addProperty("language", "*"); - return jsonObject; ++ // Gale start - dev import deobfuscation fixes + JsonObject jsonObject1 = new JsonObject(); + jsonObject1.addProperty("rule_id", string5); + jsonObject1.addProperty("category", string2); @@ -68,6 +73,20 @@ index 92a60fc35145b7dd5fe17ea9b6823a919f483945..a6941c39802bd1b50e32a7ad00c65cfd + jsonObject1.addProperty("text", message); + jsonObject1.addProperty("language", "*"); + return jsonObject1; ++ // Gale end - dev import deobfuscation fixes }; } +diff --git a/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java b/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java +index 50a9f33aa31e9273c7c52d4bb2b02f0f884f7ba5..19779298b2b2ecbe30f9308dad1d80379220387a 100644 +--- a/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java ++++ b/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java +@@ -58,7 +58,7 @@ public class ClassInstanceMultiMap extends AbstractCollection { + if (!this.baseClass.isAssignableFrom(type)) { + throw new IllegalArgumentException("Don't know how to search for " + type); + } else { +- List list = this.byClass.computeIfAbsent(type, (typeClass) -> { ++ List list = this.byClass.computeIfAbsent(type, (typeClass) -> { // Gale - dev import deobfuscation fixes + return this.allInstances.stream().filter(typeClass::isInstance).collect(Collectors.toList()); + }); + return Collections.unmodifiableCollection(list); diff --git a/patches/server/0068-Replace-class-map-with-optimized-collection.patch b/patches/server/0068-Replace-class-map-with-optimized-collection.patch new file mode 100644 index 0000000..3a32894 --- /dev/null +++ b/patches/server/0068-Replace-class-map-with-optimized-collection.patch @@ -0,0 +1,35 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MartijnMuijsers +Date: Wed, 30 Nov 2022 21:02:43 +0100 +Subject: [PATCH] Replace class map with optimized collection + +License: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) + +This patch is based on the following mixin: +"me/jellysquid/mods/lithium/mixin/collections/entity_by_type/TypeFilterableListMixin.java" +By: 2No2Name <2No2Name@web.de> +As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) +Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.nl.html) + +diff --git a/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java b/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java +index 19779298b2b2ecbe30f9308dad1d80379220387a..f9a7617f4c6c19c798d7fe40491690c8f5de14a9 100644 +--- a/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java ++++ b/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java +@@ -4,6 +4,8 @@ import com.google.common.collect.ImmutableList; + import com.google.common.collect.Iterators; + import com.google.common.collect.Lists; + import com.google.common.collect.Maps; ++import it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap; ++ + import java.util.AbstractCollection; + import java.util.Collection; + import java.util.Collections; +@@ -13,7 +15,7 @@ import java.util.Map; + import java.util.stream.Collectors; + + public class ClassInstanceMultiMap extends AbstractCollection { +- private final Map, List> byClass = Maps.newHashMap(); ++ private final Map, List> byClass = new Reference2ReferenceOpenHashMap<>(2); // Gale - Lithium - replace class map with optimized collection + private final Class baseClass; + private final List allInstances = Lists.newArrayList(); + diff --git a/patches/server/0068-Cache-BlockStatePairKey-hash.patch b/patches/server/0069-Cache-BlockStatePairKey-hash.patch similarity index 100% rename from patches/server/0068-Cache-BlockStatePairKey-hash.patch rename to patches/server/0069-Cache-BlockStatePairKey-hash.patch diff --git a/patches/server/0069-Cache-CubeVoxelShape-shape-array.patch b/patches/server/0070-Cache-CubeVoxelShape-shape-array.patch similarity index 100% rename from patches/server/0069-Cache-CubeVoxelShape-shape-array.patch rename to patches/server/0070-Cache-CubeVoxelShape-shape-array.patch diff --git a/patches/server/0070-Replace-division-by-multiplication-in-CubePointRange.patch b/patches/server/0071-Replace-division-by-multiplication-in-CubePointRange.patch similarity index 100% rename from patches/server/0070-Replace-division-by-multiplication-in-CubePointRange.patch rename to patches/server/0071-Replace-division-by-multiplication-in-CubePointRange.patch diff --git a/patches/server/0071-Replace-parts-by-size-in-CubePointRange.patch b/patches/server/0072-Replace-parts-by-size-in-CubePointRange.patch similarity index 100% rename from patches/server/0071-Replace-parts-by-size-in-CubePointRange.patch rename to patches/server/0072-Replace-parts-by-size-in-CubePointRange.patch diff --git a/patches/server/0072-Check-frozen-ticks-before-landing-block.patch b/patches/server/0073-Check-frozen-ticks-before-landing-block.patch similarity index 100% rename from patches/server/0072-Check-frozen-ticks-before-landing-block.patch rename to patches/server/0073-Check-frozen-ticks-before-landing-block.patch diff --git a/patches/server/0073-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0074-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0073-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0074-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0074-Store-mob-counts-in-an-array.patch b/patches/server/0075-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0074-Store-mob-counts-in-an-array.patch rename to patches/server/0075-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0075-Optimize-noise-generation.patch b/patches/server/0076-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0075-Optimize-noise-generation.patch rename to patches/server/0076-Optimize-noise-generation.patch diff --git a/patches/server/0076-Ignore-durability-change-equipment-updates.patch b/patches/server/0077-Ignore-durability-change-equipment-updates.patch similarity index 100% rename from patches/server/0076-Ignore-durability-change-equipment-updates.patch rename to patches/server/0077-Ignore-durability-change-equipment-updates.patch diff --git a/patches/server/0077-Hide-flames-on-entities-with-fire-resistance.patch b/patches/server/0078-Hide-flames-on-entities-with-fire-resistance.patch similarity index 100% rename from patches/server/0077-Hide-flames-on-entities-with-fire-resistance.patch rename to patches/server/0078-Hide-flames-on-entities-with-fire-resistance.patch diff --git a/patches/server/0078-Skip-cloning-advancement-criteria.patch b/patches/server/0079-Skip-cloning-advancement-criteria.patch similarity index 100% rename from patches/server/0078-Skip-cloning-advancement-criteria.patch rename to patches/server/0079-Skip-cloning-advancement-criteria.patch diff --git a/patches/server/0079-Player-canSee-by-entity-UUID.patch b/patches/server/0080-Player-canSee-by-entity-UUID.patch similarity index 100% rename from patches/server/0079-Player-canSee-by-entity-UUID.patch rename to patches/server/0080-Player-canSee-by-entity-UUID.patch diff --git a/patches/server/0080-Spread-out-sending-all-player-info.patch b/patches/server/0081-Spread-out-sending-all-player-info.patch similarity index 100% rename from patches/server/0080-Spread-out-sending-all-player-info.patch rename to patches/server/0081-Spread-out-sending-all-player-info.patch diff --git a/patches/server/0081-Optimize-player-list-for-sending-player-info.patch b/patches/server/0082-Optimize-player-list-for-sending-player-info.patch similarity index 100% rename from patches/server/0081-Optimize-player-list-for-sending-player-info.patch rename to patches/server/0082-Optimize-player-list-for-sending-player-info.patch diff --git a/patches/server/0082-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0083-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch similarity index 100% rename from patches/server/0082-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch rename to patches/server/0083-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch diff --git a/patches/server/0083-Send-multiple-keep-alive-packets.patch b/patches/server/0084-Send-multiple-keep-alive-packets.patch similarity index 100% rename from patches/server/0083-Send-multiple-keep-alive-packets.patch rename to patches/server/0084-Send-multiple-keep-alive-packets.patch diff --git a/patches/server/0084-Prevent-random-strolling-into-non-ticking-chunks.patch b/patches/server/0085-Prevent-random-strolling-into-non-ticking-chunks.patch similarity index 100% rename from patches/server/0084-Prevent-random-strolling-into-non-ticking-chunks.patch rename to patches/server/0085-Prevent-random-strolling-into-non-ticking-chunks.patch diff --git a/patches/server/0085-Specific-interval-TPS-API.patch b/patches/server/0086-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0085-Specific-interval-TPS-API.patch rename to patches/server/0086-Specific-interval-TPS-API.patch diff --git a/patches/server/0086-5-second-TPS-average.patch b/patches/server/0087-5-second-TPS-average.patch similarity index 100% rename from patches/server/0086-5-second-TPS-average.patch rename to patches/server/0087-5-second-TPS-average.patch diff --git a/patches/server/0087-Measure-last-tick-time.patch b/patches/server/0088-Measure-last-tick-time.patch similarity index 100% rename from patches/server/0087-Measure-last-tick-time.patch rename to patches/server/0088-Measure-last-tick-time.patch diff --git a/patches/server/0088-Last-tick-time-API.patch b/patches/server/0089-Last-tick-time-API.patch similarity index 100% rename from patches/server/0088-Last-tick-time-API.patch rename to patches/server/0089-Last-tick-time-API.patch diff --git a/patches/server/0089-Show-last-tick-time-in-tps-command.patch b/patches/server/0090-Show-last-tick-time-in-tps-command.patch similarity index 100% rename from patches/server/0089-Show-last-tick-time-in-tps-command.patch rename to patches/server/0090-Show-last-tick-time-in-tps-command.patch diff --git a/patches/server/0090-For-collision-check-has-physics-before-same-vehicle.patch b/patches/server/0091-For-collision-check-has-physics-before-same-vehicle.patch similarity index 100% rename from patches/server/0090-For-collision-check-has-physics-before-same-vehicle.patch rename to patches/server/0091-For-collision-check-has-physics-before-same-vehicle.patch diff --git a/patches/server/0091-Variable-main-thread-task-delay.patch b/patches/server/0092-Variable-main-thread-task-delay.patch similarity index 100% rename from patches/server/0091-Variable-main-thread-task-delay.patch rename to patches/server/0092-Variable-main-thread-task-delay.patch diff --git a/patches/server/0092-Reduce-RandomSource-instances.patch b/patches/server/0093-Reduce-RandomSource-instances.patch similarity index 100% rename from patches/server/0092-Reduce-RandomSource-instances.patch rename to patches/server/0093-Reduce-RandomSource-instances.patch diff --git a/patches/server/0093-CPU-cores-estimation.patch b/patches/server/0094-CPU-cores-estimation.patch similarity index 100% rename from patches/server/0093-CPU-cores-estimation.patch rename to patches/server/0094-CPU-cores-estimation.patch diff --git a/patches/server/0094-Add-centralized-AsyncExecutor.patch b/patches/server/0095-Add-centralized-AsyncExecutor.patch similarity index 100% rename from patches/server/0094-Add-centralized-AsyncExecutor.patch rename to patches/server/0095-Add-centralized-AsyncExecutor.patch diff --git a/patches/server/0095-Remove-Paper-async-executor.patch b/patches/server/0096-Remove-Paper-async-executor.patch similarity index 100% rename from patches/server/0095-Remove-Paper-async-executor.patch rename to patches/server/0096-Remove-Paper-async-executor.patch diff --git a/patches/server/0096-Remove-Paper-cleaner-executor.patch b/patches/server/0097-Remove-Paper-cleaner-executor.patch similarity index 100% rename from patches/server/0096-Remove-Paper-cleaner-executor.patch rename to patches/server/0097-Remove-Paper-cleaner-executor.patch diff --git a/patches/server/0097-Remove-background-executor.patch b/patches/server/0098-Remove-background-executor.patch similarity index 100% rename from patches/server/0097-Remove-background-executor.patch rename to patches/server/0098-Remove-background-executor.patch diff --git a/patches/server/0098-Remove-bootstrap-executor.patch b/patches/server/0099-Remove-bootstrap-executor.patch similarity index 100% rename from patches/server/0098-Remove-bootstrap-executor.patch rename to patches/server/0099-Remove-bootstrap-executor.patch diff --git a/patches/server/0099-Remove-world-upgrade-executors.patch b/patches/server/0100-Remove-world-upgrade-executors.patch similarity index 100% rename from patches/server/0099-Remove-world-upgrade-executors.patch rename to patches/server/0100-Remove-world-upgrade-executors.patch diff --git a/patches/server/0100-Remove-tab-complete-executor.patch b/patches/server/0101-Remove-tab-complete-executor.patch similarity index 100% rename from patches/server/0100-Remove-tab-complete-executor.patch rename to patches/server/0101-Remove-tab-complete-executor.patch diff --git a/patches/server/0101-Remove-text-filter-executor.patch b/patches/server/0102-Remove-text-filter-executor.patch similarity index 93% rename from patches/server/0101-Remove-text-filter-executor.patch rename to patches/server/0102-Remove-text-filter-executor.patch index be1aa63..b8fdee2 100644 --- a/patches/server/0101-Remove-text-filter-executor.patch +++ b/patches/server/0102-Remove-text-filter-executor.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Remove text filter executor License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html) diff --git a/src/main/java/net/minecraft/server/network/TextFilterClient.java b/src/main/java/net/minecraft/server/network/TextFilterClient.java -index a6941c39802bd1b50e32a7ad00c65cfd59191bcf..4ad2827379ddcb7f3844cb17e39f3af56a6e2dd4 100644 +index 2393b6a5f3f12c2b17b172ee8ca42ead218e2a10..38f70925693bad437fee21438d702942a5db3ee1 100644 --- a/src/main/java/net/minecraft/server/network/TextFilterClient.java +++ b/src/main/java/net/minecraft/server/network/TextFilterClient.java @@ -32,6 +32,7 @@ import net.minecraft.Util;