projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-09-11 21:45:26 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #599 from madsboddum/locomotion_block_radials

Browse Source 
Block loot radials while the executor is dead or incapacitated
This commit is contained in:
Josh Larson
2022-07-04 13:16:34 -05:00
committed by GitHub
parent dc601c7f88 36b4325dbc
commit ec100547e8
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/projectswg/holocore/resources/support/objects/radial/object/AIObjectRadial.java
+12 -1
View File
@@ -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);