From abbcafa9efbc95f80c697f1651f7c9076debef7a Mon Sep 17 00:00:00 2001 From: Obique PSWG Date: Sun, 8 Jan 2017 12:41:14 -0600 Subject: [PATCH] Added Player to GalacticPacketIntent to simplify packet logic across Holocore --- src/intents/network/GalacticPacketIntent.java | 35 ++++++++----------- .../callbacks/TransferItemCallback.java | 1 - src/services/chat/ChatMailService.java | 7 ++-- src/services/chat/ChatManager.java | 5 +-- src/services/chat/ChatRoomService.java | 6 +--- src/services/combat/CombatManager.java | 1 + src/services/combat/CorpseService.java | 1 - src/services/commands/BuffService.java | 2 -- src/services/commands/CommandService.java | 10 ++---- src/services/experience/ExpertiseService.java | 7 +--- src/services/experience/SkillManager.java | 2 +- src/services/galaxy/ConnectionService.java | 3 +- src/services/galaxy/GalacticManager.java | 27 +++++++------- src/services/galaxy/travel/TravelService.java | 2 +- src/services/map/CityService.java | 7 +--- src/services/map/MapManager.java | 5 +-- src/services/objects/ObjectAwareness.java | 2 +- src/services/objects/ObjectManager.java | 12 ++----- src/services/objects/RadialService.java | 5 ++- .../player/CharacterCreationService.java | 2 +- src/services/player/LoginService.java | 10 ++---- src/services/player/ZoneManager.java | 6 ++-- src/services/spawn/SpawnerService.java | 1 - src/services/sui/SuiService.java | 5 +-- 24 files changed, 55 insertions(+), 109 deletions(-) diff --git a/src/intents/network/GalacticPacketIntent.java b/src/intents/network/GalacticPacketIntent.java index 87f4efcd3..17bb14bd6 100644 --- a/src/intents/network/GalacticPacketIntent.java +++ b/src/intents/network/GalacticPacketIntent.java @@ -27,6 +27,7 @@ ***********************************************************************************/ package intents.network; +import resources.player.Player; import intents.GalacticIntent; import network.packets.Packet; @@ -35,34 +36,28 @@ public class GalacticPacketIntent extends GalacticIntent { public static final String TYPE = "GalacticPacketIntent"; private Packet packet; - private long networkId; + private Player player; - public GalacticPacketIntent(InboundPacketIntent i) { + public GalacticPacketIntent(Packet packet, Player player) { super(TYPE); - setPacket(i.getPacket()); - setNetworkId(i.getNetworkId()); - } - - public GalacticPacketIntent(Packet p, long networkId) { - super(TYPE); - setPacket(p); - setNetworkId(networkId); - } - - public void setPacket(Packet p) { - this.packet = p; - } - - public void setNetworkId(long networkId) { - this.networkId = networkId; + setPacket(packet); + setPlayer(player); } public Packet getPacket() { return packet; } - public long getNetworkId() { - return networkId; + public Player getPlayer() { + return player; + } + + public void setPacket(Packet packet) { + this.packet = packet; + } + + public void setPlayer(Player player) { + this.player = player; } } diff --git a/src/resources/commands/callbacks/TransferItemCallback.java b/src/resources/commands/callbacks/TransferItemCallback.java index 071ace392..e0243af2e 100644 --- a/src/resources/commands/callbacks/TransferItemCallback.java +++ b/src/resources/commands/callbacks/TransferItemCallback.java @@ -29,7 +29,6 @@ package resources.commands.callbacks; import intents.chat.ChatBroadcastIntent; -import resources.Race; import resources.commands.ICmdCallback; import resources.control.Assert; import resources.objects.GameObjectType; diff --git a/src/services/chat/ChatMailService.java b/src/services/chat/ChatMailService.java index e88c28c9c..25ed9006d 100644 --- a/src/services/chat/ChatMailService.java +++ b/src/services/chat/ChatMailService.java @@ -130,9 +130,6 @@ public class ChatMailService extends Service { } private void processPacket(GalacticPacketIntent intent) { - Player player = intent.getPlayerManager().getPlayerFromNetworkId(intent.getNetworkId()); - if (player == null) - return; Packet p = intent.getPacket(); if (!(p instanceof SWGPacket)) return; @@ -142,11 +139,11 @@ public class ChatMailService extends Service { /* Mails */ case CHAT_PERSISTENT_MESSAGE_TO_SERVER: if (p instanceof ChatPersistentMessageToServer) - handleSendPersistentMessage(intent.getPlayerManager(), player, galaxyName, (ChatPersistentMessageToServer) p); + handleSendPersistentMessage(intent.getPlayerManager(), intent.getPlayer(), galaxyName, (ChatPersistentMessageToServer) p); break; case CHAT_REQUEST_PERSISTENT_MESSAGE: if (p instanceof ChatRequestPersistentMessage) - handlePersistentMessageRequest(player, galaxyName, (ChatRequestPersistentMessage) p); + handlePersistentMessageRequest(intent.getPlayer(), galaxyName, (ChatRequestPersistentMessage) p); break; case CHAT_DELETE_PERSISTENT_MESSAGE: if (p instanceof ChatDeletePersistentMessage) diff --git a/src/services/chat/ChatManager.java b/src/services/chat/ChatManager.java index 1466a6ae9..551a47432 100644 --- a/src/services/chat/ChatManager.java +++ b/src/services/chat/ChatManager.java @@ -113,9 +113,6 @@ public class ChatManager extends Manager { } private void processPacket(GalacticPacketIntent intent) { - Player player = intent.getPlayerManager().getPlayerFromNetworkId(intent.getNetworkId()); - if (player == null) - return; Packet p = intent.getPacket(); if (!(p instanceof SWGPacket)) return; @@ -123,7 +120,7 @@ public class ChatManager extends Manager { switch (swg.getPacketType()) { case CHAT_INSTANT_MESSAGE_TO_CHARACTER: if (p instanceof ChatInstantMessageToCharacter) - handleInstantMessage(intent.getPlayerManager(), player, (ChatInstantMessageToCharacter) p); + handleInstantMessage(intent.getPlayerManager(), intent.getPlayer(), (ChatInstantMessageToCharacter) p); break; default: break; diff --git a/src/services/chat/ChatRoomService.java b/src/services/chat/ChatRoomService.java index f39e46edd..66deda3c0 100644 --- a/src/services/chat/ChatRoomService.java +++ b/src/services/chat/ChatRoomService.java @@ -157,13 +157,9 @@ public class ChatRoomService extends Service { } private void processPacket(GalacticPacketIntent intent) { - Player player = intent.getPlayerManager().getPlayerFromNetworkId(intent.getNetworkId()); - if (player == null) - return; - Packet p = intent.getPacket(); if (p instanceof SWGPacket) - processSwgPacket(player, (SWGPacket) p); + processSwgPacket(intent.getPlayer(), (SWGPacket) p); } private void processSwgPacket(Player player, SWGPacket p) { diff --git a/src/services/combat/CombatManager.java b/src/services/combat/CombatManager.java index 75d68b0f3..28a663a7e 100644 --- a/src/services/combat/CombatManager.java +++ b/src/services/combat/CombatManager.java @@ -266,6 +266,7 @@ public class CombatManager extends Manager { case SINGLE_TARGET: doCombatSingle(source, target, info, weapon, command); break; case AREA: doCombatArea(source, source, info, weapon, command, false); break; case TARGET_AREA: doCombatArea(source, delayEgg != null ? delayEgg : target, info, weapon, command, true); break; // Same as AREA, but the target is the destination for the AoE and can take damage + default: break; } } } diff --git a/src/services/combat/CorpseService.java b/src/services/combat/CorpseService.java index be0dce135..8c4eb7b79 100644 --- a/src/services/combat/CorpseService.java +++ b/src/services/combat/CorpseService.java @@ -49,7 +49,6 @@ import java.util.Map; import java.util.Random; import java.util.concurrent.Future; import java.util.stream.Collectors; -import network.packets.swg.zone.PlayClientEffectObjectMessage; import resources.Location; import resources.Posture; import resources.PvpFaction; diff --git a/src/services/commands/BuffService.java b/src/services/commands/BuffService.java index 6f6554313..ff7f3aa8c 100644 --- a/src/services/commands/BuffService.java +++ b/src/services/commands/BuffService.java @@ -38,14 +38,12 @@ import intents.SkillModIntent; import intents.combat.CreatureKilledIntent; import java.io.FileNotFoundException; import java.util.HashSet; -import java.util.Iterator; import java.util.Locale; import java.util.Map.Entry; import java.util.Optional; import java.util.Set; import java.util.concurrent.ScheduledExecutorService; import java.util.stream.Collectors; -import java.util.stream.Stream; import network.packets.swg.zone.PlayClientEffectObjectMessage; import resources.client_info.ClientFactory; import resources.client_info.visitors.DatatableData; diff --git a/src/services/commands/CommandService.java b/src/services/commands/CommandService.java index 665199389..6b304a3c7 100644 --- a/src/services/commands/CommandService.java +++ b/src/services/commands/CommandService.java @@ -64,7 +64,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.PriorityQueue; import java.util.Queue; import java.util.Set; import java.util.concurrent.BlockingQueue; @@ -132,12 +131,9 @@ public class CommandService extends Service { private void handleGalacticPacketIntent(GalacticPacketIntent i) { GalacticPacketIntent gpi = (GalacticPacketIntent) i; Packet p = gpi.getPacket(); - Player player = gpi.getPlayerManager().getPlayerFromNetworkId(gpi.getNetworkId()); - if (player != null) { - if (p instanceof CommandQueueEnqueue) { - CommandQueueEnqueue controller = (CommandQueueEnqueue) p; - handleCommandRequest(player, gpi.getGalacticManager(), controller); - } + if (p instanceof CommandQueueEnqueue) { + CommandQueueEnqueue controller = (CommandQueueEnqueue) p; + handleCommandRequest(gpi.getPlayer(), gpi.getGalacticManager(), controller); } } diff --git a/src/services/experience/ExpertiseService.java b/src/services/experience/ExpertiseService.java index e626bf08f..3c92440a5 100644 --- a/src/services/experience/ExpertiseService.java +++ b/src/services/experience/ExpertiseService.java @@ -35,19 +35,15 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.HashSet; import java.util.Map; -import java.util.Set; import network.packets.Packet; import network.packets.swg.zone.ExpertiseRequestMessage; -import resources.Location; import resources.client_info.ClientFactory; import resources.client_info.visitors.DatatableData; import resources.control.Intent; import resources.control.Service; import resources.objects.creature.CreatureObject; import resources.objects.player.PlayerObject; -import resources.player.Player; import resources.server_info.Log; import resources.server_info.RelationalDatabase; import resources.server_info.RelationalServerFactory; @@ -191,8 +187,7 @@ public final class ExpertiseService extends Service { } ExpertiseRequestMessage expertiseRequestMessage = (ExpertiseRequestMessage) packet; - Player player = gpi.getPlayerManager().getPlayerFromNetworkId(gpi.getNetworkId()); - CreatureObject creatureObject = player.getCreatureObject(); + CreatureObject creatureObject = gpi.getPlayer().getCreatureObject(); String[] requestedSkills = expertiseRequestMessage.getRequestedSkills(); for (String requestedSkill : requestedSkills) { diff --git a/src/services/experience/SkillManager.java b/src/services/experience/SkillManager.java index 8f2c056e2..51613197f 100644 --- a/src/services/experience/SkillManager.java +++ b/src/services/experience/SkillManager.java @@ -165,7 +165,7 @@ public final class SkillManager extends Manager { if (packet instanceof ChangeRoleIconChoice) { ChangeRoleIconChoice iconChoice = (ChangeRoleIconChoice) packet; int chosenIcon = iconChoice.getIconChoice(); - CreatureObject creatureObject = gpi.getPlayerManager().getPlayerFromNetworkId(gpi.getNetworkId()).getCreatureObject(); + CreatureObject creatureObject = gpi.getPlayer().getCreatureObject(); changeRoleIcon(creatureObject, chosenIcon); } diff --git a/src/services/galaxy/ConnectionService.java b/src/services/galaxy/ConnectionService.java index 0e985cff5..414464941 100644 --- a/src/services/galaxy/ConnectionService.java +++ b/src/services/galaxy/ConnectionService.java @@ -116,8 +116,7 @@ public class ConnectionService extends Service { } private void onGalacticPacketIntent(GalacticPacketIntent gpi) { - Player p = gpi.getPlayerManager().getPlayerFromNetworkId(gpi.getNetworkId()); - Assert.notNull(p); + Player p = gpi.getPlayer(); p.updateLastPacketTimestamp(); if (gpi.getPacket() instanceof HeartBeat) p.sendPacket(gpi.getPacket()); diff --git a/src/services/galaxy/GalacticManager.java b/src/services/galaxy/GalacticManager.java index 143146ddf..a1bd11464 100644 --- a/src/services/galaxy/GalacticManager.java +++ b/src/services/galaxy/GalacticManager.java @@ -27,15 +27,17 @@ ***********************************************************************************/ package services.galaxy; -import java.util.Hashtable; import java.util.Map; import intents.network.ConnectionClosedIntent; import intents.network.ConnectionOpenedIntent; import intents.network.GalacticPacketIntent; import intents.network.InboundPacketIntent; +import resources.control.Assert; import resources.control.Intent; import resources.control.Manager; +import resources.player.Player; +import resources.server_info.SynchronizedMap; import services.CoreManager; import services.chat.ChatManager; import services.dev.DeveloperService; @@ -43,6 +45,7 @@ import services.galaxy.travel.TravelService; import services.objects.ObjectManager; import services.objects.UniformBoxService; import services.player.PlayerManager; +import utilities.IntentChain; public class GalacticManager extends Manager { @@ -53,7 +56,7 @@ public class GalacticManager extends Manager { private final TravelService travelService; private final DeveloperService developerService; private final UniformBoxService uniformBox; - private final Map prevIntentMap; + private final Map prevIntentMap; public GalacticManager() { objectManager = new ObjectManager(); @@ -63,7 +66,7 @@ public class GalacticManager extends Manager { travelService = new TravelService(); developerService = new DeveloperService(); uniformBox = new UniformBoxService(); - prevIntentMap = new Hashtable<>(); + prevIntentMap = new SynchronizedMap<>(); addChildService(objectManager); addChildService(playerManager); @@ -87,21 +90,15 @@ public class GalacticManager extends Manager { @Override public void onIntentReceived(Intent i) { if (i instanceof InboundPacketIntent) { - long networkId = ((InboundPacketIntent) i).getNetworkId(); - GalacticPacketIntent g = new GalacticPacketIntent((InboundPacketIntent) i); + Player player = playerManager.getPlayerFromNetworkId(((InboundPacketIntent) i).getNetworkId()); + Assert.notNull(player); + GalacticPacketIntent g = new GalacticPacketIntent(((InboundPacketIntent) i).getPacket(), player); g.setGalacticManager(this); - synchronized (prevIntentMap) { - g.broadcastAfterIntent(prevIntentMap.get(networkId)); - prevIntentMap.put(networkId, g); - } + prevIntentMap.get(player.getNetworkId()).broadcastAfter(g); } else if (i instanceof ConnectionClosedIntent) { - synchronized (prevIntentMap) { - prevIntentMap.remove(((ConnectionClosedIntent) i).getNetworkId()); - } + prevIntentMap.remove(((ConnectionClosedIntent) i).getNetworkId()); } else if (i instanceof ConnectionOpenedIntent) { - synchronized (prevIntentMap) { - prevIntentMap.put(((ConnectionOpenedIntent) i).getNetworkId(), i); - } + prevIntentMap.put(((ConnectionOpenedIntent) i).getNetworkId(), new IntentChain()); } } diff --git a/src/services/galaxy/travel/TravelService.java b/src/services/galaxy/travel/TravelService.java index 1a106782d..c2fa16ffb 100644 --- a/src/services/galaxy/travel/TravelService.java +++ b/src/services/galaxy/travel/TravelService.java @@ -300,7 +300,7 @@ public class TravelService extends Service { if (p instanceof PlanetTravelPointListRequest) { PlanetTravelPointListRequest req = (PlanetTravelPointListRequest) p; - Player player = i.getPlayerManager().getPlayerFromNetworkId(i.getNetworkId()); + Player player = i.getPlayer(); Location objectLocation = player.getCreatureObject().getWorldLocation(); TravelPoint nearest = getNearestTravelPoint(objectLocation); List pointsForPlanet = new ArrayList<>(); diff --git a/src/services/map/CityService.java b/src/services/map/CityService.java index 515bee4ff..ed887aed5 100644 --- a/src/services/map/CityService.java +++ b/src/services/map/CityService.java @@ -80,12 +80,7 @@ public class CityService extends Service { GalacticPacketIntent gpi = (GalacticPacketIntent) i; Packet p = gpi.getPacket(); if (p instanceof DataTransform) { - Player player = gpi.getPlayerManager().getPlayerFromNetworkId(gpi.getNetworkId()); - if (player == null) { - Log.e("CityService", "Player is null in GalacticPacketIntent:DataTransform!"); - return; - } - CreatureObject creature = player.getCreatureObject(); + CreatureObject creature = gpi.getPlayer().getCreatureObject(); if (creature == null) { Log.e("CityService", "Creature is null in GalacticPacketIntent:DataTransform!"); return; diff --git a/src/services/map/MapManager.java b/src/services/map/MapManager.java index 1bc913514..f1ffc9d66 100644 --- a/src/services/map/MapManager.java +++ b/src/services/map/MapManager.java @@ -107,12 +107,9 @@ public class MapManager extends Manager { } private void processPacket(GalacticPacketIntent intent) { - Player player = intent.getPlayerManager().getPlayerFromNetworkId(intent.getNetworkId()); - if (player == null) - return; Packet p = intent.getPacket(); if (p instanceof SWGPacket) - processSwgPacket(player, (SWGPacket) p); + processSwgPacket(intent.getPlayer(), (SWGPacket) p); } private void processSwgPacket(Player player, SWGPacket p) { diff --git a/src/services/objects/ObjectAwareness.java b/src/services/objects/ObjectAwareness.java index 4d5724f23..3051c12f2 100644 --- a/src/services/objects/ObjectAwareness.java +++ b/src/services/objects/ObjectAwareness.java @@ -237,7 +237,7 @@ public class ObjectAwareness extends Service implements TerrainMapCallback { requestedLocation.setTerrain(obj.getTerrain()); moveObjectWithTransform(obj, parent, requestedLocation, trans.getSpeed(), trans.getUpdateCounter()); } else if (packet instanceof CmdSceneReady) { - handleCmdSceneReady(i.getPlayerManager().getPlayerFromNetworkId(i.getNetworkId()), (CmdSceneReady) packet); + handleCmdSceneReady(i.getPlayer(), (CmdSceneReady) packet); } } diff --git a/src/services/objects/ObjectManager.java b/src/services/objects/ObjectManager.java index 96791c1cb..599cfd727 100644 --- a/src/services/objects/ObjectManager.java +++ b/src/services/objects/ObjectManager.java @@ -241,11 +241,10 @@ public class ObjectManager extends Manager { if (packet instanceof SelectCharacter) { PlayerManager pm = gpi.getPlayerManager(); long characterId = ((SelectCharacter) packet).getCharacterId(); - zoneInCharacter(pm, gpi.getNetworkId(), characterId); + zoneInCharacter(pm, gpi.getPlayer(), characterId); } else if (packet instanceof IntendedTarget) { IntendedTarget intendedTarget = (IntendedTarget) packet; - Player player = gpi.getPlayerManager().getPlayerFromNetworkId(gpi.getNetworkId()); - CreatureObject creatureObject = player.getCreatureObject(); + CreatureObject creatureObject = gpi.getPlayer().getCreatureObject(); long targetId = intendedTarget.getTargetId(); creatureObject.setIntendedTargetId(targetId); @@ -288,12 +287,7 @@ public class ObjectManager extends Manager { return object; } - private void zoneInCharacter(PlayerManager playerManager, long netId, long characterId) { - Player player = playerManager.getPlayerFromNetworkId(netId); - if (player == null) { - Log.e("ObjectManager", "Unable to zone in null player '%d'", netId); - return; - } + private void zoneInCharacter(PlayerManager playerManager, Player player, long characterId) { SWGObject creatureObj = getObjectById(characterId); if (creatureObj == null) { Log.e("ObjectManager", "Failed to start zone - CreatureObject could not be fetched from database [Character: %d User: %s]", characterId, player.getUsername()); diff --git a/src/services/objects/RadialService.java b/src/services/objects/RadialService.java index 0e315ee42..e31f05fec 100644 --- a/src/services/objects/RadialService.java +++ b/src/services/objects/RadialService.java @@ -70,7 +70,7 @@ public class RadialService extends Service { if (p instanceof ObjectMenuRequest) { onRequest(gpi.getObjectManager(), (ObjectMenuRequest) p); } else if (p instanceof ObjectMenuSelect) { - onSelection(gpi.getGalacticManager(), gpi.getNetworkId(), (ObjectMenuSelect) p); + onSelection(gpi.getGalacticManager(), gpi.getPlayer(), (ObjectMenuSelect) p); } } else if (i instanceof RadialResponseIntent) { onResponse((RadialResponseIntent) i); @@ -108,8 +108,7 @@ public class RadialService extends Service { sendResponse(player, response.getTarget(), response.getOptions(), response.getCounter()); } - private void onSelection(GalacticManager galacticManager, long networkId, ObjectMenuSelect select) { - Player player = galacticManager.getPlayerManager().getPlayerFromNetworkId(networkId); + private void onSelection(GalacticManager galacticManager, Player player, ObjectMenuSelect select) { SWGObject target = galacticManager.getObjectManager().getObjectById(select.getObjectId()); if (target == null) { Log.e("RadialService", "Selection target [%d] does not exist!", select.getObjectId()); diff --git a/src/services/player/CharacterCreationService.java b/src/services/player/CharacterCreationService.java index f8fc3ea32..c6c78ce95 100644 --- a/src/services/player/CharacterCreationService.java +++ b/src/services/player/CharacterCreationService.java @@ -114,7 +114,7 @@ public class CharacterCreationService extends Service { return super.start(); } - public void handlePacket(GalacticIntent intent, Player player, long networkId, Packet p) { + public void handlePacket(GalacticIntent intent, Player player, Packet p) { if (p instanceof RandomNameRequest) handleRandomNameRequest(player, (RandomNameRequest) p); if (p instanceof ClientVerifyAndLockNameRequest) diff --git a/src/services/player/LoginService.java b/src/services/player/LoginService.java index 05de97972..c57a1dfa3 100644 --- a/src/services/player/LoginService.java +++ b/src/services/player/LoginService.java @@ -129,20 +129,16 @@ public class LoginService extends Service { private void handlePacket(GalacticPacketIntent gpi, Packet p) { if (p instanceof LoginClientId) { - handleLogin(getPlayer(gpi.getPlayerManager(), gpi.getNetworkId()), (LoginClientId) p); + handleLogin(gpi.getPlayer(), (LoginClientId) p); } else if (p instanceof DeleteCharacterRequest) { - handleCharDeletion(gpi, getPlayer(gpi.getPlayerManager(), gpi.getNetworkId()), (DeleteCharacterRequest) p); + handleCharDeletion(gpi, gpi.getPlayer(), (DeleteCharacterRequest) p); } else if (p instanceof LagRequest) { - Player player = getPlayer(gpi.getPlayerManager(), gpi.getNetworkId()); + Player player = gpi.getPlayer(); if (player.getPlayerServer() == PlayerServer.LOGIN) handleLagRequest(player); } } - private Player getPlayer(PlayerManager playerManager, long networkId) { - return playerManager.getPlayerFromNetworkId(networkId); - } - private String getServerString() { Config c = getConfig(ConfigFile.NETWORK); String name = c.getString("LOGIN-SERVER-NAME", "LoginServer"); diff --git a/src/services/player/ZoneManager.java b/src/services/player/ZoneManager.java index 7a0a8553a..c86bd965a 100644 --- a/src/services/player/ZoneManager.java +++ b/src/services/player/ZoneManager.java @@ -92,7 +92,7 @@ public class ZoneManager extends Manager { handlePlayerEventIntent(((PlayerEventIntent) i).getPlayer(), ((PlayerEventIntent) i).getEvent()); } else if (i instanceof GalacticPacketIntent) { GalacticPacketIntent gpi = (GalacticPacketIntent) i; - handlePacket(gpi, gpi.getPlayerManager().getPlayerFromNetworkId(gpi.getNetworkId()), gpi.getNetworkId(), gpi.getPacket()); + handlePacket(gpi, gpi.getPlayer(), gpi.getPacket()); } } @@ -111,8 +111,8 @@ public class ZoneManager extends Manager { } } - private void handlePacket(GalacticIntent intent, Player player, long networkId, Packet p) { - characterCreationService.handlePacket(intent, player, networkId, p); + private void handlePacket(GalacticIntent intent, Player player, Packet p) { + characterCreationService.handlePacket(intent, player, p); if (p instanceof ClientIdMsg) handleClientIdMsg(player, (ClientIdMsg) p); if (p instanceof SetWaypointColor) diff --git a/src/services/spawn/SpawnerService.java b/src/services/spawn/SpawnerService.java index 15ee6dde7..3706c8fc8 100644 --- a/src/services/spawn/SpawnerService.java +++ b/src/services/spawn/SpawnerService.java @@ -43,7 +43,6 @@ import resources.PvpFlag; import resources.Terrain; import resources.config.ConfigFile; import resources.containers.ContainerPermissionsType; -import resources.control.Assert; import resources.control.Intent; import resources.control.Service; import resources.objects.building.BuildingObject; diff --git a/src/services/sui/SuiService.java b/src/services/sui/SuiService.java index 06e8f41ac..c3be63f1e 100644 --- a/src/services/sui/SuiService.java +++ b/src/services/sui/SuiService.java @@ -77,12 +77,9 @@ public class SuiService extends Service { } private void processPacket(GalacticPacketIntent intent) { - Player player = intent.getPlayerManager().getPlayerFromNetworkId(intent.getNetworkId()); - if (player == null) - return; Packet p = intent.getPacket(); if (p instanceof SWGPacket) - processSwgPacket(player, (SWGPacket) p); + processSwgPacket(intent.getPlayer(), (SWGPacket) p); } private void processSwgPacket(Player player, SWGPacket p) {