lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed admin enchant icons for artifact and agathions.

Browse Source 
Contributed by CostyKiller.
This commit is contained in:
MobiusDevelopment
2023-01-04 00:02:01 +00:00
parent a368272c9c
commit 77ce851a4c
7 changed files with 77 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java vendored
View File

@@ -391,6 +391,13 @@ public class AdminEnchant implements IAdminCommandHandler
private void showMainPage(Player activeChar, int currentPage) 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) if (currentPage == 1)
{ {
AdminHtml.showAdminHtml(activeChar, "enchant.htm"); AdminHtml.showAdminHtml(activeChar, "enchant.htm");
@@ -402,8 +409,8 @@ public class AdminEnchant implements IAdminCommandHandler
int currentEnch = 0; int currentEnch = 0;
for (int i = 0; i < 21; i++) for (int i = 0; i < 21; i++)
{ {
ItemTemplate item = ItemTable.getInstance().getTemplate(activeChar.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_ARTIFACT1 + i)); final ItemTemplate item = ItemTable.getInstance().getTemplate(player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_ARTIFACT1 + i));
findItem = activeChar.getInventory().getPaperdollItem(Inventory.PAPERDOLL_ARTIFACT1 + i); findItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_ARTIFACT1 + i);
if (findItem != null) // null check for unequipped slots if (findItem != null) // null check for unequipped slots
{ {
currentEnch = findItem.getEnchantLevel(); currentEnch = findItem.getEnchantLevel();
@@ -440,8 +447,8 @@ public class AdminEnchant implements IAdminCommandHandler
int currentEnch = 0; int currentEnch = 0;
for (int i = 0; i < 5; i++) for (int i = 0; i < 5; i++)
{ {
ItemTemplate item = ItemTable.getInstance().getTemplate(activeChar.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_AGATHION1 + i)); final ItemTemplate item = ItemTable.getInstance().getTemplate(player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_AGATHION1 + i));
findItem = activeChar.getInventory().getPaperdollItem(Inventory.PAPERDOLL_AGATHION1 + i); findItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_AGATHION1 + i);
if (findItem != null) // null check for unequipped slots if (findItem != null) // null check for unequipped slots
{ {
currentEnch = findItem.getEnchantLevel(); currentEnch = findItem.getEnchantLevel();

15
L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java vendored
View File

@@ -391,6 +391,13 @@ public class AdminEnchant implements IAdminCommandHandler
private void showMainPage(Player activeChar, int currentPage) 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) if (currentPage == 1)
{ {
AdminHtml.showAdminHtml(activeChar, "enchant.htm"); AdminHtml.showAdminHtml(activeChar, "enchant.htm");
@@ -402,8 +409,8 @@ public class AdminEnchant implements IAdminCommandHandler
int currentEnch = 0; int currentEnch = 0;
for (int i = 0; i < 21; i++) for (int i = 0; i < 21; i++)
{ {
ItemTemplate item = ItemTable.getInstance().getTemplate(activeChar.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_ARTIFACT1 + i)); final ItemTemplate item = ItemTable.getInstance().getTemplate(player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_ARTIFACT1 + i));
findItem = activeChar.getInventory().getPaperdollItem(Inventory.PAPERDOLL_ARTIFACT1 + i); findItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_ARTIFACT1 + i);
if (findItem != null) // null check for unequipped slots if (findItem != null) // null check for unequipped slots
{ {
currentEnch = findItem.getEnchantLevel(); currentEnch = findItem.getEnchantLevel();
@@ -440,8 +447,8 @@ public class AdminEnchant implements IAdminCommandHandler
int currentEnch = 0; int currentEnch = 0;
for (int i = 0; i < 5; i++) for (int i = 0; i < 5; i++)
{ {
ItemTemplate item = ItemTable.getInstance().getTemplate(activeChar.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_AGATHION1 + i)); final ItemTemplate item = ItemTable.getInstance().getTemplate(player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_AGATHION1 + i));
findItem = activeChar.getInventory().getPaperdollItem(Inventory.PAPERDOLL_AGATHION1 + i); findItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_AGATHION1 + i);
if (findItem != null) // null check for unequipped slots if (findItem != null) // null check for unequipped slots
{ {
currentEnch = findItem.getEnchantLevel(); currentEnch = findItem.getEnchantLevel();

15
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java vendored
View File

@@ -391,6 +391,13 @@ public class AdminEnchant implements IAdminCommandHandler
private void showMainPage(Player activeChar, int currentPage) 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) if (currentPage == 1)
{ {
AdminHtml.showAdminHtml(activeChar, "enchant.htm"); AdminHtml.showAdminHtml(activeChar, "enchant.htm");
@@ -402,8 +409,8 @@ public class AdminEnchant implements IAdminCommandHandler
int currentEnch = 0; int currentEnch = 0;
for (int i = 0; i < 21; i++) for (int i = 0; i < 21; i++)
{ {
ItemTemplate item = ItemTable.getInstance().getTemplate(activeChar.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_ARTIFACT1 + i)); final ItemTemplate item = ItemTable.getInstance().getTemplate(player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_ARTIFACT1 + i));
findItem = activeChar.getInventory().getPaperdollItem(Inventory.PAPERDOLL_ARTIFACT1 + i); findItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_ARTIFACT1 + i);
if (findItem != null) // null check for unequipped slots if (findItem != null) // null check for unequipped slots
{ {
currentEnch = findItem.getEnchantLevel(); currentEnch = findItem.getEnchantLevel();
@@ -440,8 +447,8 @@ public class AdminEnchant implements IAdminCommandHandler
int currentEnch = 0; int currentEnch = 0;
for (int i = 0; i < 5; i++) for (int i = 0; i < 5; i++)
{ {
ItemTemplate item = ItemTable.getInstance().getTemplate(activeChar.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_AGATHION1 + i)); final ItemTemplate item = ItemTable.getInstance().getTemplate(player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_AGATHION1 + i));
findItem = activeChar.getInventory().getPaperdollItem(Inventory.PAPERDOLL_AGATHION1 + i); findItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_AGATHION1 + i);
if (findItem != null) // null check for unequipped slots if (findItem != null) // null check for unequipped slots
{ {
currentEnch = findItem.getEnchantLevel(); currentEnch = findItem.getEnchantLevel();

15
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java vendored
View File

@@ -391,6 +391,13 @@ public class AdminEnchant implements IAdminCommandHandler
private void showMainPage(Player activeChar, int currentPage) 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) if (currentPage == 1)
{ {
AdminHtml.showAdminHtml(activeChar, "enchant.htm"); AdminHtml.showAdminHtml(activeChar, "enchant.htm");
@@ -402,8 +409,8 @@ public class AdminEnchant implements IAdminCommandHandler
int currentEnch = 0; int currentEnch = 0;
for (int i = 0; i < 21; i++) for (int i = 0; i < 21; i++)
{ {
ItemTemplate item = ItemTable.getInstance().getTemplate(activeChar.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_ARTIFACT1 + i)); final ItemTemplate item = ItemTable.getInstance().getTemplate(player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_ARTIFACT1 + i));
findItem = activeChar.getInventory().getPaperdollItem(Inventory.PAPERDOLL_ARTIFACT1 + i); findItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_ARTIFACT1 + i);
if (findItem != null) // null check for unequipped slots if (findItem != null) // null check for unequipped slots
{ {
currentEnch = findItem.getEnchantLevel(); currentEnch = findItem.getEnchantLevel();
@@ -440,8 +447,8 @@ public class AdminEnchant implements IAdminCommandHandler
int currentEnch = 0; int currentEnch = 0;
for (int i = 0; i < 5; i++) for (int i = 0; i < 5; i++)
{ {
ItemTemplate item = ItemTable.getInstance().getTemplate(activeChar.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_AGATHION1 + i)); final ItemTemplate item = ItemTable.getInstance().getTemplate(player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_AGATHION1 + i));
findItem = activeChar.getInventory().getPaperdollItem(Inventory.PAPERDOLL_AGATHION1 + i); findItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_AGATHION1 + i);
if (findItem != null) // null check for unequipped slots if (findItem != null) // null check for unequipped slots
{ {
currentEnch = findItem.getEnchantLevel(); currentEnch = findItem.getEnchantLevel();

15
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java vendored
View File

@@ -391,6 +391,13 @@ public class AdminEnchant implements IAdminCommandHandler
private void showMainPage(Player activeChar, int currentPage) 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) if (currentPage == 1)
{ {
AdminHtml.showAdminHtml(activeChar, "enchant.htm"); AdminHtml.showAdminHtml(activeChar, "enchant.htm");
@@ -402,8 +409,8 @@ public class AdminEnchant implements IAdminCommandHandler
int currentEnch = 0; int currentEnch = 0;
for (int i = 0; i < 21; i++) for (int i = 0; i < 21; i++)
{ {
ItemTemplate item = ItemTable.getInstance().getTemplate(activeChar.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_ARTIFACT1 + i)); final ItemTemplate item = ItemTable.getInstance().getTemplate(player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_ARTIFACT1 + i));
findItem = activeChar.getInventory().getPaperdollItem(Inventory.PAPERDOLL_ARTIFACT1 + i); findItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_ARTIFACT1 + i);
if (findItem != null) // null check for unequipped slots if (findItem != null) // null check for unequipped slots
{ {
currentEnch = findItem.getEnchantLevel(); currentEnch = findItem.getEnchantLevel();
@@ -440,8 +447,8 @@ public class AdminEnchant implements IAdminCommandHandler
int currentEnch = 0; int currentEnch = 0;
for (int i = 0; i < 5; i++) for (int i = 0; i < 5; i++)
{ {
ItemTemplate item = ItemTable.getInstance().getTemplate(activeChar.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_AGATHION1 + i)); final ItemTemplate item = ItemTable.getInstance().getTemplate(player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_AGATHION1 + i));
findItem = activeChar.getInventory().getPaperdollItem(Inventory.PAPERDOLL_AGATHION1 + i); findItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_AGATHION1 + i);
if (findItem != null) // null check for unequipped slots if (findItem != null) // null check for unequipped slots
{ {
currentEnch = findItem.getEnchantLevel(); currentEnch = findItem.getEnchantLevel();

15
L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java vendored
View File

@@ -391,6 +391,13 @@ public class AdminEnchant implements IAdminCommandHandler
private void showMainPage(Player activeChar, int currentPage) 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) if (currentPage == 1)
{ {
AdminHtml.showAdminHtml(activeChar, "enchant.htm"); AdminHtml.showAdminHtml(activeChar, "enchant.htm");
@@ -402,8 +409,8 @@ public class AdminEnchant implements IAdminCommandHandler
int currentEnch = 0; int currentEnch = 0;
for (int i = 0; i < 21; i++) for (int i = 0; i < 21; i++)
{ {
ItemTemplate item = ItemTable.getInstance().getTemplate(activeChar.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_ARTIFACT1 + i)); final ItemTemplate item = ItemTable.getInstance().getTemplate(player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_ARTIFACT1 + i));
findItem = activeChar.getInventory().getPaperdollItem(Inventory.PAPERDOLL_ARTIFACT1 + i); findItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_ARTIFACT1 + i);
if (findItem != null) // null check for unequipped slots if (findItem != null) // null check for unequipped slots
{ {
currentEnch = findItem.getEnchantLevel(); currentEnch = findItem.getEnchantLevel();
@@ -440,8 +447,8 @@ public class AdminEnchant implements IAdminCommandHandler
int currentEnch = 0; int currentEnch = 0;
for (int i = 0; i < 5; i++) for (int i = 0; i < 5; i++)
{ {
ItemTemplate item = ItemTable.getInstance().getTemplate(activeChar.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_AGATHION1 + i)); final ItemTemplate item = ItemTable.getInstance().getTemplate(player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_AGATHION1 + i));
findItem = activeChar.getInventory().getPaperdollItem(Inventory.PAPERDOLL_AGATHION1 + i); findItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_AGATHION1 + i);
if (findItem != null) // null check for unequipped slots if (findItem != null) // null check for unequipped slots
{ {
currentEnch = findItem.getEnchantLevel(); currentEnch = findItem.getEnchantLevel();

15
L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java vendored
View File

@@ -391,6 +391,13 @@ public class AdminEnchant implements IAdminCommandHandler
private void showMainPage(Player activeChar, int currentPage) 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) if (currentPage == 1)
{ {
AdminHtml.showAdminHtml(activeChar, "enchant.htm"); AdminHtml.showAdminHtml(activeChar, "enchant.htm");
@@ -402,8 +409,8 @@ public class AdminEnchant implements IAdminCommandHandler
int currentEnch = 0; int currentEnch = 0;
for (int i = 0; i < 21; i++) for (int i = 0; i < 21; i++)
{ {
ItemTemplate item = ItemTable.getInstance().getTemplate(activeChar.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_ARTIFACT1 + i)); final ItemTemplate item = ItemTable.getInstance().getTemplate(player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_ARTIFACT1 + i));
findItem = activeChar.getInventory().getPaperdollItem(Inventory.PAPERDOLL_ARTIFACT1 + i); findItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_ARTIFACT1 + i);
if (findItem != null) // null check for unequipped slots if (findItem != null) // null check for unequipped slots
{ {
currentEnch = findItem.getEnchantLevel(); currentEnch = findItem.getEnchantLevel();
@@ -440,8 +447,8 @@ public class AdminEnchant implements IAdminCommandHandler
int currentEnch = 0; int currentEnch = 0;
for (int i = 0; i < 5; i++) for (int i = 0; i < 5; i++)
{ {
ItemTemplate item = ItemTable.getInstance().getTemplate(activeChar.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_AGATHION1 + i)); final ItemTemplate item = ItemTable.getInstance().getTemplate(player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_AGATHION1 + i));
findItem = activeChar.getInventory().getPaperdollItem(Inventory.PAPERDOLL_AGATHION1 + i); findItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_AGATHION1 + i);
if (findItem != null) // null check for unequipped slots if (findItem != null) // null check for unequipped slots
{ {
currentEnch = findItem.getEnchantLevel(); currentEnch = findItem.getEnchantLevel();