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 conflict fix, take 2

Browse Source
This commit is contained in:
Ziggy
2015-05-09 02:31:06 +02:00
parent a34b8f5398
commit c4a344ba1c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ObjectManager.java
+1 -1
View File
@@ -354,9 +354,9 @@ public class ObjectManager extends Manager {
return;
player.setPlayerState(PlayerState.ZONING_IN);
verifyPlayerObjectsSet(player, characterId);
player.getPlayerObject().setStartPlayTime((int) System.currentTimeMillis());
CreatureObject creature = player.getCreatureObject();
creature.setMoodId(CreatureMood.NONE.getMood());
player.getPlayerObject().setStartPlayTime((int) System.currentTimeMillis());
long objId = creature.getObjectId();
Race race = creature.getRace();
Location l = creature.getLocation();