From 36b4325dbcbe18422b830b5f7dc1719011228563 Mon Sep 17 00:00:00 2001 From: Ziggy Date: Mon, 4 Jul 2022 16:55:18 +0200 Subject: [PATCH] Block loot radials while the executor is dead or incapacitated --- .../objects/radial/object/AIObjectRadial.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/projectswg/holocore/resources/support/objects/radial/object/AIObjectRadial.java b/src/main/java/com/projectswg/holocore/resources/support/objects/radial/object/AIObjectRadial.java index 67330d0ce..fad5fced6 100644 --- a/src/main/java/com/projectswg/holocore/resources/support/objects/radial/object/AIObjectRadial.java +++ b/src/main/java/com/projectswg/holocore/resources/support/objects/radial/object/AIObjectRadial.java @@ -5,11 +5,12 @@ import com.projectswg.common.data.radial.RadialItem; import com.projectswg.common.data.radial.RadialOption; import com.projectswg.holocore.intents.gameplay.combat.loot.LootRequestIntent; import com.projectswg.holocore.resources.gameplay.combat.loot.LootType; +import com.projectswg.holocore.resources.support.global.commands.Locomotion; import com.projectswg.holocore.resources.support.global.player.Player; import com.projectswg.holocore.resources.support.objects.radial.RadialHandlerInterface; import com.projectswg.holocore.resources.support.objects.swg.SWGObject; +import com.projectswg.holocore.resources.support.objects.swg.creature.CreatureObject; import com.projectswg.holocore.resources.support.objects.swg.custom.AIObject; -import me.joshlarson.jlcommon.log.Log; import java.util.Collection; @@ -27,6 +28,11 @@ public class AIObjectRadial implements RadialHandlerInterface { return; } + CreatureObject creatureObject = player.getCreatureObject(); + if (Locomotion.DEAD.isActive(creatureObject) || Locomotion.INCAPACITATED.isActive(creatureObject)) { + return; + } + options.add(RadialOption.create(RadialItem.LOOT_ALL, RadialOption.create(RadialItem.LOOT))); } @@ -38,6 +44,11 @@ public class AIObjectRadial implements RadialHandlerInterface { return; } + CreatureObject creatureObject = player.getCreatureObject(); + if (Locomotion.DEAD.isActive(creatureObject) || Locomotion.INCAPACITATED.isActive(creatureObject)) { + return; + } + switch (selection) { case LOOT: LootRequestIntent.broadcast(player, ai, LootType.LOOT);