projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-06 21:13:37 -04:00
Code Issues Projects Releases Wiki Activity

Big ObjectController refactor to make controllers easier to use

Browse Source
This commit is contained in:
Obique
2015-02-18 13:40:20 -06:00
committed by Obique
parent b5c8f419fd
commit 3b5495e49a
5 changed files with 18 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/commands/callbacks/SocialInternalCmdCallback.java
+4 -4
View File
@@ -2,7 +2,6 @@ package resources.commands.callbacks;
import java.util.List;
import network.packets.swg.zone.object_controller.ObjectController;
import network.packets.swg.zone.object_controller.PlayerEmote;
import resources.commands.ICmdCallback;
import resources.objects.SWGObject;
@@ -19,15 +18,16 @@ public class SocialInternalCmdCallback implements ICmdCallback {
if (!cmd[0].equals("0"))
target = objManager.getObjectById(Long.parseLong(cmd[0]));
PlayerEmote emote = new PlayerEmote(player.getCreatureObject().getObjectId(), ((target == null) ? 0 : target.getObjectId()), Short.valueOf(cmd[1]));
player.sendPacket(new ObjectController(PlayerEmote.CRC, player.getCreatureObject().getObjectId(), emote));
long objectId = player.getCreatureObject().getObjectId();
PlayerEmote emote = new PlayerEmote(objectId, objectId, ((target == null) ? 0 : target.getObjectId()), Short.valueOf(cmd[1]));
player.sendPacket(emote);
List<Player> observers = player.getCreatureObject().getObservers();
for (Player observer : observers) {
if (observer.getCreatureObject() == null)
continue;
observer.sendPacket(new ObjectController(PlayerEmote.CRC, observer.getCreatureObject().getObjectId(), emote));
observer.sendPacket(emote);
}
}
}