Merge conflict, take 2

This commit is contained in:
Ziggy
2015-05-09 02:37:37 +02:00
parent ac42cfb27a
commit d08207936b
@@ -170,7 +170,6 @@ public class ConnectionService extends Service {
if (p.getPlayerState() != PlayerState.LOGGED_OUT)
System.out.println("[" + p.getUsername() +"] Logged out " + p.getCharacterName());
p.setPlayerState(PlayerState.LOGGED_OUT);
disappearPlayers.add(p);
updateService.schedule(disappearRunnable, (long) DISAPPEAR_THRESHOLD, TimeUnit.MILLISECONDS);