FatBoy
/
lakebane
forked from MagicBane/Server
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Bonus code deleted from stuck job.

master
MagicBot 2023-05-13 12:59:05 -04:00
parent d9c05fa622
commit 6a41c5391d
1 changed files with 37 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/engine/jobs/StuckJob.java
View File

@ -33,7 +33,7 @@ public class StuckJob extends AbstractScheduleJob {
protected void doJob() { protected void doJob() {
Vector3fImmutable stuckLoc; Vector3fImmutable stuckLoc;
Building stuckBuilding = null; Building building = null;
if (player == null) if (player == null)
return; return;
@ -45,75 +45,37 @@ public class StuckJob extends AbstractScheduleJob {
for (AbstractWorldObject awo : awoList) { for (AbstractWorldObject awo : awoList) {
Building toStuckOutOf = (Building)awo; Building buildingEntry = (Building) awo;
if (toStuckOutOf.getStuckLocation() == null) if (buildingEntry.getStuckLocation() == null)
continue; continue;
if (Bounds.collide(player.getLoc(), toStuckOutOf)){ if (Bounds.collide(player.getLoc(), buildingEntry)) {
stuckBuilding = toStuckOutOf; building = buildingEntry;
break; break;
} }
} }
//Could not find closest building get stuck location of nearest building. if (building == null) {
if (stuckBuilding == null){
ErrorPopupMsg.sendErrorMsg(player, "Unable to find desired location"); ErrorPopupMsg.sendErrorMsg(player, "Unable to find desired location");
return; return;
} else }
stuckLoc = stuckBuilding.getStuckLocation();
stuckLoc = building.getStuckLocation();
if (stuckLoc == null) { if (stuckLoc == null) {
ErrorPopupMsg.sendErrorMsg(player, "Unable to find desired location"); ErrorPopupMsg.sendErrorMsg(player, "Unable to find desired location");
return; return;
} }
player.teleport(building.getLoc().add(stuckLoc));
player.teleport(stuckLoc);
// Needs to be re-written with stuck locations
// Disabled for now.
/*
// Cannot have a null zone or player
if (this.player == null)
return;
if (ZoneManager.findSmallestZone(player.getLoc()) == null)
return;
// If player is on a citygrid make sure the stuck direction
// is facing away from the tree
if ((ZoneManager.findSmallestZone(player.getLoc()).isNPCCity()) ||
(ZoneManager.findSmallestZone(player.getLoc()).isPlayerCity())) {
zoneVector = player.getLoc().subtract(ZoneManager.findSmallestZone(player.getLoc()).getLoc());
zoneVector = zoneVector.normalize();
if (zoneVector.dot(player.getFaceDir()) > 0)
return;
}
player.teleport(player.getLoc().add(player.getFaceDir().mult(34)));
*/
} }
@Override @Override
protected void _cancelJob() { protected void _cancelJob() {
} }
private void sendTrackArrow(float rotation) {
}
} }