twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 12:42:05 -07:00
Code Issues Packages Projects Releases Wiki Activity

Couple config fixes (#7975)

Browse Source
This commit is contained in:
Jake Potrebic
2022-06-13 15:29:44 -07:00
parent 98b65200d8
commit c3f403dd76
2 changed files with 4 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

@@ -73,7 +73,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ for (Class<?> check = packet.getClass(); check != Object.class; check = check.getSuperclass()) { + for (Class<?> check = packet.getClass(); check != Object.class; check = check.getSuperclass()) {
+ io.papermc.paper.configuration.GlobalConfiguration.PacketLimiter.PacketLimit packetSpecificLimit = + io.papermc.paper.configuration.GlobalConfiguration.PacketLimiter.PacketLimit packetSpecificLimit =
+ io.papermc.paper.configuration.GlobalConfiguration.get().packetLimiter.overrides.get(check); + io.papermc.paper.configuration.GlobalConfiguration.get().packetLimiter.overrides.get(check);
+ if (packetSpecificLimit == null) { + if (packetSpecificLimit == null || !packetSpecificLimit.isEnabled()) {
+ continue; + continue;
+ } + }
+ io.papermc.paper.util.IntervalledCounter counter = this.packetSpecificLimits.computeIfAbsent((Class)check, (clazz) -> { + io.papermc.paper.util.IntervalledCounter counter = this.packetSpecificLimits.computeIfAbsent((Class)check, (clazz) -> {

4
patches/server/Paper-config-files.patch
View File

@@ -631,7 +631,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ public Map<Class<? extends Packet<?>>, PacketLimit> overrides = Map.of(ServerboundPlaceRecipePacket.class, new PacketLimit(4.0, 5.0, PacketLimit.ViolateAction.DROP)); + public Map<Class<? extends Packet<?>>, PacketLimit> overrides = Map.of(ServerboundPlaceRecipePacket.class, new PacketLimit(4.0, 5.0, PacketLimit.ViolateAction.DROP));
+ +
+ @ConfigSerializable + @ConfigSerializable
+ public record PacketLimit(@Constraint(Constraints.Positive.class) @Required double interval, @Constraint(Constraints.Positive.class) @Required double maxPacketRate, ViolateAction action) { + public record PacketLimit(@Required double interval, @Required double maxPacketRate, ViolateAction action) {
+ public PacketLimit(final double interval, final double maxPacketRate, final @Nullable ViolateAction action) { + public PacketLimit(final double interval, final double maxPacketRate, final @Nullable ViolateAction action) {
+ this.interval = interval; + this.interval = interval;
+ this.maxPacketRate = maxPacketRate; + this.maxPacketRate = maxPacketRate;
@@ -1354,6 +1354,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ path("use-hopper-check"), + path("use-hopper-check"),
+ path("use-async-lighting"), + path("use-async-lighting"),
+ path("tnt-explosion-volume"), + path("tnt-explosion-volume"),
+ path("entities", "spawning", "despawn-ranges", "soft"),
+ path("entities", "spawning", "despawn-ranges", "hard")
+ }; + };
+ +
+ NodePath[] REMOVED_GLOBAL_PATHS = { + NodePath[] REMOVED_GLOBAL_PATHS = {