forked from MagicBane/Server
inline method
This commit is contained in:
@@ -8,14 +8,10 @@
|
|||||||
|
|
||||||
package engine.InterestManagement;
|
package engine.InterestManagement;
|
||||||
|
|
||||||
import com.sun.corba.se.spi.orbutil.fsm.ActionBase;
|
|
||||||
import com.sun.corba.se.spi.orbutil.fsm.FSM;
|
|
||||||
import com.sun.corba.se.spi.orbutil.fsm.Input;
|
|
||||||
import engine.Enum;
|
import engine.Enum;
|
||||||
import engine.Enum.DispatchChannel;
|
import engine.Enum.DispatchChannel;
|
||||||
import engine.Enum.GameObjectType;
|
import engine.Enum.GameObjectType;
|
||||||
import engine.gameManager.GroupManager;
|
import engine.gameManager.GroupManager;
|
||||||
import engine.gameManager.PowersManager;
|
|
||||||
import engine.gameManager.SessionManager;
|
import engine.gameManager.SessionManager;
|
||||||
import engine.job.JobScheduler;
|
import engine.job.JobScheduler;
|
||||||
import engine.jobs.RefreshGroupJob;
|
import engine.jobs.RefreshGroupJob;
|
||||||
@@ -28,13 +24,11 @@ import engine.net.client.msg.LoadStructureMsg;
|
|||||||
import engine.net.client.msg.MoveToPointMsg;
|
import engine.net.client.msg.MoveToPointMsg;
|
||||||
import engine.net.client.msg.UnloadObjectsMsg;
|
import engine.net.client.msg.UnloadObjectsMsg;
|
||||||
import engine.objects.*;
|
import engine.objects.*;
|
||||||
import engine.powers.ActionsBase;
|
|
||||||
import engine.server.MBServerStatics;
|
import engine.server.MBServerStatics;
|
||||||
import org.pmw.tinylog.Logger;
|
import org.pmw.tinylog.Logger;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
import static engine.math.FastMath.sqr;
|
import static engine.math.FastMath.sqr;
|
||||||
|
|
||||||
@@ -216,7 +210,7 @@ public enum InterestManager implements Runnable {
|
|||||||
if (origin == null)
|
if (origin == null)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (!playerCharacter.isEnteredWorld())
|
if (!playerCharacter.enteredWorld)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (playerCharacter.getTeleportLock().readLock().tryLock()) {
|
if (playerCharacter.getTeleportLock().readLock().tryLock()) {
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ public class ArcLoginNotifyMsgHandler extends AbstractClientMsgHandler {
|
|||||||
GroupManager.RefreshOthersGroupList(player);
|
GroupManager.RefreshOthersGroupList(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
player.setEnteredWorld(true);
|
player.enteredWorld = true;
|
||||||
// Set player active
|
// Set player active
|
||||||
player.resetRegenUpdateTime();
|
player.resetRegenUpdateTime();
|
||||||
player.setActive(true);
|
player.setActive(true);
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ public class RequestEnterWorldHandler extends AbstractClientMsgHandler {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
player.setEnteredWorld(false);
|
player.enteredWorld = false;
|
||||||
|
|
||||||
Account acc = SessionManager.getAccount(origin);
|
Account acc = SessionManager.getAccount(origin);
|
||||||
|
|
||||||
|
|||||||
@@ -160,7 +160,7 @@ public class PlayerCharacter extends AbstractCharacter {
|
|||||||
private boolean asciiLastName = true;
|
private boolean asciiLastName = true;
|
||||||
private int spamCount = 0;
|
private int spamCount = 0;
|
||||||
private boolean initialized = false;
|
private boolean initialized = false;
|
||||||
private boolean enteredWorld = false;
|
public boolean enteredWorld = false;
|
||||||
private boolean canBreathe = true;
|
private boolean canBreathe = true;
|
||||||
private String hash;
|
private String hash;
|
||||||
private ArrayList<GuildHistory> guildHistory = new ArrayList<>();
|
private ArrayList<GuildHistory> guildHistory = new ArrayList<>();
|
||||||
@@ -4852,7 +4852,7 @@ public class PlayerCharacter extends AbstractCharacter {
|
|||||||
//if(this.isBoxed && this.containsEffect(429611355) == false) {//pathfinding
|
//if(this.isBoxed && this.containsEffect(429611355) == false) {//pathfinding
|
||||||
// PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, 429611355, 40, false);
|
// PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, 429611355, 40, false);
|
||||||
//}
|
//}
|
||||||
if(this.isEnteredWorld() && this.isActive() && this.isAlive()){
|
if(enteredWorld && this.isActive() && this.isAlive()){
|
||||||
if( this.getLevel() < 10) {
|
if( this.getLevel() < 10) {
|
||||||
this.setLevel((short) 10);
|
this.setLevel((short) 10);
|
||||||
boolean hasConc = false;
|
boolean hasConc = false;
|
||||||
@@ -5554,14 +5554,6 @@ public class PlayerCharacter extends AbstractCharacter {
|
|||||||
this.centerHeight = centerHeight;
|
this.centerHeight = centerHeight;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isEnteredWorld() {
|
|
||||||
return enteredWorld;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setEnteredWorld(boolean enteredWorld) {
|
|
||||||
this.enteredWorld = enteredWorld;
|
|
||||||
}
|
|
||||||
|
|
||||||
public long getChannelMute() {
|
public long getChannelMute() {
|
||||||
return channelMute;
|
return channelMute;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ import engine.gameManager.*;
|
|||||||
import engine.job.JobContainer;
|
import engine.job.JobContainer;
|
||||||
import engine.job.JobScheduler;
|
import engine.job.JobScheduler;
|
||||||
import engine.jobs.LogoutCharacterJob;
|
import engine.jobs.LogoutCharacterJob;
|
||||||
import engine.math.Vector3fImmutable;
|
|
||||||
import engine.mobileAI.Threads.MobAIThread;
|
import engine.mobileAI.Threads.MobAIThread;
|
||||||
import engine.mobileAI.Threads.MobRespawnThread;
|
import engine.mobileAI.Threads.MobRespawnThread;
|
||||||
import engine.net.Dispatch;
|
import engine.net.Dispatch;
|
||||||
@@ -834,9 +833,9 @@ public class WorldServer {
|
|||||||
loadedMob.playerAgroMap.remove(player.getObjectUUID());
|
loadedMob.playerAgroMap.remove(player.getObjectUUID());
|
||||||
}
|
}
|
||||||
player.getTimestamps().put("logout", System.currentTimeMillis());
|
player.getTimestamps().put("logout", System.currentTimeMillis());
|
||||||
player.setEnteredWorld(false);
|
player.enteredWorld = false;
|
||||||
|
|
||||||
// remove from simulation and zero current loc
|
// remove from simulation and zero current loc
|
||||||
|
|
||||||
WorldGrid.RemoveWorldObject(player);
|
WorldGrid.RemoveWorldObject(player);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user