diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/MuteCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/MuteCommand.java index 919c43a7..24425e2c 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/MuteCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/MuteCommand.java @@ -43,7 +43,7 @@ public class MuteCommand extends Command { } } - habbo.mute(duration); + habbo.mute(duration, false); if (habbo.getHabboInfo().getCurrentRoom() != null) { habbo.getHabboInfo().getCurrentRoom().sendComposer(new RoomUserIgnoredComposer(habbo, RoomUserIgnoredComposer.MUTED).compose()); //: RoomUserIgnoredComposer.UNIGNORED diff --git a/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolSanctions.java b/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolSanctions.java index 91ad713b..ea72d8bb 100644 --- a/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolSanctions.java +++ b/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolSanctions.java @@ -158,7 +158,7 @@ public class ModToolSanctions { switch (sanctionLevelItem.sanctionType) { case "ALERT": habbo.alert(reason); break; case "BAN": Emulator.getGameEnvironment().getModToolManager().ban(habboId, self, reason, sanctionLevelItem.sanctionHourLength, ModToolBanType.ACCOUNT, cfhTopic); break; - case "MUTE": habbo.mute(muteDurationSeconds == 0 ? 3600 : muteDurationSeconds); break; + case "MUTE": habbo.mute(muteDurationSeconds == 0 ? 3600 : muteDurationSeconds, false); break; default: break; } } diff --git a/src/main/java/com/eu/habbo/habbohotel/modtool/WordFilter.java b/src/main/java/com/eu/habbo/habbohotel/modtool/WordFilter.java index 6b214a77..123a47c4 100644 --- a/src/main/java/com/eu/habbo/habbohotel/modtool/WordFilter.java +++ b/src/main/java/com/eu/habbo/habbohotel/modtool/WordFilter.java @@ -150,7 +150,7 @@ public class WordFilter { foundShit = true; if (habbo != null && word.muteTime > 0) { - habbo.mute(word.muteTime); + habbo.mute(word.muteTime, false); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java index e88598a7..ffe6e746 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java @@ -2971,7 +2971,7 @@ public class Room implements Comparable, ISerialize, Runnable { habbo.getHabboStats().mutedCount++; timeOut += (timeOut * (int) Math.ceil(Math.pow(habbo.getHabboStats().mutedCount, 2))); habbo.getHabboStats().chatCounter = 0; - habbo.mute(timeOut); + habbo.mute(timeOut, true); } public void talk(Habbo habbo, RoomChatMessage roomChatMessage, RoomChatType chatType) { diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomChatMessage.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomChatMessage.java index c6ed428e..8322d624 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomChatMessage.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomChatMessage.java @@ -210,7 +210,7 @@ public class RoomChatMessage implements Runnable, ISerialize, Loggable { return; } } else { - this.habbo.mute(Emulator.getConfig().getInt("hotel.wordfilter.automute")); + this.habbo.mute(Emulator.getConfig().getInt("hotel.wordfilter.automute"), false); } this.message = ""; diff --git a/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java b/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java index 0838c76f..b3fb1399 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java @@ -378,14 +378,14 @@ public class Habbo implements Runnable { } } - public void mute(int seconds) { + public void mute(int seconds, boolean isFlood) { if (!this.hasPermission("acc_no_mute")) { int remaining = this.habboStats.addMuteTime(seconds); this.client.sendResponse(new FloodCounterComposer(remaining)); this.client.sendResponse(new MutedWhisperComposer(remaining)); Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); - if (room != null) { + if (room != null && !isFlood) { room.sendComposer(new RoomUserIgnoredComposer(this, RoomUserIgnoredComposer.MUTED).compose()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/handshake/SecureLoginEvent.java b/src/main/java/com/eu/habbo/messages/incoming/handshake/SecureLoginEvent.java index ca7834d2..86d75859 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/handshake/SecureLoginEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/handshake/SecureLoginEvent.java @@ -169,7 +169,7 @@ public class SecureLoginEvent extends MessageHandler { } else if (item.isMuted && item.muteDuration > Emulator.getIntUnixTimestamp()) { Date muteDuration = new Date((long) item.muteDuration * 1000); long diff = muteDuration.getTime() - Emulator.getDate().getTime(); - habbo.mute(Math.toIntExact(diff)); + habbo.mute(Math.toIntExact(diff), false); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolIssueDefaultSanctionEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolIssueDefaultSanctionEvent.java index bea0a0ff..3a0f770c 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolIssueDefaultSanctionEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolIssueDefaultSanctionEvent.java @@ -30,7 +30,7 @@ public class ModToolIssueDefaultSanctionEvent extends MessageHandler { } else if (defaultSanction.muteLength > 0) { if (target != null) { - target.mute(defaultSanction.muteLength * 86400); + target.mute(defaultSanction.muteLength * 86400, false); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionMuteEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionMuteEvent.java index b7451cfe..cdd18350 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionMuteEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionMuteEvent.java @@ -47,7 +47,7 @@ public class ModToolSanctionMuteEvent extends MessageHandler { modToolSanctions.run(userId, this.client.getHabbo(), 0, cfhTopic, message, 0, false, 0); } } else { - habbo.mute(60 * 60); + habbo.mute(60 * 60, false); habbo.alert(message); this.client.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_mute.muted").replace("%user%", habbo.getHabboInfo().getUsername())); } diff --git a/src/main/java/com/eu/habbo/messages/rcon/MuteUser.java b/src/main/java/com/eu/habbo/messages/rcon/MuteUser.java index a83da553..b86893d1 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/MuteUser.java +++ b/src/main/java/com/eu/habbo/messages/rcon/MuteUser.java @@ -21,7 +21,7 @@ public class MuteUser extends RCONMessage { if (json.duration == 0) { habbo.unMute(); } else { - habbo.mute(json.duration); + habbo.mute(json.duration, false); } } else { try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("UPDATE users_settings SET mute_end_timestamp = ? WHERE user_id = ? LIMIT 1")) {