From 77ce851a4cf6186e4f1988538848bcf4b9bf5a40 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 4 Jan 2023 00:02:01 +0000 Subject: [PATCH] Fixed admin enchant icons for artifact and agathions. Contributed by CostyKiller. --- .../admincommandhandlers/AdminEnchant.java | 15 +++++++++++---- .../admincommandhandlers/AdminEnchant.java | 15 +++++++++++---- .../admincommandhandlers/AdminEnchant.java | 15 +++++++++++---- .../admincommandhandlers/AdminEnchant.java | 15 +++++++++++---- .../admincommandhandlers/AdminEnchant.java | 15 +++++++++++---- .../admincommandhandlers/AdminEnchant.java | 15 +++++++++++---- .../admincommandhandlers/AdminEnchant.java | 15 +++++++++++---- 7 files changed, 77 insertions(+), 28 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 8d6f4b35f5..0cb07147a4 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 @@ -391,6 +391,13 @@ public class AdminEnchant implements IAdminCommandHandler private void showMainPage(Player activeChar, int currentPage) { + final Player player = activeChar.getTarget() != null ? activeChar.getTarget().getActingPlayer() : activeChar; + if (player == null) + { + activeChar.sendPacket(SystemMessageId.INVALID_TARGET); + return; + } + if (currentPage == 1) { AdminHtml.showAdminHtml(activeChar, "enchant.htm"); @@ -402,8 +409,8 @@ public class AdminEnchant implements IAdminCommandHandler int currentEnch = 0; for (int i = 0; i < 21; i++) { - ItemTemplate item = ItemTable.getInstance().getTemplate(activeChar.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_ARTIFACT1 + i)); - findItem = activeChar.getInventory().getPaperdollItem(Inventory.PAPERDOLL_ARTIFACT1 + i); + final ItemTemplate item = ItemTable.getInstance().getTemplate(player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_ARTIFACT1 + i)); + findItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_ARTIFACT1 + i); if (findItem != null) // null check for unequipped slots { currentEnch = findItem.getEnchantLevel(); @@ -440,8 +447,8 @@ public class AdminEnchant implements IAdminCommandHandler int currentEnch = 0; for (int i = 0; i < 5; i++) { - ItemTemplate item = ItemTable.getInstance().getTemplate(activeChar.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_AGATHION1 + i)); - findItem = activeChar.getInventory().getPaperdollItem(Inventory.PAPERDOLL_AGATHION1 + i); + final ItemTemplate item = ItemTable.getInstance().getTemplate(player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_AGATHION1 + i)); + findItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_AGATHION1 + i); if (findItem != null) // null check for unequipped slots { currentEnch = findItem.getEnchantLevel(); 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 8d6f4b35f5..0cb07147a4 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 @@ -391,6 +391,13 @@ public class AdminEnchant implements IAdminCommandHandler private void showMainPage(Player activeChar, int currentPage) { + final Player player = activeChar.getTarget() != null ? activeChar.getTarget().getActingPlayer() : activeChar; + if (player == null) + { + activeChar.sendPacket(SystemMessageId.INVALID_TARGET); + return; + } + if (currentPage == 1) { AdminHtml.showAdminHtml(activeChar, "enchant.htm"); @@ -402,8 +409,8 @@ public class AdminEnchant implements IAdminCommandHandler int currentEnch = 0; for (int i = 0; i < 21; i++) { - ItemTemplate item = ItemTable.getInstance().getTemplate(activeChar.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_ARTIFACT1 + i)); - findItem = activeChar.getInventory().getPaperdollItem(Inventory.PAPERDOLL_ARTIFACT1 + i); + final ItemTemplate item = ItemTable.getInstance().getTemplate(player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_ARTIFACT1 + i)); + findItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_ARTIFACT1 + i); if (findItem != null) // null check for unequipped slots { currentEnch = findItem.getEnchantLevel(); @@ -440,8 +447,8 @@ public class AdminEnchant implements IAdminCommandHandler int currentEnch = 0; for (int i = 0; i < 5; i++) { - ItemTemplate item = ItemTable.getInstance().getTemplate(activeChar.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_AGATHION1 + i)); - findItem = activeChar.getInventory().getPaperdollItem(Inventory.PAPERDOLL_AGATHION1 + i); + final ItemTemplate item = ItemTable.getInstance().getTemplate(player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_AGATHION1 + i)); + findItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_AGATHION1 + i); if (findItem != null) // null check for unequipped slots { currentEnch = findItem.getEnchantLevel(); 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 8d6f4b35f5..0cb07147a4 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 @@ -391,6 +391,13 @@ public class AdminEnchant implements IAdminCommandHandler private void showMainPage(Player activeChar, int currentPage) { + final Player player = activeChar.getTarget() != null ? activeChar.getTarget().getActingPlayer() : activeChar; + if (player == null) + { + activeChar.sendPacket(SystemMessageId.INVALID_TARGET); + return; + } + if (currentPage == 1) { AdminHtml.showAdminHtml(activeChar, "enchant.htm"); @@ -402,8 +409,8 @@ public class AdminEnchant implements IAdminCommandHandler int currentEnch = 0; for (int i = 0; i < 21; i++) { - ItemTemplate item = ItemTable.getInstance().getTemplate(activeChar.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_ARTIFACT1 + i)); - findItem = activeChar.getInventory().getPaperdollItem(Inventory.PAPERDOLL_ARTIFACT1 + i); + final ItemTemplate item = ItemTable.getInstance().getTemplate(player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_ARTIFACT1 + i)); + findItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_ARTIFACT1 + i); if (findItem != null) // null check for unequipped slots { currentEnch = findItem.getEnchantLevel(); @@ -440,8 +447,8 @@ public class AdminEnchant implements IAdminCommandHandler int currentEnch = 0; for (int i = 0; i < 5; i++) { - ItemTemplate item = ItemTable.getInstance().getTemplate(activeChar.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_AGATHION1 + i)); - findItem = activeChar.getInventory().getPaperdollItem(Inventory.PAPERDOLL_AGATHION1 + i); + final ItemTemplate item = ItemTable.getInstance().getTemplate(player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_AGATHION1 + i)); + findItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_AGATHION1 + i); if (findItem != null) // null check for unequipped slots { currentEnch = findItem.getEnchantLevel(); 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 8d6f4b35f5..0cb07147a4 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 @@ -391,6 +391,13 @@ public class AdminEnchant implements IAdminCommandHandler private void showMainPage(Player activeChar, int currentPage) { + final Player player = activeChar.getTarget() != null ? activeChar.getTarget().getActingPlayer() : activeChar; + if (player == null) + { + activeChar.sendPacket(SystemMessageId.INVALID_TARGET); + return; + } + if (currentPage == 1) { AdminHtml.showAdminHtml(activeChar, "enchant.htm"); @@ -402,8 +409,8 @@ public class AdminEnchant implements IAdminCommandHandler int currentEnch = 0; for (int i = 0; i < 21; i++) { - ItemTemplate item = ItemTable.getInstance().getTemplate(activeChar.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_ARTIFACT1 + i)); - findItem = activeChar.getInventory().getPaperdollItem(Inventory.PAPERDOLL_ARTIFACT1 + i); + final ItemTemplate item = ItemTable.getInstance().getTemplate(player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_ARTIFACT1 + i)); + findItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_ARTIFACT1 + i); if (findItem != null) // null check for unequipped slots { currentEnch = findItem.getEnchantLevel(); @@ -440,8 +447,8 @@ public class AdminEnchant implements IAdminCommandHandler int currentEnch = 0; for (int i = 0; i < 5; i++) { - ItemTemplate item = ItemTable.getInstance().getTemplate(activeChar.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_AGATHION1 + i)); - findItem = activeChar.getInventory().getPaperdollItem(Inventory.PAPERDOLL_AGATHION1 + i); + final ItemTemplate item = ItemTable.getInstance().getTemplate(player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_AGATHION1 + i)); + findItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_AGATHION1 + i); if (findItem != null) // null check for unequipped slots { currentEnch = findItem.getEnchantLevel(); 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 8d6f4b35f5..0cb07147a4 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 @@ -391,6 +391,13 @@ public class AdminEnchant implements IAdminCommandHandler private void showMainPage(Player activeChar, int currentPage) { + final Player player = activeChar.getTarget() != null ? activeChar.getTarget().getActingPlayer() : activeChar; + if (player == null) + { + activeChar.sendPacket(SystemMessageId.INVALID_TARGET); + return; + } + if (currentPage == 1) { AdminHtml.showAdminHtml(activeChar, "enchant.htm"); @@ -402,8 +409,8 @@ public class AdminEnchant implements IAdminCommandHandler int currentEnch = 0; for (int i = 0; i < 21; i++) { - ItemTemplate item = ItemTable.getInstance().getTemplate(activeChar.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_ARTIFACT1 + i)); - findItem = activeChar.getInventory().getPaperdollItem(Inventory.PAPERDOLL_ARTIFACT1 + i); + final ItemTemplate item = ItemTable.getInstance().getTemplate(player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_ARTIFACT1 + i)); + findItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_ARTIFACT1 + i); if (findItem != null) // null check for unequipped slots { currentEnch = findItem.getEnchantLevel(); @@ -440,8 +447,8 @@ public class AdminEnchant implements IAdminCommandHandler int currentEnch = 0; for (int i = 0; i < 5; i++) { - ItemTemplate item = ItemTable.getInstance().getTemplate(activeChar.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_AGATHION1 + i)); - findItem = activeChar.getInventory().getPaperdollItem(Inventory.PAPERDOLL_AGATHION1 + i); + final ItemTemplate item = ItemTable.getInstance().getTemplate(player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_AGATHION1 + i)); + findItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_AGATHION1 + i); if (findItem != null) // null check for unequipped slots { currentEnch = findItem.getEnchantLevel(); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 8d6f4b35f5..0cb07147a4 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -391,6 +391,13 @@ public class AdminEnchant implements IAdminCommandHandler private void showMainPage(Player activeChar, int currentPage) { + final Player player = activeChar.getTarget() != null ? activeChar.getTarget().getActingPlayer() : activeChar; + if (player == null) + { + activeChar.sendPacket(SystemMessageId.INVALID_TARGET); + return; + } + if (currentPage == 1) { AdminHtml.showAdminHtml(activeChar, "enchant.htm"); @@ -402,8 +409,8 @@ public class AdminEnchant implements IAdminCommandHandler int currentEnch = 0; for (int i = 0; i < 21; i++) { - ItemTemplate item = ItemTable.getInstance().getTemplate(activeChar.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_ARTIFACT1 + i)); - findItem = activeChar.getInventory().getPaperdollItem(Inventory.PAPERDOLL_ARTIFACT1 + i); + final ItemTemplate item = ItemTable.getInstance().getTemplate(player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_ARTIFACT1 + i)); + findItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_ARTIFACT1 + i); if (findItem != null) // null check for unequipped slots { currentEnch = findItem.getEnchantLevel(); @@ -440,8 +447,8 @@ public class AdminEnchant implements IAdminCommandHandler int currentEnch = 0; for (int i = 0; i < 5; i++) { - ItemTemplate item = ItemTable.getInstance().getTemplate(activeChar.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_AGATHION1 + i)); - findItem = activeChar.getInventory().getPaperdollItem(Inventory.PAPERDOLL_AGATHION1 + i); + final ItemTemplate item = ItemTable.getInstance().getTemplate(player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_AGATHION1 + i)); + findItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_AGATHION1 + i); if (findItem != null) // null check for unequipped slots { currentEnch = findItem.getEnchantLevel(); diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 8d6f4b35f5..0cb07147a4 100644 --- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -391,6 +391,13 @@ public class AdminEnchant implements IAdminCommandHandler private void showMainPage(Player activeChar, int currentPage) { + final Player player = activeChar.getTarget() != null ? activeChar.getTarget().getActingPlayer() : activeChar; + if (player == null) + { + activeChar.sendPacket(SystemMessageId.INVALID_TARGET); + return; + } + if (currentPage == 1) { AdminHtml.showAdminHtml(activeChar, "enchant.htm"); @@ -402,8 +409,8 @@ public class AdminEnchant implements IAdminCommandHandler int currentEnch = 0; for (int i = 0; i < 21; i++) { - ItemTemplate item = ItemTable.getInstance().getTemplate(activeChar.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_ARTIFACT1 + i)); - findItem = activeChar.getInventory().getPaperdollItem(Inventory.PAPERDOLL_ARTIFACT1 + i); + final ItemTemplate item = ItemTable.getInstance().getTemplate(player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_ARTIFACT1 + i)); + findItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_ARTIFACT1 + i); if (findItem != null) // null check for unequipped slots { currentEnch = findItem.getEnchantLevel(); @@ -440,8 +447,8 @@ public class AdminEnchant implements IAdminCommandHandler int currentEnch = 0; for (int i = 0; i < 5; i++) { - ItemTemplate item = ItemTable.getInstance().getTemplate(activeChar.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_AGATHION1 + i)); - findItem = activeChar.getInventory().getPaperdollItem(Inventory.PAPERDOLL_AGATHION1 + i); + final ItemTemplate item = ItemTable.getInstance().getTemplate(player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_AGATHION1 + i)); + findItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_AGATHION1 + i); if (findItem != null) // null check for unequipped slots { currentEnch = findItem.getEnchantLevel();