mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix config migration error preventing server startup

Browse source 
There's at least two more, but those are less pressing
This commit is contained in:
Nassim Jahnke 2022-06-09 14:27:48 +02:00
commit c6f937f660
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
patches/server/Add-packet-limiter-config.patch
View file

@ -10,7 +10,7 @@ packet-limiter:
all: all:
interval: 7.0 interval: 7.0
max-packet-rate: 500.0 max-packet-rate: 500.0
PacketPlayInAutoRecipe: ServerboundPlaceRecipePacket:
interval: 4.0 interval: 4.0
max-packet-rate: 5.0 max-packet-rate: 5.0
action: DROP action: DROP

10
patches/server/Paper-config-files.patch
View file

@ -1913,6 +1913,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ final String fullClassName = "net.minecraft.network.protocol." + subpackage + "." + obj; + final String fullClassName = "net.minecraft.network.protocol." + subpackage + "." + obj;
+ try { + try {
+ packetClass = Class.forName(fullClassName); + packetClass = Class.forName(fullClassName);
+ break;
+ } catch (final ClassNotFoundException ex) { + } catch (final ClassNotFoundException ex) {
+ final @Nullable String spigotClassName = MOJANG_TO_OBF.get(fullClassName); + final @Nullable String spigotClassName = MOJANG_TO_OBF.get(fullClassName);
+ if (spigotClassName != null) { + if (spigotClassName != null) {
@ -1930,6 +1931,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ +
+ @Override + @Override
+ protected Object serialize(final Class<? extends Packet<?>> item, final Predicate<Class<?>> typeSupported) { + protected Object serialize(final Class<? extends Packet<?>> item, final Predicate<Class<?>> typeSupported) {
+ //TODO always serialize the mapped class name to not break on switching between mapped/unmapped servers
+ return item.getSimpleName(); + return item.getSimpleName();
+ } + }
+} +}
@ -2851,10 +2853,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ return new Object[]{"entities", "spawning", "duplicate-uuid", "mode"}; + return new Object[]{"entities", "spawning", "duplicate-uuid", "mode"};
+ }); + });
+ +
+ builder.addAction(path("redstone-implementation"), (path, value) -> {
+ if (value.require(String.class).equalsIgnoreCase("alternate-current")) {
+ value.set("alternate_current");
+ }
+ return new Object[]{"misc", "redstone-implementation"};
+ });
+
+ moveToMisc(builder, "light-queue-size"); + moveToMisc(builder, "light-queue-size");
+ moveToMisc(builder, "update-pathfinding-on-block-update"); + moveToMisc(builder, "update-pathfinding-on-block-update");
+ moveToMisc(builder, "show-sign-click-command-failure-msgs-to-player"); + moveToMisc(builder, "show-sign-click-command-failure-msgs-to-player");
+ moveToMisc(builder, "redstone-implementation");
+ moveToMisc(builder, "max-leash-distance"); + moveToMisc(builder, "max-leash-distance");
+ +
+ return builder.build(); + return builder.build();