swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-07-31 00:15:54 -04:00
Code Issues Projects Releases Wiki Activity

Defaulted zone transitioning player to Tatooine if the zone they are transitioning to cannot be found.

Browse Source
This commit is contained in:
Cekis
2017-02-04 17:07:18 +00:00
parent d5da6a35e7
commit 4c9b88fc23
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/script/systems/movement/zone_transition.java
Regular → Executable
+22 -11
View File
@@ -195,17 +195,28 @@ public class zone_transition extends script.base_script
location parent = params.getLocation("location");
obj_id player = params.getObjId("player");
String[] parsed_list = utils.getStringArrayScriptVar(player, "zoneTransition");
String world = parsed_list[2];
float locX = utils.stringToFloat(parsed_list[4]);
float locY = utils.stringToFloat(parsed_list[5]);
float locZ = utils.stringToFloat(parsed_list[6]);
locX += parent.x;
locY += parent.y;
locZ += parent.z;
callable.storeCallables(player);
utils.dismountRiderJetpackCheck(player);
warpPlayer(player, world, locX, locY, locZ, null, locX, locY, locZ);
return SCRIPT_CONTINUE;
try {
String world = parsed_list[2];
float locX = utils.stringToFloat(parsed_list[4]);
float locY = utils.stringToFloat(parsed_list[5]);
float locZ = utils.stringToFloat(parsed_list[6]);
locX += parent.x;
locY += parent.y;
locZ += parent.z;
callable.storeCallables(player);
utils.dismountRiderJetpackCheck(player);
warpPlayer(player, world, locX, locY, locZ, null, locX, locY, locZ);
}
catch(Exception e){
String scene = "";
if(parent != null) scene = parent.area;
// if zone transition cannot be found or is invalid.
LOG("zone_transition", "ERROR: Unable to get zoneTransition script var (" + (parsed_list != null ? parsed_list.toString() : "") + ") off player (" + player + ":" + getName(player) + ") located at (" + scene + ":" + parent + ").");
Thread.dumpStack();
}
finally{
return SCRIPT_CONTINUE;
}
}
public void doLogging(String section, String message) throws InterruptedException
{