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

Fixed an issue where targeting a terminal would activate it

Browse Source
This commit is contained in:
Mads Boddum
2016-09-23 13:09:41 +02:00
parent 1387c9ba9a
commit eca7b5dbe2
3 changed files with 0 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/RadialService.java
-25
View File
@@ -35,11 +35,9 @@ import resources.control.Intent;
import resources.control.Service;
import network.packets.Packet;
import network.packets.swg.zone.ObjectMenuSelect;
import network.packets.swg.zone.object_controller.IntendedTarget;
import network.packets.swg.zone.object_controller.ObjectMenuRequest;
import network.packets.swg.zone.object_controller.ObjectMenuResponse;
import intents.network.GalacticPacketIntent;
import intents.radial.ObjectClickedIntent;
import intents.radial.RadialRegisterIntent;
import intents.radial.RadialRequestIntent;
import intents.radial.RadialResponseIntent;
@@ -73,8 +71,6 @@ public class RadialService extends Service {
onRequest(gpi.getObjectManager(), (ObjectMenuRequest) p);
} else if (p instanceof ObjectMenuSelect) {
onSelection(gpi.getGalacticManager(), gpi.getNetworkId(), (ObjectMenuSelect) p);
} else if (p instanceof IntendedTarget) {
onObjectClicked(gpi.getObjectManager(), (IntendedTarget) p);
}
} else if (i instanceof RadialResponseIntent) {
onResponse((RadialResponseIntent) i);
@@ -131,27 +127,6 @@ public class RadialService extends Service {
new RadialSelectionIntent(player, target, selection).broadcast();
}
private void onObjectClicked(ObjectManager objectManager, IntendedTarget it) {
SWGObject requestor = objectManager.getObjectById(it.getObjectId());
SWGObject target = objectManager.getObjectById(it.getTargetId());
if (target == null)
return;
if (!(requestor instanceof CreatureObject)) {
Log.w("RadialService", "Requestor of target: %s is not a creature object! %s", target, requestor);
return;
}
Player player = requestor.getOwner();
if (player == null) {
Log.w("RadialService", "Requestor of target: %s does not have an owner! %s", target, requestor);
return;
}
synchronized (templatesRegistered) {
if (templatesRegistered.contains(target.getTemplate())) {
new ObjectClickedIntent((CreatureObject) requestor, target).broadcast();
}
}
}
private void sendResponse(Player player, SWGObject target, List<RadialOption> options, int counter) {
ObjectMenuResponse menuResponse = new ObjectMenuResponse(player.getCreatureObject().getObjectId());
menuResponse.setTargetId(target.getObjectId());