From f40a690a80047356def2cdeff7e5ffc7b670710f Mon Sep 17 00:00:00 2001
From: Obique <obique.pswg@gmail.com>
Date: Thu, 22 Jan 2015 19:41:16 -0600
Subject: [PATCH] Modified outputs of services to conform to general output
 standard

---
 src/services/objects/ObjectManager.java | 5 +++--
 src/services/player/LoginService.java   | 2 +-
 src/services/player/ZoneService.java    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/services/objects/ObjectManager.java b/src/services/objects/ObjectManager.java
index 353ab2bc..cf0199e2 100644
--- a/src/services/objects/ObjectManager.java
+++ b/src/services/objects/ObjectManager.java
@@ -300,6 +300,7 @@ public class ObjectManager extends Manager {
 		creature.createObject(player);
 		creature.clearAware();
 		updateAwarenessForObject(creature);
+		System.out.println("[" + player.getUsername() + "] " + player.getCharacterName() + " is zoning in");
 		new PlayerEventIntent(player, galaxy, PlayerEvent.PE_ZONE_IN).broadcast();
 	}
 	
@@ -308,8 +309,8 @@ public class ObjectManager extends Manager {
 			return;
 		SWGObject creature = objects.get(characterId);
 		if (creature == null) {
-			System.err.println("ObjectManager: Failed to start zone - CreatureObject could not be fetched from database");
-			throw new NullPointerException("CreatureObject for ID: " + characterId + " cannot be null!");
+			System.err.println("ObjectManager: Failed to start zone - CreatureObject could not be fetched from database [Character: " + characterId + "  User: " + player.getUsername() + "]");
+			return;
 		}
 		player.setCreatureObject(creature);
 		creature.setOwner(player);
diff --git a/src/services/player/LoginService.java b/src/services/player/LoginService.java
index f5e433e9..d69c2a87 100644
--- a/src/services/player/LoginService.java
+++ b/src/services/player/LoginService.java
@@ -132,7 +132,7 @@ public class LoginService extends Service {
 					default: player.setAccessLevel(AccessLevel.PLAYER); break;
 				}
 				sendLoginSuccessPacket(player);
-				System.out.println("LoginService: " + player.getUsername() + " has logged in. IP: " + id.getAddress() + ":" + id.getPort());
+				System.out.println("[" + player.getUsername() + "] Connected to the login server. IP: " + id.getAddress() + ":" + id.getPort());
 				new LoginEventIntent(player.getNetworkId(), LoginEvent.LOGIN_SUCCESS).broadcast();
 			} else { // User does not exist!
 				String type = "Login Failed!";
diff --git a/src/services/player/ZoneService.java b/src/services/player/ZoneService.java
index 51f30afe..a00a0b8a 100644
--- a/src/services/player/ZoneService.java
+++ b/src/services/player/ZoneService.java
@@ -100,7 +100,7 @@ public class ZoneService extends Service {
 	}
 	
 	private void handleClientIdMsg(Player player, ClientIdMsg clientId) {
-		System.out.println(player.getUsername() + " has connected to the zone server.");
+		System.out.println("[" + player.getUsername() + "] Connected to the zone server. IP: " + clientId.getAddress() + ":" + clientId.getPort());
 		sendPacket(player.getNetworkId(), new HeartBeatMessage());
 		sendPacket(player.getNetworkId(), new AccountFeatureBits());
 		sendPacket(player.getNetworkId(), new ClientPermissionsMessage());