Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2025-04-02 09:25:56 +02:00
Code Issues Projects Releases Wiki Activity

Remove error markers.

Browse Source
This commit is contained in:
asofold 2014-12-01 00:06:41 +01:00
parent b21b587c0c
commit 5dd5f8b87c
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
NCPCore/src/main/java/fr/neatmonster/nocheatplus/compat/BridgeMisc.java
View File

@ -1,7 +1,9 @@
package fr.neatmonster.nocheatplus.compat;
import java.lang.reflect.InvocationTargetException;
import java.util.Collection;
import org.bukkit.Bukkit;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile;
@ -54,4 +56,22 @@ public class BridgeMisc {
}
}
/**
* Get online players as an array (convenience for reducing IDE markers :p).
* @return
*/
public static Player[] getOnlinePlayers() {
Object obj = Bukkit.getOnlinePlayers();
if (obj instanceof Collection<?>) {
@SuppressWarnings("unchecked")
Collection<? extends Player> players = (Collection<? extends Player>) obj;
return players.toArray(new Player[players.size()]);
}
else if (obj instanceof Player[]) {
return (Player[]) obj;
} else {
return new Player[0];
}
}
}

6
NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/NoCheatPlus.java
View File

@ -12,7 +12,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.Callable;
import java.util.logging.Level;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
@ -45,6 +44,7 @@ import fr.neatmonster.nocheatplus.checks.inventory.InventoryListener;
import fr.neatmonster.nocheatplus.checks.moving.MovingListener;
import fr.neatmonster.nocheatplus.clients.ModUtil;
import fr.neatmonster.nocheatplus.command.NoCheatPlusCommand;
import fr.neatmonster.nocheatplus.compat.BridgeMisc;
import fr.neatmonster.nocheatplus.compat.DefaultComponentFactory;
import fr.neatmonster.nocheatplus.compat.MCAccess;
import fr.neatmonster.nocheatplus.compat.MCAccessFactory;
@ -869,7 +869,7 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI {
}
// Care for already online players.
final Player[] onlinePlayers = getServer().getOnlinePlayers();
final Player[] onlinePlayers = BridgeMisc.getOnlinePlayers();
// TODO: re-map ExemptionManager !
// TODO: Disable all checks for these players for one tick ?
// TODO: Prepare check data for players [problem: permissions]?
@ -1183,7 +1183,7 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI {
}
final long tEnd = tStart + config.getLong(ConfPaths.DATA_CONSISTENCYCHECKS_MAXTIME, 1, 50, 2);
if (consistencyCheckerIndex >= consistencyCheckers.size()) consistencyCheckerIndex = 0;
final Player[] onlinePlayers = getServer().getOnlinePlayers();
final Player[] onlinePlayers = BridgeMisc.getOnlinePlayers();
// Loop
while (consistencyCheckerIndex < consistencyCheckers.size()){
final ConsistencyChecker checker = consistencyCheckers.get(consistencyCheckerIndex);