131 lines
6.4 KiB
Diff
131 lines
6.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: MrHua269 <mrhua269@gmail.com>
|
|
Date: Thu, 9 Jul 2026 10:17:22 +0800
|
|
Subject: [PATCH] Add portal rate limiter
|
|
|
|
|
|
diff --git a/io/papermc/paper/threadedregions/RegionizedWorldData.java b/io/papermc/paper/threadedregions/RegionizedWorldData.java
|
|
index df9a8fba86b61d2d2f82e40e0f317cab84faa2ff..7cbf93b183eaeb156467044ccdb2923e6d944438 100644
|
|
--- a/io/papermc/paper/threadedregions/RegionizedWorldData.java
|
|
+++ b/io/papermc/paper/threadedregions/RegionizedWorldData.java
|
|
@@ -157,6 +157,10 @@ public final class RegionizedWorldData {
|
|
for (final ChunkHolder chunkHolder : from.chunkHoldersToBroadcast) {
|
|
into.chunkHoldersToBroadcast.add(chunkHolder);
|
|
}
|
|
+ // Shiroha start - Add portal rate limiter
|
|
+ into.portalRateThrottler.mergeWith(from.portalRateThrottler);
|
|
+ from.portalRateThrottler.destroy();
|
|
+ // Shiroha end
|
|
}
|
|
|
|
@Override
|
|
@@ -322,6 +326,12 @@ public final class RegionizedWorldData {
|
|
into.chunkHoldersToBroadcast.add(chunkHolder);
|
|
}
|
|
}
|
|
+ // Shiroha start - Add portal rate limiter
|
|
+ for (var worldData : dataSet) {
|
|
+ from.portalRateThrottler.splitInto(worldData.portalRateThrottler);
|
|
+ }
|
|
+ from.portalRateThrottler.destroy();
|
|
+ // Shiroha end
|
|
}
|
|
};
|
|
|
|
@@ -343,6 +353,35 @@ public final class RegionizedWorldData {
|
|
return this.isHandlingTick;
|
|
}
|
|
|
|
+ // Shiroha start - Add portal rate limiter
|
|
+ public final io.nanachiyo0721.shiroha.utils.RateThrottler portalRateThrottler = new io.nanachiyo0721.shiroha.utils.RateThrottler();
|
|
+ public final net.objecthunter.exp4j.Expression portalRateCapExpression = io.nanachiyo0721.shiroha.config.modules.function.PortalRateLimiterConfig.getExpressionIfConfigured();
|
|
+
|
|
+ private int computePortalRateCap() {
|
|
+ // expression mode is disabled
|
|
+ if (this.portalRateCapExpression == null) {
|
|
+ return io.nanachiyo0721.shiroha.config.modules.function.PortalRateLimiterConfig.maxPortalTeleportsPerTick;
|
|
+ }
|
|
+
|
|
+ final int tickingEntityCount = this.entityTickList.size();
|
|
+ final int tickingChunkCount = this.tickingChunks.size();
|
|
+ final int playerCount = this.localPlayers.size();
|
|
+
|
|
+ return io.nanachiyo0721.shiroha.config.modules.function.PortalRateLimiterConfig.computeExpression(
|
|
+ this.portalRateCapExpression,
|
|
+ tickingEntityCount,
|
|
+ tickingChunkCount,
|
|
+ playerCount
|
|
+ );
|
|
+ }
|
|
+ public boolean isPortalTeleportationOutOfRate() {
|
|
+ if (!io.nanachiyo0721.shiroha.config.modules.function.PortalRateLimiterConfig.enabled) {
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ return this.portalRateThrottler.isOutOfRate(this.computePortalRateCap());
|
|
+ }
|
|
+ // Shiroha end
|
|
// entities
|
|
// this is copy on write to allow packet processing to iterate safely
|
|
private final CopyOnWriteArrayList<ServerPlayer> localPlayers = new CopyOnWriteArrayList<>();
|
|
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
|
|
index 3ecedf303384c172a5e2a19c9e6ac0c3a43cef74..ee7fce1e4e9b94b1f9c956c376fff0abee51b0ca 100644
|
|
--- a/net/minecraft/server/MinecraftServer.java
|
|
+++ b/net/minecraft/server/MinecraftServer.java
|
|
@@ -1933,6 +1933,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
|
//net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = level.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper - Perf: Optimize Hoppers // Folia - region threading
|
|
profiler.push(() -> level + " " + level.dimension().identifier());
|
|
profiler.push("tick");
|
|
+ // Shiroha start - Add portal rate limiter
|
|
+ regionizedWorldData.portalRateThrottler.begin();
|
|
+ // Shiroha end
|
|
|
|
try {
|
|
foliaProfiler.startTimer(level.tickTimerId); try { // Folia - profiler
|
|
@@ -1947,6 +1950,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
|
profiler.pop();
|
|
profiler.pop();
|
|
regionizedWorldData.explosionDensityCache.clear(); // Paper - Optimize explosions // Folia - region threading
|
|
+ // Shiroha start - Add portal rate limiter
|
|
+ regionizedWorldData.portalRateThrottler.done();
|
|
+ // Shiroha end
|
|
}
|
|
//this.isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked // Folia - region threading
|
|
|
|
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
|
|
index e89d2af26ffe83e71cfb733cfdbec542f845f4e5..1505a920694068260d9d81bc4f3c96f3a154f19d 100644
|
|
--- a/net/minecraft/server/level/ServerLevel.java
|
|
+++ b/net/minecraft/server/level/ServerLevel.java
|
|
@@ -1538,8 +1538,15 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
|
|
// removed from region while ticking
|
|
return;
|
|
}
|
|
+ // Shiroha start - Add portal rate limiter
|
|
+ var worldData = entity.level().getCurrentWorldData();
|
|
+ if (entity.portalProcess != null && worldData.isPortalTeleportationOutOfRate()) {
|
|
+ return;
|
|
+ }
|
|
+ // Shiroha end
|
|
if (entity.handlePortal()) {
|
|
// portalled
|
|
+ worldData.portalRateThrottler.increase(); // Shiroha - Add portal rate limiter
|
|
return;
|
|
}
|
|
}
|
|
@@ -1583,8 +1590,15 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
|
|
// removed from region while ticking
|
|
return;
|
|
}
|
|
+ // Shiroha start - Add portal rate limiter
|
|
+ var worldData = entity.level().getCurrentWorldData();
|
|
+ if (entity.portalProcess != null && worldData.isPortalTeleportationOutOfRate()) {
|
|
+ return;
|
|
+ }
|
|
+ // Shiroha end
|
|
if (entity.handlePortal()) {
|
|
// portalled
|
|
+ worldData.portalRateThrottler.increase(); // Shiroha - Add portal rate limiter
|
|
return;
|
|
}
|
|
// Folia end - region threading
|