Repo-Mirror/HMCCosmetics
9
0
Fork 0
mirror of https://github.com/HibiscusMC/HMCCosmetics.git synced 2025-12-19 15:09:19 +00:00
Code Issues Releases Activity

fix: Actions not handling nulls properly

Browse Source
This commit is contained in:
LoJoSho
2025-06-09 10:53:27 -05:00
parent a19d564460
commit b07c3c9878
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/Actions.java
View File

@@ -10,6 +10,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.logging.Level;
@SuppressWarnings("unused") @SuppressWarnings("unused")
public class Actions { public class Actions {
@@ -30,7 +31,6 @@ public class Actions {
private static final ActionCosmeticHide ACTION_HIDE = new ActionCosmeticHide(); private static final ActionCosmeticHide ACTION_HIDE = new ActionCosmeticHide();
private static final ActionCosmeticToggle ACTION_TOGGLE = new ActionCosmeticToggle(); private static final ActionCosmeticToggle ACTION_TOGGLE = new ActionCosmeticToggle();
public static Action getAction(@NotNull String id) { public static Action getAction(@NotNull String id) {
return actions.get(id.toUpperCase()); return actions.get(id.toUpperCase());
} }
@@ -45,13 +45,13 @@ public class Actions {
public static void runActions(Player viewer, CosmeticHolder cosmeticHolder, @NotNull List<String> raw) { public static void runActions(Player viewer, CosmeticHolder cosmeticHolder, @NotNull List<String> raw) {
for (String a : raw) { for (String a : raw) {
String id = StringUtils.substringBetween(a, "[", "]").toUpperCase(); String id = StringUtils.substringBetween(a, "[", "]");
String message = StringUtils.substringAfter(a, "] "); String message = StringUtils.substringAfter(a, "] ");
MessagesUtil.sendDebugMessages("ID is " + id + " // Raw Data is " + message); MessagesUtil.sendDebugMessages("ID is " + id + " // Raw Data is " + message);
if (isAction(id)) { if (id != null && isAction(id.toUpperCase())) {
getAction(id).run(viewer, cosmeticHolder, message); getAction(id).run(viewer, cosmeticHolder, message);
} else { } else {
MessagesUtil.sendDebugMessages("Possible ids: " + actions.keySet()); MessagesUtil.sendDebugMessages("Invalid Action ID (" + id + ") used in menus (Full raw: '" + a + "'). Make sure all actions are properly typed out. Here are all possible actions: " + actions.keySet(), Level.WARNING);
} }
} }
} }