From 10fa4cf52baebd797a0a206fdc9fd65fb954652f Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 21 Jan 2022 03:00:39 +0000 Subject: [PATCH] Fixed AdminEnchant NPE from null icons. --- .../scripts/handlers/admincommandhandlers/AdminEnchant.java | 4 ++-- .../scripts/handlers/admincommandhandlers/AdminEnchant.java | 4 ++-- .../scripts/handlers/admincommandhandlers/AdminEnchant.java | 4 ++-- .../scripts/handlers/admincommandhandlers/AdminEnchant.java | 4 ++-- .../scripts/handlers/admincommandhandlers/AdminEnchant.java | 4 ++-- .../scripts/handlers/admincommandhandlers/AdminEnchant.java | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 680745b29d..fbced8d33c 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -416,7 +416,7 @@ public class AdminEnchant implements IAdminCommandHandler } else { - getVars = getVars.replace("%ar" + i + "_icon%", item.getIcon()); + getVars = getVars.replace("%ar" + i + "_icon%", item.getIcon() == null ? "icon.etc_question_mark_i00" : item.getIcon()); // if enchant value is 0 - show "blank instead of 0 if (currentEnch != 0) { @@ -454,7 +454,7 @@ public class AdminEnchant implements IAdminCommandHandler } else { - getVars = getVars.replace("%ag" + i + "_icon%", item.getIcon()); + getVars = getVars.replace("%ag" + i + "_icon%", item.getIcon() == null ? "icon.etc_question_mark_i00" : item.getIcon()); // if enchant value is 0 - show "blank instead of 0 if (currentEnch != 0) { diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 680745b29d..fbced8d33c 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -416,7 +416,7 @@ public class AdminEnchant implements IAdminCommandHandler } else { - getVars = getVars.replace("%ar" + i + "_icon%", item.getIcon()); + getVars = getVars.replace("%ar" + i + "_icon%", item.getIcon() == null ? "icon.etc_question_mark_i00" : item.getIcon()); // if enchant value is 0 - show "blank instead of 0 if (currentEnch != 0) { @@ -454,7 +454,7 @@ public class AdminEnchant implements IAdminCommandHandler } else { - getVars = getVars.replace("%ag" + i + "_icon%", item.getIcon()); + getVars = getVars.replace("%ag" + i + "_icon%", item.getIcon() == null ? "icon.etc_question_mark_i00" : item.getIcon()); // if enchant value is 0 - show "blank instead of 0 if (currentEnch != 0) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 680745b29d..fbced8d33c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -416,7 +416,7 @@ public class AdminEnchant implements IAdminCommandHandler } else { - getVars = getVars.replace("%ar" + i + "_icon%", item.getIcon()); + getVars = getVars.replace("%ar" + i + "_icon%", item.getIcon() == null ? "icon.etc_question_mark_i00" : item.getIcon()); // if enchant value is 0 - show "blank instead of 0 if (currentEnch != 0) { @@ -454,7 +454,7 @@ public class AdminEnchant implements IAdminCommandHandler } else { - getVars = getVars.replace("%ag" + i + "_icon%", item.getIcon()); + getVars = getVars.replace("%ag" + i + "_icon%", item.getIcon() == null ? "icon.etc_question_mark_i00" : item.getIcon()); // if enchant value is 0 - show "blank instead of 0 if (currentEnch != 0) { diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 680745b29d..fbced8d33c 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -416,7 +416,7 @@ public class AdminEnchant implements IAdminCommandHandler } else { - getVars = getVars.replace("%ar" + i + "_icon%", item.getIcon()); + getVars = getVars.replace("%ar" + i + "_icon%", item.getIcon() == null ? "icon.etc_question_mark_i00" : item.getIcon()); // if enchant value is 0 - show "blank instead of 0 if (currentEnch != 0) { @@ -454,7 +454,7 @@ public class AdminEnchant implements IAdminCommandHandler } else { - getVars = getVars.replace("%ag" + i + "_icon%", item.getIcon()); + getVars = getVars.replace("%ag" + i + "_icon%", item.getIcon() == null ? "icon.etc_question_mark_i00" : item.getIcon()); // if enchant value is 0 - show "blank instead of 0 if (currentEnch != 0) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 680745b29d..fbced8d33c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -416,7 +416,7 @@ public class AdminEnchant implements IAdminCommandHandler } else { - getVars = getVars.replace("%ar" + i + "_icon%", item.getIcon()); + getVars = getVars.replace("%ar" + i + "_icon%", item.getIcon() == null ? "icon.etc_question_mark_i00" : item.getIcon()); // if enchant value is 0 - show "blank instead of 0 if (currentEnch != 0) { @@ -454,7 +454,7 @@ public class AdminEnchant implements IAdminCommandHandler } else { - getVars = getVars.replace("%ag" + i + "_icon%", item.getIcon()); + getVars = getVars.replace("%ag" + i + "_icon%", item.getIcon() == null ? "icon.etc_question_mark_i00" : item.getIcon()); // if enchant value is 0 - show "blank instead of 0 if (currentEnch != 0) { diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 680745b29d..fbced8d33c 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -416,7 +416,7 @@ public class AdminEnchant implements IAdminCommandHandler } else { - getVars = getVars.replace("%ar" + i + "_icon%", item.getIcon()); + getVars = getVars.replace("%ar" + i + "_icon%", item.getIcon() == null ? "icon.etc_question_mark_i00" : item.getIcon()); // if enchant value is 0 - show "blank instead of 0 if (currentEnch != 0) { @@ -454,7 +454,7 @@ public class AdminEnchant implements IAdminCommandHandler } else { - getVars = getVars.replace("%ag" + i + "_icon%", item.getIcon()); + getVars = getVars.replace("%ag" + i + "_icon%", item.getIcon() == null ? "icon.etc_question_mark_i00" : item.getIcon()); // if enchant value is 0 - show "blank instead of 0 if (currentEnch != 0) {