swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-09-11 22:45:06 -04:00
Code Issues Projects Releases Wiki Activity

Prevented null pointer from happening when a vendor attempts to path away from its target.

Browse Source
This commit is contained in:
Cekis
2018-03-23 16:02:42 -07:00
committed by CekisSWG
parent 0a1663e469
commit 7ddcaf19da
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/script/library/ai_lib.java
+17 -18
View File
@@ -916,26 +916,25 @@ public class ai_lib extends script.base_script
return;
}
}
location myLoc = new location(getLocation(npc));
location targetLoc = new location(getLocation(target));
if (myLoc.x < targetLoc.x)
{
myLoc.x -= rand(20f, 40f);
location myLoc = getLocation(npc);
location targetLoc = getLocation(target);
if(isValidLocation(myLoc) && isValidLocation(targetLoc)) {
if (myLoc.x < targetLoc.x) {
myLoc.x -= rand(20f, 40f);
} else {
myLoc.x += rand(20f, 40f);
}
if (myLoc.z < targetLoc.z) {
myLoc.z -= rand(20f, 40f);
} else {
myLoc.z += rand(20f, 40f);
}
setObjVar(npc, "ai.pathingAwayFrom", target);
pathTo(npc, myLoc);
}
else
{
myLoc.x += rand(20f, 40f);
else{
LOG("debug_ai","Unable to get a valid location for myLoc (" + myLoc + ") or targetLoc (" + targetLoc + ") to make vendor path away.");
}
if (myLoc.z < targetLoc.z)
{
myLoc.z -= rand(20f, 40f);
}
else
{
myLoc.z += rand(20f, 40f);
}
setObjVar(npc, "ai.pathingAwayFrom", target);
pathTo(npc, myLoc);
messageTo(npc, "handleClearPathingFlag", null, 30f, isObjectPersisted(npc));
}
public static void setLoiterRanges(obj_id npc, float minRange, float maxRange) throws InterruptedException