From ab567278eedc8cacda5a395ea0b2f58ba0941eb1 Mon Sep 17 00:00:00 2001 From: Flemmli97 Date: Sun, 13 Jun 2021 18:39:37 +0200 Subject: [PATCH] potion parsing error catching --- .../flemmli97/flan/gui/PotionEditScreenHandler.java | 8 ++++---- .../flemmli97/flan/gui/StringResultScreenHandler.java | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/io/github/flemmli97/flan/gui/PotionEditScreenHandler.java b/common/src/main/java/io/github/flemmli97/flan/gui/PotionEditScreenHandler.java index 5251ebb..f338d3a 100644 --- a/common/src/main/java/io/github/flemmli97/flan/gui/PotionEditScreenHandler.java +++ b/common/src/main/java/io/github/flemmli97/flan/gui/PotionEditScreenHandler.java @@ -21,7 +21,6 @@ import net.minecraft.sound.SoundEvents; import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; import net.minecraft.util.Formatting; -import net.minecraft.util.registry.Registry; import java.util.Collection; import java.util.Collections; @@ -111,14 +110,15 @@ public class PotionEditScreenHandler extends ServerOnlyScreenHandler { String[] potion = s.split(";"); int amp = 1; StatusEffect effect = CrossPlatformStuff.effectFromString(potion[0]); - if(effect == StatusEffects.LUCK && !potion[0].equals("minecraft:luck")) { + if (effect == null || (effect == StatusEffects.LUCK && !potion[0].equals("minecraft:luck"))) { ServerScreenHelper.playSongToPlayer(player, SoundEvents.ENTITY_VILLAGER_NO, 1, 1f); return; } - if(potion.length > 1) { + if (potion.length > 1) { try { amp = Integer.parseInt(potion[1]); - } catch (NumberFormatException e) {} + } catch (NumberFormatException e) { + } } this.claim.addPotion(effect, amp); player.closeHandledScreen(); diff --git a/common/src/main/java/io/github/flemmli97/flan/gui/StringResultScreenHandler.java b/common/src/main/java/io/github/flemmli97/flan/gui/StringResultScreenHandler.java index c7a7e6f..c5ab7a6 100644 --- a/common/src/main/java/io/github/flemmli97/flan/gui/StringResultScreenHandler.java +++ b/common/src/main/java/io/github/flemmli97/flan/gui/StringResultScreenHandler.java @@ -41,7 +41,6 @@ public class StringResultScreenHandler extends AnvilScreenHandler { this.output.setStack(0, out); this.cons = cons; this.ret = ret; - } public static void createNewStringResult(PlayerEntity player, Consumer cons, Runnable ret) {