From 85c9867682f497051d4d9db4960aa62273bb6204 Mon Sep 17 00:00:00 2001 From: HacktheTime Date: Sun, 12 Nov 2023 10:32:05 +0100 Subject: fixed a crash regarding numpad config removed primal fear notifications again. --- common/src/main/java/de/hype/bbsentials/common/chat/Chat.java | 4 +--- .../de/hype/bbsentials/fabric/numpad/NumPadCodeConfigScreen.java | 7 ++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/common/src/main/java/de/hype/bbsentials/common/chat/Chat.java b/common/src/main/java/de/hype/bbsentials/common/chat/Chat.java index 517a93f..c35f4ad 100644 --- a/common/src/main/java/de/hype/bbsentials/common/chat/Chat.java +++ b/common/src/main/java/de/hype/bbsentials/common/chat/Chat.java @@ -324,11 +324,9 @@ public class Chat { } } else if (messageUnformatted.equals("Click here to purchase a new 6 hour pass for 10,000 Coins")) { + Chat.sendPrivateMessageToSelfText(Message.tellraw("[\"\",\"You can press \",{\"keybind\":\"Chat Prompt Yes / Open Menu\",\"color\":\"green\"},\" to buy it.\"]")); setChatCommand("/purchasecrystallhollowspass", 30); } - else if (messageUnformatted.startsWith("FEAR. A Primal Fear")) { - sendNotification("BB: Primal Fear", messageUnformatted); - } } else if (message.isFromGuild()) { diff --git a/fabric/src/main/java/de/hype/bbsentials/fabric/numpad/NumPadCodeConfigScreen.java b/fabric/src/main/java/de/hype/bbsentials/fabric/numpad/NumPadCodeConfigScreen.java index bf9c25f..6c2b28b 100644 --- a/fabric/src/main/java/de/hype/bbsentials/fabric/numpad/NumPadCodeConfigScreen.java +++ b/fabric/src/main/java/de/hype/bbsentials/fabric/numpad/NumPadCodeConfigScreen.java @@ -124,12 +124,9 @@ public class NumPadCodeConfigScreen extends Screen { new NoticeScreen(() -> MinecraftClient.getInstance().setScreen(this), Text.of(""), Text.of("§cInvalid Code / already used!")); return; } - if (codeTextField.forbiddenCode(codeTextField.getText())) { - new NoticeScreen(() -> MinecraftClient.getInstance().setScreen(this), Text.of(""), Text.of("§cNo Command specified")); - return; - } + code.code = codeTextField.getText(); code.commands = new ArrayList<>(commandFields.stream().map(TextFieldWidget::getText).toList()); - code.commandDelay = new ArrayList<>(commandFields.stream().map((field) -> { + code.commandDelay = new ArrayList<>(delayFields.stream().map((field) -> { String text = field.getText(); if (text.isEmpty()) return 1.0; return Double.parseDouble(text); -- cgit