nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-11-23 15:20:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '605-flood' into 'dev'

Browse Source 
Resolve "Flood "problem""

See merge request morningstar/Arcturus-Community!168
This commit is contained in:
Mike 2020-06-02 21:04:45 -04:00
commit 1e51448b38
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sqlupdates/2_4_0 RC-1 to 2_4_0 RC-2.sql
View File

@ -1 +0,0 @@
ALTER TABLE `permissions` ADD `acc_hide_mail` ENUM('0', '1') NOT NULL DEFAULT '0' AFTER `acc_hide_ip`;

3
sqlupdates/2_4_0-RC-1 to 2_4_0-RC-2.sql Normal file
View File

@ -0,0 +1,3 @@
ALTER TABLE `permissions` ADD `acc_hide_mail` ENUM('0', '1') NOT NULL DEFAULT '0' AFTER `acc_hide_ip`;
INSERT INTO `emulator_settings` (`key`, `value`) VALUES ('flood.with.rights', '0');

19
src/main/java/com/eu/habbo/habbohotel/rooms/Room.java
View File

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