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

Adjusting orphaned algorithm per #161

Browse Source
This commit is contained in:
Cekis
2020-11-15 14:49:46 -05:00
parent 5255139cc5
commit 5095837541
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sku.0/sys.server/compiled/game/script/npe/npe_instance_travel_player.java
View File

@@ -5,6 +5,8 @@ import script.library.npe;
import script.library.space_dungeon;
import script.obj_id;
import java.util.Arrays;
public class npe_instance_travel_player extends script.base_script
{
public npe_instance_travel_player()

10
sku.0/sys.server/compiled/game/script/player/base/base_player.java
View File

@@ -1520,13 +1520,9 @@ public class base_player extends script.base_script
attachScript(self, group.SCRIPT_GROUP_MEMBER);
}
utils.removeScriptVar(self, COUPE_DE_GRACE_TARGET);
if (!isInTutorialArea(self))
{
if(hasObjVar(self, "npe.phase_number")) {
String bt = getTemplateName(getTopMostContainer(self));
if(!isGod(self) && getIntObjVar(self, "npe.phase_number") == 3 && !bt.contains("npe_space_dungeon")) {
getClusterWideData("npe_public_instances", "npe_space_station*", false, self);
}
if(!isInTutorialArea(self)) {
if(!isGod(self) && hasObjVar(self, "npe") && isInWorldCell(self)) {
getClusterWideData("npe_public_instances", "npe_space_station*", false, self);
} else {
space_dungeon.verifyPlayerSession(self);
space_dungeon.validateInstanceControllerId(self);