Remove duplicate code, simplify logic

This commit is contained in:
Mike 2020-06-03 03:04:05 +02:00
parent caf0bcb41f
commit dd98c3072a

View File

@ -1202,8 +1202,11 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
{ {
habbo.getHabboStats().chatCounter--; habbo.getHabboStats().chatCounter--;
if (Emulator.getConfig().getBoolean("flood.with.rights")) { if (habbo.getHabboStats().chatCounter > 3) {
if (habbo.getHabboStats().chatCounter > 3 && !this.hasRights(habbo)) { final boolean floodRights = Emulator.getConfig().getBoolean("flood.with.rights");
final boolean hasRights = this.hasRights(habbo);
if (floodRights || !hasRights) {
if (this.chatProtection == 0) { if (this.chatProtection == 0) {
this.floodMuteHabbo(habbo, 30); this.floodMuteHabbo(habbo, 30);
} else if (this.chatProtection == 1 && habbo.getHabboStats().chatCounter > 4) { } else if (this.chatProtection == 1 && habbo.getHabboStats().chatCounter > 4) {
@ -1213,16 +1216,6 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
} }
} }
} }
else if (habbo.getHabboStats().chatCounter > 3 && this.hasRights(habbo)) {
if (this.chatProtection == 0) {
this.floodMuteHabbo(habbo, 30);
} else if (this.chatProtection == 1 && habbo.getHabboStats().chatCounter > 4) {
this.floodMuteHabbo(habbo, 30);
} else if (this.chatProtection == 2 && habbo.getHabboStats().chatCounter > 5) {
this.floodMuteHabbo(habbo, 30);
}
}
} }
} else { } else {
habbo.getHabboStats().chatCounter = 0; habbo.getHabboStats().chatCounter = 0;