projectswg-bitbucket/cucore
1
0
Fork 0
mirror of https://bitbucket.org/projectswg/cucore.git synced 2026-07-13 20:00:58 -04:00
Code Issues Projects Releases Wiki Activity

Fixed CORE-150 'Waypoints now get created correctly on your position while being in a building'

Browse Source
This commit is contained in:
Waverunner
2015-08-17 18:11:14 -04:00
parent 620662fd33
commit ced95587d5
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/SWGObject.java
+10 -1
View File
@@ -46,6 +46,7 @@ import resources.containers.DefaultPermissions;
import resources.encodables.StringId;
import resources.network.BaselineBuilder;
import resources.network.DeltaBuilder;
import resources.objects.building.BuildingObject;
import resources.objects.creature.CreatureObject;
import resources.player.Player;
import resources.player.PlayerState;
@@ -875,7 +876,15 @@ public abstract class SWGObject implements Serializable, Comparable<SWGObject> {
}
}
}
public boolean isInBuilding() {
SWGObject parent = getParent();
if (parent == null)
return false;
parent = parent.getParent();
return parent != null && parent instanceof BuildingObject;
}
@Override
public String toString() {
return "SWGObject[ID=" + objectId + " NAME=" + objectName + " TEMPLATE=" + template + "]";