|
|
@ -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()) { |
|
|
|