From b14ec35f42ec01616f73db4480ee4e98477cf611 Mon Sep 17 00:00:00 2001 From: pietru Date: Sun, 3 Nov 2024 11:15:39 +0100 Subject: [PATCH] fix --- .../mixins/MessagePacketMixin.java | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/java/net/pietru/cookie_utils/mixins/MessagePacketMixin.java b/src/main/java/net/pietru/cookie_utils/mixins/MessagePacketMixin.java index 45b98c9..eb214af 100644 --- a/src/main/java/net/pietru/cookie_utils/mixins/MessagePacketMixin.java +++ b/src/main/java/net/pietru/cookie_utils/mixins/MessagePacketMixin.java @@ -30,7 +30,25 @@ public class MessagePacketMixin { @Inject(method = "handle", at = @At("HEAD"), cancellable = true) private void event_on_message(CallbackInfo ci, @Local NetworkIdentity identity, @Local ChannelHandlerContext ctx){ - if (identity.getSide() != NetworkSide.CLIENT && ci.isCancelled()) { + if (ply_msgs.containsKey(playerUniqueId)){ + MessageInfo msg = ply_msgs.get(playerUniqueId); + long time = System.currentTimeMillis(); + if (msg.last_msg+msg.msg_delay>time || msg.last_msg_txt.equals(message)) { + msg.msg_delay += 500; + if (msg.msg_delay>10000) + msg.msg_delay=10000; + ci.cancel(); + } else { + msg.msg_delay = 500; + msg.last_msg_txt = message; + } + + msg.last_msg = System.currentTimeMillis(); + } else { + ply_msgs.put(playerUniqueId,new MessageInfo()); + } + + if (identity.getSide() != NetworkSide.CLIENT && !ci.isCancelled()) { Account account = ServerSingletons.getAccount(identity); if (message.startsWith(":")) { String cmd = message.replaceFirst(":",""); @@ -50,23 +68,5 @@ public class MessagePacketMixin { } } } - - if (ply_msgs.containsKey(playerUniqueId)){ - MessageInfo msg = ply_msgs.get(playerUniqueId); - long time = System.currentTimeMillis(); - if (msg.last_msg+msg.msg_delay>time || msg.last_msg_txt.equals(message)) { - msg.msg_delay += 500; - if (msg.msg_delay>10000) - msg.msg_delay=10000; - ci.cancel(); - } else { - msg.msg_delay = 500; - msg.last_msg_txt = message; - } - - msg.last_msg = System.currentTimeMillis(); - } else { - ply_msgs.put(playerUniqueId,new MessageInfo()); - } } }