MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Bonus code deleted from stuck job.

Browse Source
This commit is contained in:
MagicBot
2023-05-13 12:59:05 -04:00
parent d9c05fa622
commit 6a41c5391d
1 changed files with 37 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/jobs/StuckJob.java
+37 -75
View File
@@ -6,7 +6,7 @@
// Magicbane Emulator Project © 2013 - 2022 // Magicbane Emulator Project © 2013 - 2022
// www.magicbane.com // www.magicbane.com
package engine.jobs; package engine.jobs;
import engine.InterestManagement.WorldGrid; import engine.InterestManagement.WorldGrid;
import engine.job.AbstractScheduleJob; import engine.job.AbstractScheduleJob;
@@ -22,98 +22,60 @@ import java.util.HashSet;
public class StuckJob extends AbstractScheduleJob { public class StuckJob extends AbstractScheduleJob {
private final PlayerCharacter player; private final PlayerCharacter player;
public StuckJob(PlayerCharacter player) { public StuckJob(PlayerCharacter player) {
super(); super();
this.player = player; this.player = player;
} }
@Override
protected void doJob() {
@Override
protected void doJob() {
Vector3fImmutable stuckLoc; Vector3fImmutable stuckLoc;
Building stuckBuilding = null; Building building = null;
if (player == null) if (player == null)
return; return;
if (player.getClientConnection() == null) if (player.getClientConnection() == null)
return; return;
HashSet<AbstractWorldObject>awoList = WorldGrid.getObjectsInRangePartial(player, 150, MBServerStatics.MASK_BUILDING);
for (AbstractWorldObject awo:awoList){
Building toStuckOutOf = (Building)awo; HashSet<AbstractWorldObject> awoList = WorldGrid.getObjectsInRangePartial(player, 150, MBServerStatics.MASK_BUILDING);
if (toStuckOutOf.getStuckLocation() == null) for (AbstractWorldObject awo : awoList) {
continue;
if (Bounds.collide(player.getLoc(), toStuckOutOf)){ Building buildingEntry = (Building) awo;
stuckBuilding = toStuckOutOf;
break; if (buildingEntry.getStuckLocation() == null)
continue;
}
if (Bounds.collide(player.getLoc(), buildingEntry)) {
building = buildingEntry;
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;
}
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; 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 player.teleport(building.getLoc().add(stuckLoc));
protected void _cancelJob() {
}
private void sendTrackArrow(float rotation) { }
}
@Override
protected void _cancelJob() {
}
} }