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

Fixed concurrentModificationException

Browse Source
This commit is contained in:
Evenprime 2011-04-10 22:08:05 +02:00
parent bbe2250e0a
commit 004748dbd3
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin.yml
View File

@ -3,7 +3,7 @@ name: NoCheat
author: Evenprime author: Evenprime
main: cc.co.evenprime.bukkit.nocheat.NoCheat main: cc.co.evenprime.bukkit.nocheat.NoCheat
version: 0.8.2 version: 0.8.3
commands: commands:
nocheat: nocheat:

34
src/cc/co/evenprime/bukkit/nocheat/NoCheat.java
View File

@ -1,6 +1,7 @@
package cc.co.evenprime.bukkit.nocheat; package cc.co.evenprime.bukkit.nocheat;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator;
import java.util.Map; import java.util.Map;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -47,9 +48,9 @@ public class NoCheat extends JavaPlugin {
public final AirbuildCheck airbuildCheck; public final AirbuildCheck airbuildCheck;
private NoCheatConfiguration config; private NoCheatConfiguration config;
private boolean exceptionWithPermissions = false; private boolean exceptionWithPermissions = false;
private boolean cleanUpTaskSetup = false; private boolean cleanUpTaskSetup = false;
// Permissions 2.x, if available // Permissions 2.x, if available
@ -95,7 +96,7 @@ public class NoCheat extends JavaPlugin {
return data; return data;
} }
/** /**
* Go through the playerData HashMap and remove players that are no longer online * Go through the playerData HashMap and remove players that are no longer online
* from the map. This should be called in long, regular intervals (e.g. every 10 minutes) * from the map. This should be called in long, regular intervals (e.g. every 10 minutes)
@ -103,10 +104,11 @@ public class NoCheat extends JavaPlugin {
*/ */
public void cleanPlayerDataCollection() { public void cleanPlayerDataCollection() {
synchronized(playerData) { synchronized(playerData) {
for(Player p : playerData.keySet()) { Iterator<Map.Entry<Player, NoCheatData>> it = playerData.entrySet().iterator();
if(!p.isOnline()) { while (it.hasNext()) {
playerData.remove(p); Map.Entry<Player, NoCheatData> pairs = (Map.Entry<Player, NoCheatData>)it.next();
} if(!pairs.getKey().isOnline())
it.remove();
} }
} }
} }
@ -191,25 +193,25 @@ public class NoCheat extends JavaPlugin {
setupIRC(); setupIRC();
Logger.getLogger("Minecraft").info( "[NoCheat] version [" + pdfFile.getVersion() + "] is enabled with the following checks: "+getActiveChecksAsString()); Logger.getLogger("Minecraft").info( "[NoCheat] version [" + pdfFile.getVersion() + "] is enabled with the following checks: "+getActiveChecksAsString());
setupCleanupTask(); setupCleanupTask();
} }
private void setupCleanupTask() { private void setupCleanupTask() {
if(cleanUpTaskSetup) return; if(cleanUpTaskSetup) return;
cleanUpTaskSetup = true; cleanUpTaskSetup = true;
Bukkit.getServer().getScheduler().scheduleAsyncRepeatingTask(this, new Runnable() { Bukkit.getServer().getScheduler().scheduleAsyncRepeatingTask(this, new Runnable() {
@Override @Override
public void run() { public void run() {
cleanPlayerDataCollection(); cleanPlayerDataCollection();
} }
}, 5000, 5000); }, 5000, 5000);
} }
/** /**
@ -270,7 +272,7 @@ public class NoCheat extends JavaPlugin {
} }
} }
private void logToChat(Level l, String message) { private void logToChat(Level l, String message) {
if(config.chatLevel.intValue() <= l.intValue()) { if(config.chatLevel.intValue() <= l.intValue()) {
for(Player player : getServer().getOnlinePlayers()) { for(Player player : getServer().getOnlinePlayers()) {
@ -311,7 +313,7 @@ public class NoCheat extends JavaPlugin {
if(!this.exceptionWithPermissions) { if(!this.exceptionWithPermissions) {
// Prevent spam and recursion by definitely doing this only once // Prevent spam and recursion by definitely doing this only once
this.exceptionWithPermissions = true; this.exceptionWithPermissions = true;
String logtext = "Asking Permissions-Plugin if "+player.getName()+" has permission "+permission+" caused an Exception "+ e.getMessage() + ". Please review your permissions config file. This message is only displayed once, the player is considered to not have that permission from now on. The full stack trace is written into the nocheat logfile."; String logtext = "Asking Permissions-Plugin if "+player.getName()+" has permission "+permission+" caused an Exception "+ e.getMessage() + ". Please review your permissions config file. This message is only displayed once, the player is considered to not have that permission from now on. The full stack trace is written into the nocheat logfile.";
log(Level.SEVERE, logtext); log(Level.SEVERE, logtext);
for(StackTraceElement s : e.getStackTrace()) { for(StackTraceElement s : e.getStackTrace()) {
@ -352,6 +354,6 @@ public class NoCheat extends JavaPlugin {
public void handleCustomAction(Action a, Player player) { public void handleCustomAction(Action a, Player player) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
} }