Merge branch 'master' into sit2

src/resources/commands/callbacks/SocialInternalCmdCallback.java

@@ -26,8 +26,7 @@ public class SocialInternalCmdCallback implements ICmdCallback {
 		for (Player observer : observers) {
 			if (observer.getCreatureObject() == null)
 				continue;
-			
-			observer.sendPacket(emote);
+			observer.sendPacket(new PlayerEmote(observer.getCreatureObject().getObjectId(), emote));
 		}
 	}
 }

src/services/CoreManager.java

@@ -155,13 +155,23 @@ public class CoreManager extends Manager {
 	
 	private void outputSWG(SWGPacket p) {
 		if (p instanceof Baseline)
-			packetOutput.println("Baseline " + ((Baseline)p).getType() + " " + ((Baseline)p).getNum());
+			outputBaseline((Baseline) p);
 		else if (p instanceof ObjectController)
-			packetOutput.println("ObjectController 0x" + Integer.toHexString(((ObjectController)p).getControllerCrc()));
+			outputObjectController((ObjectController) p);
 		else
 			packetOutput.println(p.getClass().getSimpleName());
 	}
 	
+	private void outputBaseline(Baseline b) {
+		packetOutput.println("Baseline [" + b.getId() + "] " + b.getType() + " " + b.getNum());
+	}
+	
+	private void outputObjectController(ObjectController cont) {
+		int crc = cont.getControllerCrc();
+		long id = cont.getObjectId();
+		packetOutput.println("ObjectController [" + id + "] 0x" + Integer.toHexString(crc));
+	}
+	
 	/**
 	 * Returns the time in milliseconds since the server started initialization
 	 * @return the core time represented as a double

src/services/chat/ChatService.java

@@ -180,8 +180,7 @@ public class ChatService extends Service {
 		for (Player observer : actor.getObservers()) {
 			if (observer.getCreatureObject() == null)
 				continue;
-			message.setObjectId(observer.getCreatureObject().getObjectId());
-			observer.sendPacket(message);
+			observer.sendPacket(new SpatialChat(observer.getCreatureObject().getObjectId(), message));
 		}
 	}