projectswg-bitbucket/cucore
1
0
Fork 0
mirror of https://bitbucket.org/projectswg/cucore.git synced 2026-07-31 00:15:48 -04:00
Code Issues Projects Releases Wiki Activity

Zoning in a character now sends PlayerEvent.PE_ZONE_IN PlayerEventIntent to registered services, ChatService now receives zoning in intents, Persistent Message headers are now sent on login, Added default access level if it's not specified in the database (AccessLevel.PLAYER is default)

Browse Source
This commit is contained in:
Waverunner
2015-01-11 12:24:15 -05:00
parent 06575f5653
commit e4c1fa8277
4 changed files with 60 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ObjectManager.java
+5 -2
View File
@@ -1,6 +1,7 @@
package services.objects;
import intents.GalacticPacketIntent;
import intents.PlayerEventIntent;
import intents.swgobject_events.SWGObjectEventIntent;
import java.util.ArrayList;
@@ -37,6 +38,7 @@ import resources.objects.tangible.TangibleObject;
import resources.objects.waypoint.WaypointObject;
import resources.objects.weapon.WeaponObject;
import resources.player.Player;
import resources.player.PlayerEvent;
import resources.server_info.ObjectDatabase;
import resources.server_info.ObjectDatabase.Traverser;
import services.player.PlayerManager;
@@ -109,7 +111,7 @@ public class ObjectManager extends Manager {
if (i instanceof GalacticPacketIntent) {
GalacticPacketIntent gpi = (GalacticPacketIntent) i;
if (gpi.getPacket() instanceof SelectCharacter) {
zoneInCharacter(gpi.getPlayerManager(), gpi.getNetworkId(), ((SelectCharacter)gpi.getPacket()).getCharacterId());
zoneInCharacter(gpi.getPlayerManager(), gpi.getGalaxy().getName(), gpi.getNetworkId(), ((SelectCharacter)gpi.getPacket()).getCharacterId());
} else if (gpi.getPacket() instanceof ObjectController) {
ObjectController controller = (ObjectController) gpi.getPacket();
if (controller.getControllerData() instanceof DataTransform) {
@@ -210,7 +212,7 @@ public class ObjectManager extends Manager {
}
}
private void zoneInCharacter(PlayerManager playerManager, long netId, long characterId) {
private void zoneInCharacter(PlayerManager playerManager, String galaxy, long netId, long characterId) {
Player player = playerManager.getPlayerFromNetworkId(netId);
if (player != null) {
verifyPlayerObjectsSet(player, characterId);
@@ -231,6 +233,7 @@ public class ObjectManager extends Manager {
creature.clearAware();
moveObject(null, creature, creature.getLocation(), creature.getLocation());
updateAwarenessForObject(creature);
new PlayerEventIntent(player, galaxy, PlayerEvent.PE_ZONE_IN).broadcast();
}
}