projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-07-14 00:03:01 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development' into quality_assurance

Browse Source 
Conflicts:
	src/resources/collections/SWGList.java
This commit is contained in:
Obique PSWG
2015-06-10 21:02:12 -05:00
parent 813125208f eba3e24db6
commit 28da27d645
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ObjectManager.java
+3 -1
View File
@@ -336,8 +336,10 @@ public class ObjectManager extends Manager {
private void zoneInCharacter(PlayerManager playerManager, String galaxy, long netId, long characterId) {
Player player = playerManager.getPlayerFromNetworkId(netId);
if (player == null)
if (player == null) {
Log.e("ObjectManager", "Unable to zone in null player '%ld'", netId);
return;
}
SWGObject creatureObj = objects.get(characterId);
if (creatureObj == null) {
System.err.println("ObjectManager: Failed to start zone - CreatureObject could not be fetched from database [Character: " + characterId + " User: " + player.getUsername() + "]");