Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2025-02-09 16:21:49 +01:00
Code Issues Projects Releases Wiki Activity

Remove kicking from listener, leave that to actions (Fixes async

Browse Source 
problems).
This commit is contained in:
asofold 2012-08-29 01:16:50 +02:00
parent 5cfeea44bb
commit 8b8a92da60
2 changed files with 17 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/fr/neatmonster/nocheatplus/checks/chat/ChatListener.java
View File

@ -12,7 +12,6 @@ import org.bukkit.event.player.PlayerLoginEvent.Result;
import org.bukkit.event.player.PlayerMoveEvent;
import fr.neatmonster.nocheatplus.players.Permissions;
import fr.neatmonster.nocheatplus.utilities.CheckUtils;
/*
* MM'""""'YMM dP dP M""MMMMMMMM oo dP
@ -59,8 +58,9 @@ public class ChatListener implements Listener {
event.setMessage(color.check(player, event.getMessage(), false));
// Then the no pwnage check.
if (noPwnage.check(player, event, false))
player.kickPlayer(CheckUtils.removeColors(ChatConfig.getConfig(player).noPwnageKickMessage));
if (noPwnage.check(player, event.getMessage(), false))
event.setCancelled(true);
// player.kickPlayer(CheckUtils.removeColors(ChatConfig.getConfig(player).noPwnageKickMessage));
}
/**
@ -113,8 +113,9 @@ public class ChatListener implements Listener {
event.setMessage(color.check(player, event.getMessage(), true));
// Then the no pwnage check.
if (noPwnage.check(player, event, true))
player.kickPlayer(CheckUtils.removeColors(ChatConfig.getConfig(player).noPwnageKickMessage));
if (noPwnage.check(player, event.getMessage(), true))
event.setCancelled(true);
// player.kickPlayer(CheckUtils.removeColors(ChatConfig.getConfig(player).noPwnageKickMessage));
}
/**

56
src/fr/neatmonster/nocheatplus/checks/chat/NoPwnage.java
View File

@ -4,9 +4,6 @@ import java.util.Random;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.player.AsyncPlayerChatEvent;
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
import org.bukkit.event.player.PlayerEvent;
import fr.neatmonster.nocheatplus.actions.ParameterName;
import fr.neatmonster.nocheatplus.actions.types.ActionList;
@ -62,9 +59,9 @@ public class NoPwnage extends Check {
* the event
* @param isMainThread
* is the thread the main thread
* @return true, if successful
* @return If to cancel the event.
*/
public boolean check(final Player player, final PlayerEvent event, final boolean isMainThread) {
public boolean check(final Player player, final String message, final boolean isMainThread) {
if (isMainThread && !isEnabled(player))
return false;
@ -76,7 +73,7 @@ public class NoPwnage extends Check {
// Keep related to ChatData/NoPwnage/Color used lock.
synchronized (data) {
return unsafeCheck(player, event, isMainThread, cc, data);
return unsafeCheck(player, message, isMainThread, cc, data);
}
}
@ -138,37 +135,6 @@ public class NoPwnage extends Check {
return super.getParameter(wildcard, violationData);
}
/**
* Only to be called form synchronized code.
*
* @param player
* the player
* @param event
* the event
* @param isMainThread
* is the thread the main thread
* @param cc
* the configuration
* @param data
* the data
* @return true, if successful
*/
private boolean unsafeCheck(final Player player, final PlayerEvent event, final boolean isMainThread,
final ChatConfig cc, final ChatData data) {
boolean[] results = null;
if (event instanceof AsyncPlayerChatEvent) {
final AsyncPlayerChatEvent e = (AsyncPlayerChatEvent) event;
results = unsafeCheck(player, e.getMessage(), isMainThread, cc, data);
if (results[0]) e.setCancelled(true);
} else if (event instanceof PlayerCommandPreprocessEvent) {
final PlayerCommandPreprocessEvent e = (PlayerCommandPreprocessEvent) event;
results = unsafeCheck(player, e.getMessage(), isMainThread, cc, data);
if (results[0]) e.setCancelled(true);
}
// else: impossible.
return results[1];
}
/**
* Only to be called form synchronized code.
*
@ -182,16 +148,16 @@ public class NoPwnage extends Check {
* the cc
* @param data
* the data
* @return the boolean[]
* @return If to cancel the event.
*/
private boolean[] unsafeCheck(final Player player, final String message, final boolean isMainThread,
private boolean unsafeCheck(final Player player, final String message, final boolean isMainThread,
final ChatConfig cc, final ChatData data) {
boolean cancel = false, kick = false;
boolean cancel = false;
// Don't not check excluded messages/commands.
for (final String exclusion : cc.noPwnageExclusions)
if (message.startsWith(exclusion))
return new boolean[] {false, false};
return false;
final long now = System.currentTimeMillis();
@ -209,7 +175,7 @@ public class NoPwnage extends Check {
data.noPwnageVL += cc.noPwnageLevel / 10D;
// Find out if we need to kick the player or not.
kick = executeActionsThreadSafe(player, data.noPwnageVL, cc.noPwnageLevel / 10D,
cancel = executeActionsThreadSafe(player, data.noPwnageVL, cc.noPwnageLevel / 10D,
cc.noPwnageActions, isMainThread);
}
@ -222,7 +188,7 @@ public class NoPwnage extends Check {
}
// Cancel the message and maybe event.
return new boolean[] {true, kick};
return true;
}
int suspicion = 0;
@ -293,7 +259,7 @@ public class NoPwnage extends Check {
data.noPwnageVL += suspicion / 10D;
// Find out if we need to kick the player or not.
kick = executeActionsThreadSafe(player, data.noPwnageVL, suspicion / 10D, cc.noPwnageActions,
cancel = executeActionsThreadSafe(player, data.noPwnageVL, suspicion / 10D, cc.noPwnageActions,
isMainThread);
}
else
@ -306,7 +272,7 @@ public class NoPwnage extends Check {
lastGlobalMessage = message;
lastGlobalMessageTime = now;
return new boolean[] {cancel, kick};
return cancel;
}
/**