Methods moved out of message pump
This commit is contained in:
@@ -14,12 +14,16 @@ import engine.Enum.ModType;
|
||||
import engine.Enum.SourceType;
|
||||
import engine.InterestManagement.InterestManager;
|
||||
import engine.exception.MsgSendException;
|
||||
import engine.job.JobContainer;
|
||||
import engine.job.JobScheduler;
|
||||
import engine.jobs.StuckJob;
|
||||
import engine.math.Bounds;
|
||||
import engine.math.Vector3f;
|
||||
import engine.math.Vector3fImmutable;
|
||||
import engine.net.DispatchMessage;
|
||||
import engine.net.client.ClientConnection;
|
||||
import engine.net.client.msg.MoveToPointMsg;
|
||||
import engine.net.client.msg.PromptRecallMsg;
|
||||
import engine.net.client.msg.TeleportToPointMsg;
|
||||
import engine.net.client.msg.UpdateStateMsg;
|
||||
import engine.objects.*;
|
||||
@@ -27,6 +31,7 @@ import engine.server.MBServerStatics;
|
||||
import org.pmw.tinylog.Logger;
|
||||
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
import static engine.math.FastMath.sqr;
|
||||
|
||||
@@ -483,4 +488,77 @@ public enum MovementManager {
|
||||
private static void syncLoc(AbstractCharacter ac, Vector3fImmutable clientLoc, boolean useClientLoc) {
|
||||
ac.teleport(ac.getLoc());
|
||||
}
|
||||
|
||||
public static void HandlePromptRecall(PromptRecallMsg msg, ClientConnection origin) throws MsgSendException {
|
||||
|
||||
PlayerCharacter player = SessionManager.getPlayerCharacter(origin);
|
||||
boolean recallAccepted;
|
||||
|
||||
if (player == null)
|
||||
return;
|
||||
|
||||
boolean confirmed = msg.getConfirmed();
|
||||
|
||||
if (confirmed == true) {
|
||||
long timeElapsed = System.currentTimeMillis() - player.getTimeStamp("PromptRecall");
|
||||
//send fail message
|
||||
recallAccepted = timeElapsed < 15000;
|
||||
} else
|
||||
recallAccepted = false;
|
||||
|
||||
if (recallAccepted == true) {
|
||||
//handle recall
|
||||
long type = player.getTimeStamp("LastRecallType");
|
||||
|
||||
if (type == 1) { //recall to bind
|
||||
player.teleport(player.getBindLoc());
|
||||
player.setSafeMode();
|
||||
} else { //recall to rg
|
||||
float dist = 9999999999f;
|
||||
Building rg = null;
|
||||
Vector3fImmutable rgLoc;
|
||||
|
||||
for (Runegate runegate : Runegate._runegates.values()) {
|
||||
|
||||
rgLoc = runegate.gateBuilding.getLoc();
|
||||
|
||||
float distanceSquaredToRunegate = player.getLoc().distanceSquared2D(rgLoc);
|
||||
|
||||
if (distanceSquaredToRunegate < sqr(dist))
|
||||
rg = runegate.gateBuilding;
|
||||
|
||||
}
|
||||
|
||||
//nearest runegate found. teleport characterTarget
|
||||
|
||||
if (rg != null) {
|
||||
player.teleport(rg.getLoc());
|
||||
player.setSafeMode();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static void stuck(ClientConnection origin) {
|
||||
|
||||
PlayerCharacter sourcePlayer = origin.getPlayerCharacter();
|
||||
|
||||
if (sourcePlayer == null)
|
||||
return;
|
||||
|
||||
if (sourcePlayer.getTimers().containsKey("Stuck"))
|
||||
return;
|
||||
|
||||
StuckJob sj = new StuckJob(sourcePlayer);
|
||||
JobContainer jc = JobScheduler.getInstance().scheduleJob(sj, 10000); // Convert
|
||||
ConcurrentHashMap<String, JobContainer> timers = sourcePlayer.getTimers();
|
||||
|
||||
if (timers != null) {
|
||||
if (timers.containsKey("Stuck")) {
|
||||
timers.get("Stuck").cancelJob();
|
||||
timers.remove("Stuck");
|
||||
}
|
||||
timers.put("Stuck", jc);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user