Skip to content

Commit 73a1d82

Browse files
committed
Fixed Xaero importing and exporting issue due to unsupported icons
1 parent 95aa026 commit 73a1d82

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

src/main/java/net/wurstclient/hacks/WaypointsHack.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -857,7 +857,8 @@ private int getBossBarBottom(DrawContext context)
857857
{
858858
if(y >= maxY)
859859
return maxY;
860-
y += 10; //default 19px height, but use 10px as it looks better (at least for me)
860+
y += 10; // default 19px height, but use 10px as it looks better (at
861+
// least for me)
861862
}
862863
return Math.min(y, maxY);
863864
}

src/main/java/net/wurstclient/waypoints/XaeroWaypointIO.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ final class XaeroWaypointIO
2525
static final String HEADER =
2626
"#waypoint:name:initials:x:y:z:color:disabled:type:set:rotate_on_tp:tp_yaw:visibility_type:destination";
2727
static final String DEFAULT_SET = "gui.xaero_default";
28+
private static final int DEFAULT_TYPE_IDX = 0;
29+
// Xaero only keeps waypoints with icon type IDs in [0, 4]. Clamp anything
30+
// higher so exports persist.
31+
private static final int MAX_SUPPORTED_TYPE = 4;
2832
private static final String SAFE_DELIMITER = "§§";
2933
private static final int[] COLOR_TABLE = new int[]{0xFFFFFFFF, 0xFFFFAA00,
3034
0xFFFF55FF, 0xFF55FFFF, 0xFFFFFF55, 0xFF55FF55, 0xFFFF55AA, 0xFF555555,
@@ -210,9 +214,10 @@ static String iconFromType(int type)
210214
static int typeFromIcon(String icon)
211215
{
212216
if(icon == null)
213-
return 0;
217+
return DEFAULT_TYPE_IDX;
214218
String key = icon.toLowerCase(Locale.ROOT);
215-
return ICON_TO_TYPE.getOrDefault(key, 0);
219+
int type = ICON_TO_TYPE.getOrDefault(key, DEFAULT_TYPE_IDX);
220+
return type <= MAX_SUPPORTED_TYPE ? type : DEFAULT_TYPE_IDX;
216221
}
217222

218223
private static String encode(String value)

0 commit comments

Comments
 (0)