From 218c4e48cc083dd30f4c574795703bb558d17ac4 Mon Sep 17 00:00:00 2001 From: D3v1s0m Date: Fri, 27 Dec 2024 18:26:45 +0530 Subject: [PATCH] fix: glow import for znpcs --- .../znpcsplus/conversion/znpcs/ZNpcImporter.java | 13 ++++++++----- .../conversion/znpcs/model/ZNpcsModel.java | 4 ++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/conversion/znpcs/ZNpcImporter.java b/plugin/src/main/java/lol/pyr/znpcsplus/conversion/znpcs/ZNpcImporter.java index dccf704..604347f 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/conversion/znpcs/ZNpcImporter.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/conversion/znpcs/ZNpcImporter.java @@ -189,12 +189,15 @@ public class ZNpcImporter implements DataImporter { if (toggleValues.containsKey("mirror")) { npc.setProperty(propertyRegistry.getByName("skin", SkinDescriptor.class), new MirrorDescriptor(skinCache)); } - if (toggleValues.containsKey("glow")) { - try { - npc.setProperty(propertyRegistry.getByName("glow", DyeColor.class), DyeColor.valueOf((String) toggleValues.get("glow"))); - } catch (IllegalArgumentException e) { + if (toggleValues.containsKey("glow") && (boolean) toggleValues.get("glow")) { + if (!model.getGlowName().isEmpty()) + try { + npc.setProperty(propertyRegistry.getByName("glow", DyeColor.class), DyeColor.valueOf(model.getGlowName())); + } catch (IllegalArgumentException e) { + npc.setProperty(propertyRegistry.getByName("glow", DyeColor.class), DyeColor.WHITE); + } + else npc.setProperty(propertyRegistry.getByName("glow", DyeColor.class), DyeColor.WHITE); - } } } diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/conversion/znpcs/model/ZNpcsModel.java b/plugin/src/main/java/lol/pyr/znpcsplus/conversion/znpcs/model/ZNpcsModel.java index 67ecfa0..987a9b4 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/conversion/znpcs/model/ZNpcsModel.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/conversion/znpcs/model/ZNpcsModel.java @@ -84,4 +84,8 @@ public class ZNpcsModel { public String getSignature() { return signature; } + + public String getGlowName() { + return glowName; + } } \ No newline at end of file