Merged in M4SS/holocore/CORE-273-theed-starport-bug (pull request #135)

CORE-273 Theed Starport bug
This commit is contained in:
Obique PSWG
2016-01-30 13:54:49 -06:00
2 changed files with 3 additions and 2 deletions
+2 -1
View File
@@ -60,7 +60,8 @@ public class TravelGroup implements Runnable {
this.landTime = landTime + 10000;
this.groundTime = groundTime;
this.airTime = airTime;
this.starport = template.endsWith("shared_player_transport.iff");
String [] folders = template.split("/");
this.starport = folders[folders.length - 1].startsWith("shared_player_transport");
this.status = ShuttleStatus.GROUNDED;
}
@@ -238,7 +238,7 @@ public class TravelService extends Service {
double z = set.getDouble("z");
String type = set.getString("type");
TravelPoint point = new TravelPoint(pointName, new Location(x, y, z, travelPlanet), type.equals("starport"), true);
TravelPoint point = new TravelPoint(pointName, new Location(x, y, z, travelPlanet), type.endsWith("starport"), true);
switch (type) {
case "shuttleport":
travel.get("object/creature/npc/theme_park/shared_player_shuttle.iff").addTravelPoint(point);