GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Cooldown fix

Browse source
This commit is contained in:
OurLobanov 2024-06-24 18:30:59 +03:00
parent a571ff2d74
commit 958d13b1cc
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
core/src/main/java/org/geysermc/geyser/network/PacketCooldownManager.java
View file

@ -24,9 +24,9 @@ public class PacketCooldownManager {
setPacketCooldown(LoginPacket.class, -1, 2); setPacketCooldown(LoginPacket.class, -1, 2);
setPacketCooldown(ResourcePackClientResponsePacket.class, -1, 4); setPacketCooldown(ResourcePackClientResponsePacket.class, -1, 4);
setPacketCooldown(ResourcePackChunkRequestPacket.class, -1, 0); setPacketCooldown(ResourcePackChunkRequestPacket.class, -1, 0);
setPacketCooldown(TextPacket.class, 1000, 10); setPacketCooldown(TextPacket.class, 1000, 50);
setPacketCooldown(CommandRequestPacket.class, 1000, 10); setPacketCooldown(CommandRequestPacket.class, 1000, 50);
setPacketCooldown(ModalFormResponsePacket.class, 1000, 10); setPacketCooldown(ModalFormResponsePacket.class, 1000, 50);
} }
public void setPacketCooldown(Class<? extends BedrockPacket> packetClass, int cooldownMillis, int maxCount) { public void setPacketCooldown(Class<? extends BedrockPacket> packetClass, int cooldownMillis, int maxCount) {
@ -51,14 +51,17 @@ public class PacketCooldownManager {
private void updateCooldown(BedrockPacket packet) { private void updateCooldown(BedrockPacket packet) {
String packetName = packet.getClass().getSimpleName(); String packetName = packet.getClass().getSimpleName();
CooldownSettings settings = packetCooldownSettings.get(packetName); CooldownSettings settings = packetCooldownSettings.get(packetName);
activeCooldowns.computeIfAbsent(packetName, k -> new CooldownTracker()); CooldownTracker tracker = activeCooldowns.computeIfAbsent(packetName, k -> {
CooldownTracker tracker = activeCooldowns.get(packetName); CooldownTracker newTracker = new CooldownTracker();
long cooldownMillis = settings.cooldownMillis();
if (cooldownMillis == -1) {
newTracker.setExpiryTime(-1);
} else {
newTracker.setExpiryTime(System.currentTimeMillis() + cooldownMillis);
}
return newTracker;
});
tracker.incrementCount(); tracker.incrementCount();
if (settings.cooldownMillis() == -1) {
tracker.setExpiryTime(settings.cooldownMillis());
} else {
tracker.setExpiryTime(System.currentTimeMillis() + settings.cooldownMillis());
}
} }
public boolean handle(BedrockPacket packet) { public boolean handle(BedrockPacket packet) {