projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-18 08:02:56 -04:00
Code Issues Projects Releases Wiki Activity

ChatBroadcastIntent can now accept ProsePackages, Refactored handling of ChatBroadcastIntent's, Delta messages are now sent when adding items to the appearance list and equipment list for CreatureObject's

Browse Source
This commit is contained in:
Waverunner
2015-02-16 10:51:57 -05:00
parent 8ad34d3c44
commit db98beb9e8
3 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/chat/ChatService.java
+24 -8
View File
@@ -14,7 +14,6 @@ import intents.PlayerEventIntent;
import intents.ServerStatusIntent;
import intents.ServerStatusIntent.ServerStatus;
import intents.chat.ChatBroadcastIntent;
import intents.chat.ChatBroadcastIntent.BroadcastType;
import intents.chat.PersistentMessageIntent;
import intents.chat.SpatialChatIntent;
import network.packets.Packet;
@@ -35,6 +34,8 @@ import network.packets.swg.zone.object_controller.SpatialChat;
import resources.Terrain;
import resources.control.Intent;
import resources.control.Service;
import resources.encodables.OutOfBand;
import resources.encodables.ProsePackage;
import resources.encodables.player.Mail;
import resources.objects.SWGObject;
import resources.player.Player;
@@ -148,10 +149,20 @@ public class ChatService extends Service {
}
private void handleChatBroadcast(ChatBroadcastIntent i) {
if (i.getBroadcastType() == BroadcastType.AREA)
broadcastAreaMessage(i.getMessage(), i.getBroadcaster());
else
broadcastGalaxyMessage(i.getMessage(), i.getTerrain());
switch(i.getBroadcastType()) {
case AREA:
broadcastAreaMessage(i.getMessage(), i.getBroadcaster());
break;
case PLANET:
broadcastGalaxyMessage(i.getMessage(), i.getTerrain()); // TODO: Planet specific system messages
break;
case GALAXY:
broadcastGalaxyMessage(i.getMessage(), i.getTerrain());
break;
case PERSONAL:
broadcastPersonalMessage(i.getProse(), i.getBroadcaster());
break;
}
}
private void handleChatRoomListRequest(Player player, ChatRequestRoomList request) {
@@ -252,11 +263,11 @@ public class ChatService extends Service {
sendPersistentMessage(player, mail, MailFlagType.FULL_MESSAGE, galaxy);
}
private void broadcastAreaMessage(String message, SWGObject broadcaster) {
private void broadcastAreaMessage(String message, Player broadcaster) {
ChatSystemMessage packet = new ChatSystemMessage(SystemChatType.SCREEN_AND_CHAT.ordinal(), message);
broadcaster.getOwner().sendPacket(packet);
broadcaster.sendPacket(packet);
List<Player> observers = broadcaster.getObservers();
List<Player> observers = broadcaster.getCreatureObject().getObservers();
for (Player player : observers) {
player.sendPacket(packet);
}
@@ -267,6 +278,11 @@ public class ChatService extends Service {
new NotifyPlayersPacketIntent(packet, terrain).broadcast();
}
private void broadcastPersonalMessage(ProsePackage prose, Player player) {
OutOfBand pckg = new OutOfBand(prose);
player.sendPacket(new ChatSystemMessage(SystemChatType.SCREEN_AND_CHAT, pckg));
}
private void sendShutdownBroadcasts(final long time) {
final AtomicInteger runCount = new AtomicInteger();
final long interval = (int) (time / 3);