Fix null

Winds-Studio · Dec 16, 2024 · 73a60e8 · 73a60e8
1 parent 8edec91
commit 73a60e8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/DeathMessagesLegacy/src/main/java/dev/mrshawn/deathmessages/utils/EntityUtil.java b/DeathMessagesLegacy/src/main/java/dev/mrshawn/deathmessages/utils/EntityUtil.java
@@ -102,13 +102,13 @@ public static String getConfigNodeByEntity(Entity e) {
     public static Component getEntityCustomNameComponent(Entity e) {
         final String rawName = Messages.getInstance().getConfig().getString("Mobs." + EntityUtil.getConfigNodeByEntity(e));
 
-        return Util.convertFromLegacy(rawName);
+        return Util.convertFromLegacy(rawName != null ? rawName : "");
     }
 
     public static String getEntityCustomName(Entity e) {
         final String rawName = Messages.getInstance().getConfig().getString("Mobs." + EntityUtil.getConfigNodeByEntity(e));
 
-        return PlainTextComponentSerializer.plainText().serialize(Util.convertFromLegacy(rawName));
+        return PlainTextComponentSerializer.plainText().serialize(Util.convertFromLegacy(rawName != null ? rawName : ""));
     }
 
     // Reduce directly detect hasOwner as few as possible just makes it looks better

diff --git a/DeathMessagesModern/src/main/java/dev/mrshawn/deathmessages/utils/EntityUtil.java b/DeathMessagesModern/src/main/java/dev/mrshawn/deathmessages/utils/EntityUtil.java
@@ -102,13 +102,13 @@ public static String getConfigNodeByEntity(Entity e) {
     public static Component getEntityCustomNameComponent(Entity e) {
         final String rawName = Messages.getInstance().getConfig().getString("Mobs." + EntityUtil.getConfigNodeByEntity(e));
 
-        return Util.convertFromLegacy(rawName);
+        return Util.convertFromLegacy(rawName != null ? rawName : "");
     }
 
     public static String getEntityCustomName(Entity e) {
         final String rawName = Messages.getInstance().getConfig().getString("Mobs." + EntityUtil.getConfigNodeByEntity(e));
 
-        return PlainTextComponentSerializer.plainText().serialize(Util.convertFromLegacy(rawName));
+        return PlainTextComponentSerializer.plainText().serialize(Util.convertFromLegacy(rawName != null ? rawName : ""));
     }
 
     // Reduce directly detect hasOwner as few as possible just makes it looks better