projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-08-03 04:21:12 -04:00
Code Issues Projects Releases Wiki Activity

Fixed controller for radials causing crashes

Browse Source
This commit is contained in:
Waverunner
2015-01-19 08:32:41 -05:00
parent 1aa3453cb3
commit b1d95de98a
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/chat/ChatService.java
+1 -1
View File
@@ -106,7 +106,7 @@ public class ChatService extends Service {
// Send to self
SpatialChat message = new SpatialChat(actor.getObjectId(), 0, i.getMessage(), i.getChatType(), i.getMoodId());
ObjectController controller = new ObjectController(244, actor.getObjectId(), message);
ObjectController controller = new ObjectController(SpatialChat.CRC, actor.getObjectId(), message);
sender.sendPacket(controller);
src/services/sui/SuiService.java
+2 -3
View File
@@ -47,7 +47,7 @@ public class SuiService extends Service {
Player player = ((GalacticPacketIntent) i).getPlayerManager().getPlayerFromNetworkId(netId);
if (packet instanceof ObjectController) {
ObjectController controller = (ObjectController) packet;
ObjectController controller = ((ObjectController) packet).getController();
if (controller instanceof ObjectMenuRequest)
handleRadialMenuRequest(player, (ObjectMenuRequest) controller);
@@ -59,9 +59,8 @@ public class SuiService extends Service {
private void handleRadialMenuRequest(Player player, ObjectMenuRequest request) {
// TODO: Modify when object scripts are in to accept a createRadial definition for radials
System.out.println("handling radial menu : " + request.getTargetId());
ObjectMenuResponse response = new ObjectMenuResponse(request.getTargetId(), request.getRequesterId(), request.getOptions(), request.getCounter());
ObjectController controller = new ObjectController(244, player.getCreatureObject().getObjectId(), response);
ObjectController controller = new ObjectController(ObjectMenuResponse.CRC, player.getCreatureObject().getObjectId(), response);
player.sendPacket(controller);
}