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 conflict fix?

Browse Source
This commit is contained in:
Ziggy
2015-05-09 02:16:18 +02:00
parent 141e3f763f
commit d95b06ddea
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ObjectManager.java
+2
View File
@@ -65,6 +65,7 @@ import resources.objects.quadtree.QuadTree;
import resources.objects.waypoint.WaypointObject;
import resources.player.Player;
import resources.player.PlayerEvent;
import resources.player.PlayerFlags;
import resources.player.PlayerState;
import resources.server_info.CachedObjectDatabase;
import resources.server_info.ObjectDatabase;
@@ -356,6 +357,7 @@ public class ObjectManager extends Manager {
verifyPlayerObjectsSet(player, characterId);
CreatureObject creature = player.getCreatureObject();
creature.setMoodId(CreatureMood.NONE.getMood());
player.getPlayerObject().clearFlagBitmask(PlayerFlags.LD); // Ziggy: Clear the LD flag in case it wasn't already.
player.getPlayerObject().setStartPlayTime((int) System.currentTimeMillis());
long objId = creature.getObjectId();
Race race = creature.getRace();