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

Fixed loot radials appearing twice, caused by reversed order #420

Browse Source
This commit is contained in:
Ziggy
2022-04-15 17:00:19 +02:00
parent 4d4b346dd0
commit 490a6891a4
2 changed files with 4 additions and 4 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
+1 -1
View File
@@ -27,7 +27,7 @@ public class AIObjectRadial implements RadialHandlerInterface {
return;
}
options.add(RadialOption.create(RadialItem.LOOT, RadialOption.create(RadialItem.LOOT_ALL)));
options.add(RadialOption.create(RadialItem.LOOT_ALL, RadialOption.create(RadialItem.LOOT)));
}
@Override
src/test/java/com/projectswg/holocore/services/support/objects/radials/TestRadialService.java
+3 -3
View File
@@ -87,7 +87,7 @@ public class TestRadialService extends TestRunnerSimulatedWorld {
registerObject(creature, dead);
dead.setPosture(Posture.DEAD);
sendRequest(creature, dead, RadialItem.LOOT, RadialItem.EXAMINE);
sendRequest(creature, dead, RadialItem.LOOT_ALL, RadialItem.EXAMINE);
ObjectMenuResponse response = creature.getOwner().getNextPacket(ObjectMenuResponse.class);
Assert.assertNotNull(response);
@@ -95,11 +95,11 @@ public class TestRadialService extends TestRunnerSimulatedWorld {
Assert.assertEquals(dead.getObjectId(), response.getTargetId());
Assert.assertEquals(2, response.getOptions().size());
Assert.assertEquals(RadialItem.LOOT, response.getOptions().get(0).getType());
Assert.assertEquals(RadialItem.LOOT_ALL, response.getOptions().get(0).getType());
Assert.assertEquals(RadialItem.EXAMINE, response.getOptions().get(1).getType());
Assert.assertEquals(1, response.getOptions().get(0).getChildren().size());
Assert.assertEquals(RadialItem.LOOT_ALL, response.getOptions().get(0).getChildren().get(0).getType());
Assert.assertEquals(RadialItem.LOOT, response.getOptions().get(0).getChildren().get(0).getType());
}
private void sendRequest(CreatureObject source, SWGObject target, RadialItem ... items) {