From ac42cfb27ad76cb2864112a0433cde365e64a551 Mon Sep 17 00:00:00 2001
From: Ziggy <danish_cyborg@hotmail.com>
Date: Sat, 9 May 2015 02:34:35 +0200
Subject: [PATCH] Merge conflict fix attempt

---
 src/services/galaxy/ConnectionService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/services/galaxy/ConnectionService.java b/src/services/galaxy/ConnectionService.java
index 31aa48b1a..34e75e9c0 100644
--- a/src/services/galaxy/ConnectionService.java
+++ b/src/services/galaxy/ConnectionService.java
@@ -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);