projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-07 22:13:40 -04:00
Code Issues Projects Releases Wiki Activity

Merge conflict fix attempt

Browse Source
This commit is contained in:
Ziggy
2015-05-09 02:34:35 +02:00
parent c4a344ba1c
commit ac42cfb27a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/galaxy/ConnectionService.java
+2 -1
View File
@@ -166,10 +166,11 @@ public class ConnectionService extends Service {
int deltaTime = (int) ((System.currentTimeMillis()) - startTime);
int newTotalTime = currentTime + (int) TimeUnit.MILLISECONDS.toSeconds(deltaTime);
playerObject.setPlayTime(newTotalTime);
if (p.getPlayerState() != PlayerState.LOGGED_OUT)
System.out.println("[" + p.getUsername() +"] Logged out " + p.getCharacterName());
playerObject.setPlayTime(newTotalTime);
p.setPlayerState(PlayerState.LOGGED_OUT);
disappearPlayers.add(p);
updateService.schedule(disappearRunnable, (long) DISAPPEAR_THRESHOLD, TimeUnit.MILLISECONDS);