Fixed AdminEnchant NPE from null icons.
This commit is contained in:
parent
226d559381
commit
10fa4cf52b
@ -416,7 +416,7 @@ public class AdminEnchant implements IAdminCommandHandler
|
|||||||
}
|
}
|
||||||
else
|
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 enchant value is 0 - show "blank instead of 0
|
||||||
if (currentEnch != 0)
|
if (currentEnch != 0)
|
||||||
{
|
{
|
||||||
@ -454,7 +454,7 @@ public class AdminEnchant implements IAdminCommandHandler
|
|||||||
}
|
}
|
||||||
else
|
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 enchant value is 0 - show "blank instead of 0
|
||||||
if (currentEnch != 0)
|
if (currentEnch != 0)
|
||||||
{
|
{
|
||||||
|
@ -416,7 +416,7 @@ public class AdminEnchant implements IAdminCommandHandler
|
|||||||
}
|
}
|
||||||
else
|
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 enchant value is 0 - show "blank instead of 0
|
||||||
if (currentEnch != 0)
|
if (currentEnch != 0)
|
||||||
{
|
{
|
||||||
@ -454,7 +454,7 @@ public class AdminEnchant implements IAdminCommandHandler
|
|||||||
}
|
}
|
||||||
else
|
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 enchant value is 0 - show "blank instead of 0
|
||||||
if (currentEnch != 0)
|
if (currentEnch != 0)
|
||||||
{
|
{
|
||||||
|
@ -416,7 +416,7 @@ public class AdminEnchant implements IAdminCommandHandler
|
|||||||
}
|
}
|
||||||
else
|
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 enchant value is 0 - show "blank instead of 0
|
||||||
if (currentEnch != 0)
|
if (currentEnch != 0)
|
||||||
{
|
{
|
||||||
@ -454,7 +454,7 @@ public class AdminEnchant implements IAdminCommandHandler
|
|||||||
}
|
}
|
||||||
else
|
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 enchant value is 0 - show "blank instead of 0
|
||||||
if (currentEnch != 0)
|
if (currentEnch != 0)
|
||||||
{
|
{
|
||||||
|
@ -416,7 +416,7 @@ public class AdminEnchant implements IAdminCommandHandler
|
|||||||
}
|
}
|
||||||
else
|
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 enchant value is 0 - show "blank instead of 0
|
||||||
if (currentEnch != 0)
|
if (currentEnch != 0)
|
||||||
{
|
{
|
||||||
@ -454,7 +454,7 @@ public class AdminEnchant implements IAdminCommandHandler
|
|||||||
}
|
}
|
||||||
else
|
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 enchant value is 0 - show "blank instead of 0
|
||||||
if (currentEnch != 0)
|
if (currentEnch != 0)
|
||||||
{
|
{
|
||||||
|
@ -416,7 +416,7 @@ public class AdminEnchant implements IAdminCommandHandler
|
|||||||
}
|
}
|
||||||
else
|
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 enchant value is 0 - show "blank instead of 0
|
||||||
if (currentEnch != 0)
|
if (currentEnch != 0)
|
||||||
{
|
{
|
||||||
@ -454,7 +454,7 @@ public class AdminEnchant implements IAdminCommandHandler
|
|||||||
}
|
}
|
||||||
else
|
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 enchant value is 0 - show "blank instead of 0
|
||||||
if (currentEnch != 0)
|
if (currentEnch != 0)
|
||||||
{
|
{
|
||||||
|
@ -416,7 +416,7 @@ public class AdminEnchant implements IAdminCommandHandler
|
|||||||
}
|
}
|
||||||
else
|
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 enchant value is 0 - show "blank instead of 0
|
||||||
if (currentEnch != 0)
|
if (currentEnch != 0)
|
||||||
{
|
{
|
||||||
@ -454,7 +454,7 @@ public class AdminEnchant implements IAdminCommandHandler
|
|||||||
}
|
}
|
||||||
else
|
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 enchant value is 0 - show "blank instead of 0
|
||||||
if (currentEnch != 0)
|
if (currentEnch != 0)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user