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

Moved many things into the engine and removed the casting from getCreatureObject

Browse Source
This commit is contained in:
Obique
2015-02-22 11:41:54 -06:00
committed by Obique
parent 186cb9affd
commit e754f286a8
16 changed files with 20 additions and 1920 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ObjectManager.java
+9 -5
View File
@@ -294,11 +294,11 @@ public class ObjectManager extends Manager {
return;
player.setPlayerState(PlayerState.ZONING_IN);
verifyPlayerObjectsSet(player, characterId);
long objId = player.getCreatureObject().getObjectId();
Race race = ((CreatureObject) player.getCreatureObject()).getRace();
Location l = player.getCreatureObject().getLocation();
CreatureObject creature = player.getCreatureObject();
long objId = creature.getObjectId();
Race race = creature.getRace();
Location l = creature.getLocation();
long time = (long)(ProjectSWG.getCoreTime()/1E3);
CreatureObject creature = (CreatureObject) player.getCreatureObject();
sendPacket(player, new HeartBeatMessage());
sendPacket(player, new ChatServerStatus(true));
sendPacket(player, new VoiceChatStatus());
@@ -321,7 +321,11 @@ public class ObjectManager extends Manager {
System.err.println("ObjectManager: Failed to start zone - CreatureObject could not be fetched from database [Character: " + characterId + " User: " + player.getUsername() + "]");
return;
}
player.setCreatureObject(creature);
if (!(creature instanceof CreatureObject)) {
System.err.println("ObjectManager: Failed to start zone - Object is not a CreatureObject for ID " + characterId);
return;
}
player.setCreatureObject((CreatureObject) creature);
creature.setOwner(player);
if (player.getPlayerObject() == null) {