projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-10 00:13:42 -04:00
Code Issues Projects Releases Wiki Activity

Added CreatureObject.isStatesBitmask() and a test case for testing vehicle mounts

Browse Source
This commit is contained in:
Obique PSWG
2017-06-20 07:08:39 -05:00
parent 42a4660dfb
commit b33dda9598
4 changed files with 64 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ObjectAwareness.java
+3
View File
@@ -64,6 +64,7 @@ import resources.objects.awareness.AwarenessHandler;
import resources.objects.awareness.DataTransformHandler;
import resources.objects.awareness.TerrainMap.TerrainMapCallback;
import resources.objects.creature.CreatureObject;
import resources.objects.creature.CreatureState;
import resources.player.Player;
import resources.player.PlayerEvent;
import resources.player.PlayerState;
@@ -304,6 +305,8 @@ public class ObjectAwareness extends Service implements TerrainMapCallback {
}
private void moveObjectWithTransform(SWGObject obj, SWGObject parent, Location requestedLocation, double speed, int update) {
if (obj instanceof CreatureObject && ((CreatureObject) obj).isStatesBitmask(CreatureState.RIDING_MOUNT))
parent = obj.getParent();
moveObject(obj, parent, requestedLocation);
if (parent == null)
dataTransformHandler.handleMove(obj, speed, update);