Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #904 (Ljacqu, pls fix me :P)

Browse Source
This commit is contained in:
Gabriele C 2016-10-01 23:09:39 +02:00
parent 06d61db7f0
commit 62b8af6a37
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/fr/xephi/authme/AntiBot.java
View File

@ -2,6 +2,7 @@ package fr.xephi.authme;
import fr.xephi.authme.output.MessageKey; import fr.xephi.authme.output.MessageKey;
import fr.xephi.authme.output.Messages; import fr.xephi.authme.output.Messages;
import fr.xephi.authme.permission.AdminPermission;
import fr.xephi.authme.permission.PermissionsManager; import fr.xephi.authme.permission.PermissionsManager;
import fr.xephi.authme.permission.PlayerStatePermission; import fr.xephi.authme.permission.PlayerStatePermission;
import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.Settings;
@ -66,8 +67,11 @@ public class AntiBot {
public void activateAntiBot() { public void activateAntiBot() {
antiBotStatus = AntiBotStatus.ACTIVE; antiBotStatus = AntiBotStatus.ACTIVE;
for (String s : messages.retrieve(MessageKey.ANTIBOT_AUTO_ENABLED_MESSAGE)) { for(Player player : bukkitService.getOnlinePlayers()) {
bukkitService.broadcastMessage(s); if(!permissionsManager.hasPermission(player, AdminPermission.ANTIBOT_MESSAGES)) {
continue;
}
messages.send(player, MessageKey.ANTIBOT_AUTO_ENABLED_MESSAGE);
} }
final int duration = settings.getProperty(ProtectionSettings.ANTIBOT_DURATION); final int duration = settings.getProperty(ProtectionSettings.ANTIBOT_DURATION);

5
src/main/java/fr/xephi/authme/permission/AdminPermission.java
View File

@ -100,6 +100,11 @@ public enum AdminPermission implements PermissionNode {
*/ */
RELOAD("authme.admin.reload", DefaultPermission.OP_ONLY), RELOAD("authme.admin.reload", DefaultPermission.OP_ONLY),
/**
* Administrator command to reload the plugin configuration.
*/
ANTIBOT_MESSAGES("authme.admin.antibotmessages", DefaultPermission.OP_ONLY),
/** /**
* Permission to see the other accounts of the players that log in. * Permission to see the other accounts of the players that log in.
*/ */

1
src/main/java/fr/xephi/authme/util/BukkitService.java
View File

@ -3,6 +3,7 @@ package fr.xephi.authme.util;
import fr.xephi.authme.AuthMe; import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.initialization.SettingsDependent; import fr.xephi.authme.initialization.SettingsDependent;
import fr.xephi.authme.permission.PermissionNode;
import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.settings.properties.PluginSettings; import fr.xephi.authme.settings.properties.PluginSettings;
import org.bukkit.BanEntry; import org.bukkit.BanEntry;

2
src/test/java/fr/xephi/authme/AntiBotTest.java
View File

@ -127,7 +127,7 @@ public class AntiBotTest {
// then // then
assertThat(antiBot.getAntiBotStatus(), equalTo(AntiBot.AntiBotStatus.ACTIVE)); assertThat(antiBot.getAntiBotStatus(), equalTo(AntiBot.AntiBotStatus.ACTIVE));
ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
verify(bukkitService, times(2)).broadcastMessage(captor.capture()); verify(messages, times(2)).send(captor.capture());
assertThat(captor.getAllValues(), contains("Test line #1", "Test line #2")); assertThat(captor.getAllValues(), contains("Test line #1", "Test line #2"));
long expectedTicks = duration * TICKS_PER_MINUTE; long expectedTicks = duration * TICKS_PER_MINUTE;
verify(bukkitService).scheduleSyncDelayedTask(any(Runnable.class), eq(expectedTicks)); verify(bukkitService).scheduleSyncDelayedTask(any(Runnable.class), eq(expectedTicks));