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

Merge branch 'master' of http://37.59.100.124:7990/scm/nge/core3

Browse Source 
Conflicts:
	src/services/objects/ObjectManager.java
This commit is contained in:
Waverunner
2015-01-22 21:42:10 -05:00
parent a1125af5f4 f40a690a80
commit 273562a704
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ObjectManager.java
+3 -2
View File
@@ -302,6 +302,7 @@ public class ObjectManager extends Manager {
creature.clearAware();
updateAwarenessForObject(creature);
player.setPlayerState(PlayerState.ZONED_IN);
System.out.println("[" + player.getUsername() + "] " + player.getCharacterName() + " is zoning in");
new PlayerEventIntent(player, galaxy, PlayerEvent.PE_ZONE_IN).broadcast();
}
@@ -310,8 +311,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);