From b1e459fd326acd306817a042d375a7600201bbc0 Mon Sep 17 00:00:00 2001 From: Mads Boddum Date: Fri, 23 Sep 2016 14:22:13 +0200 Subject: [PATCH 1/2] Fixed radial options getting mixed up --- src/resources/radial/RadialItem.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/resources/radial/RadialItem.java b/src/resources/radial/RadialItem.java index 84cda8134..134daf639 100644 --- a/src/resources/radial/RadialItem.java +++ b/src/resources/radial/RadialItem.java @@ -137,6 +137,10 @@ public enum RadialItem { ITEM_EQUIP_APPEARANCE (""), ITEM_UNEQUIP_APPEARANCE (""), OPEN_STORYTELLER_RECIPE (""), + ITEM_WP_MAKE_CITY_WAYPOINT (""), + ITEM_WP_MAKE_GUILD_WAYPOINT (""), + ATMOSPHERIC_FLIGHT_FLY (""), + ATMOSPHERIC_FLIGHT_LAND (""), SERVER_DIVIDER (""), SERVER_MENU1 (""), SERVER_MENU2 (""), From ec3106a6cf40da7ea120a5964afe2addf4bca985 Mon Sep 17 00:00:00 2001 From: Mads Boddum Date: Fri, 23 Sep 2016 14:34:17 +0200 Subject: [PATCH 2/2] Fixed an issue with radials where overridden text for children wasn't applied --- src/resources/radial/RadialOption.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/resources/radial/RadialOption.java b/src/resources/radial/RadialOption.java index 7dcd4c77a..32b6b959b 100644 --- a/src/resources/radial/RadialOption.java +++ b/src/resources/radial/RadialOption.java @@ -48,9 +48,10 @@ public class RadialOption { public void setItem(RadialItem item) { this.item = item; } public void addChild(RadialOption option) { this.children.add(option); } public void addChild(RadialItem item) { addChild(new RadialOption(item)); } - public void addChildWithOverriddenText(RadialItem item, String overridenText) { - addChild(item); - setOverriddenText(overriddenText); + public void addChildWithOverriddenText(RadialItem item, String overriddenText) { + RadialOption childOption = new RadialOption(item); + childOption.setOverriddenText(overriddenText); + addChild(childOption); } public void setOverriddenText(String overridenText) { this.overriddenText = overridenText; }