From 90c524a75d76ead6fb081413abee713e632a7081 Mon Sep 17 00:00:00 2001 From: olim Date: Sun, 16 Jun 2024 19:25:13 +0100 Subject: fix conflicts with tool-tip refactor --- .../hysky/skyblocker/skyblock/crimson/dojo/DisciplineTestHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker') diff --git a/src/main/java/de/hysky/skyblocker/skyblock/crimson/dojo/DisciplineTestHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/crimson/dojo/DisciplineTestHelper.java index 641b8728..5cee126f 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/crimson/dojo/DisciplineTestHelper.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/crimson/dojo/DisciplineTestHelper.java @@ -43,7 +43,7 @@ public class DisciplineTestHelper { if (CLIENT == null || CLIENT.player == null) { return false; } - String heldId = ItemTooltip.getInternalNameFromNBT(CLIENT.player.getMainHandStack(), true); + String heldId = CLIENT.player.getMainHandStack().getSkyblockId(); if (SWORD_TO_NAME_LOOKUP.containsKey(heldId)) { return SWORD_TO_NAME_LOOKUP.get(heldId).equals(name); @@ -60,7 +60,7 @@ public class DisciplineTestHelper { if (DojoManager.currentChallenge != DojoManager.DojoChallenges.DISCIPLINE || CLIENT == null || CLIENT.player == null) { return 0; } - String heldId = ItemTooltip.getInternalNameFromNBT(CLIENT.player.getMainHandStack(), true); + String heldId = CLIENT.player.getMainHandStack().getSkyblockId(); if (SWORD_TO_COLOR_LOOKUP.containsKey(heldId)) { return SWORD_TO_COLOR_LOOKUP.getInt(heldId); } -- cgit