From 490a6891a4dc556c2a8748b92d3d3eef7d92aa2c Mon Sep 17 00:00:00 2001 From: Ziggy Date: Fri, 15 Apr 2022 16:59:35 +0200 Subject: [PATCH] Fixed loot radials appearing twice, caused by reversed order #420 --- .../support/objects/radial/object/AIObjectRadial.java | 2 +- .../services/support/objects/radials/TestRadialService.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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 7361e739b..67330d0ce 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 @@ -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 diff --git a/src/test/java/com/projectswg/holocore/services/support/objects/radials/TestRadialService.java b/src/test/java/com/projectswg/holocore/services/support/objects/radials/TestRadialService.java index a9ed31c88..0f32a6d39 100644 --- a/src/test/java/com/projectswg/holocore/services/support/objects/radials/TestRadialService.java +++ b/src/test/java/com/projectswg/holocore/services/support/objects/radials/TestRadialService.java @@ -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) {