From 3b3b6985842283df492f5519b4100636d2aedb63 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 29 May 2020 21:23:45 +0000 Subject: [PATCH] Fixed nickname color item handler. Contributed by Sahar. --- .../data/scripts/handlers/itemhandlers/NicknameColor.java | 2 +- .../network/clientpackets/RequestChangeNicknameColor.java | 6 +++--- .../serverpackets/ExRequestChangeNicknameColor.java | 8 ++++---- .../data/scripts/handlers/itemhandlers/NicknameColor.java | 2 +- .../network/clientpackets/RequestChangeNicknameColor.java | 6 +++--- .../serverpackets/ExRequestChangeNicknameColor.java | 8 ++++---- .../data/scripts/handlers/itemhandlers/NicknameColor.java | 2 +- .../network/clientpackets/RequestChangeNicknameColor.java | 6 +++--- .../serverpackets/ExRequestChangeNicknameColor.java | 8 ++++---- .../data/scripts/handlers/itemhandlers/NicknameColor.java | 2 +- .../network/clientpackets/RequestChangeNicknameColor.java | 6 +++--- .../serverpackets/ExRequestChangeNicknameColor.java | 8 ++++---- .../data/scripts/handlers/itemhandlers/NicknameColor.java | 2 +- .../network/clientpackets/RequestChangeNicknameColor.java | 6 +++--- .../serverpackets/ExRequestChangeNicknameColor.java | 8 ++++---- .../data/scripts/handlers/itemhandlers/NicknameColor.java | 2 +- .../network/clientpackets/RequestChangeNicknameColor.java | 6 +++--- .../serverpackets/ExRequestChangeNicknameColor.java | 8 ++++---- .../data/scripts/handlers/itemhandlers/NicknameColor.java | 2 +- .../network/clientpackets/RequestChangeNicknameColor.java | 6 +++--- .../serverpackets/ExRequestChangeNicknameColor.java | 8 ++++---- .../data/scripts/handlers/itemhandlers/NicknameColor.java | 2 +- .../network/clientpackets/RequestChangeNicknameColor.java | 6 +++--- .../serverpackets/ExRequestChangeNicknameColor.java | 8 ++++---- .../data/scripts/handlers/itemhandlers/NicknameColor.java | 2 +- .../network/clientpackets/RequestChangeNicknameColor.java | 6 +++--- .../serverpackets/ExRequestChangeNicknameColor.java | 8 ++++---- .../data/scripts/handlers/itemhandlers/NicknameColor.java | 2 +- .../network/clientpackets/RequestChangeNicknameColor.java | 6 +++--- .../serverpackets/ExRequestChangeNicknameColor.java | 8 ++++---- .../data/scripts/handlers/itemhandlers/NicknameColor.java | 2 +- .../network/clientpackets/RequestChangeNicknameColor.java | 6 +++--- .../serverpackets/ExRequestChangeNicknameColor.java | 8 ++++---- .../data/scripts/handlers/itemhandlers/NicknameColor.java | 2 +- .../network/clientpackets/RequestChangeNicknameColor.java | 6 +++--- .../serverpackets/ExRequestChangeNicknameColor.java | 8 ++++---- .../data/scripts/handlers/itemhandlers/NicknameColor.java | 2 +- .../network/clientpackets/RequestChangeNicknameColor.java | 6 +++--- .../serverpackets/ExRequestChangeNicknameColor.java | 8 ++++---- .../data/scripts/handlers/itemhandlers/NicknameColor.java | 2 +- .../network/clientpackets/RequestChangeNicknameColor.java | 6 +++--- .../serverpackets/ExRequestChangeNicknameColor.java | 8 ++++---- .../data/scripts/handlers/itemhandlers/NicknameColor.java | 2 +- .../network/clientpackets/RequestChangeNicknameColor.java | 6 +++--- .../serverpackets/ExRequestChangeNicknameColor.java | 8 ++++---- 45 files changed, 120 insertions(+), 120 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index a44d439586..5cc4bbdb45 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -33,7 +33,7 @@ public class NicknameColor implements IItemHandler return false; } - playable.sendPacket(new ExRequestChangeNicknameColor(item.getObjectId())); + playable.sendPacket(new ExRequestChangeNicknameColor(item.getId())); return true; } } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index f0270fe7a8..0cfe6a7076 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -41,7 +41,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket }; private int _colorNum; - private int _itemObjectId; + private int _itemId; private String _title; @Override @@ -49,7 +49,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket { _colorNum = packet.readD(); _title = packet.readS(); - _itemObjectId = packet.readD(); + _itemId = packet.readD(); return true; } @@ -67,7 +67,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket return; } - final ItemInstance item = player.getInventory().getItemByObjectId(_itemObjectId); + final ItemInstance item = player.getInventory().getItemByItemId(_itemId); if ((item == null) || (item.getEtcItem() == null) || (item.getEtcItem().getHandlerName() == null) || !item.getEtcItem().getHandlerName().equalsIgnoreCase("NicknameColor")) { return; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index ed027fe297..cc4f7ce1d8 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { - private final int _itemObjectId; + private final int _itemId; - public ExRequestChangeNicknameColor(int itemObjectId) + public ExRequestChangeNicknameColor(int itemId) { - _itemObjectId = itemObjectId; + _itemId = itemId; } @Override @@ -36,7 +36,7 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemObjectId); + packet.writeD(_itemId); return true; } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index a44d439586..5cc4bbdb45 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -33,7 +33,7 @@ public class NicknameColor implements IItemHandler return false; } - playable.sendPacket(new ExRequestChangeNicknameColor(item.getObjectId())); + playable.sendPacket(new ExRequestChangeNicknameColor(item.getId())); return true; } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index f0270fe7a8..0cfe6a7076 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -41,7 +41,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket }; private int _colorNum; - private int _itemObjectId; + private int _itemId; private String _title; @Override @@ -49,7 +49,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket { _colorNum = packet.readD(); _title = packet.readS(); - _itemObjectId = packet.readD(); + _itemId = packet.readD(); return true; } @@ -67,7 +67,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket return; } - final ItemInstance item = player.getInventory().getItemByObjectId(_itemObjectId); + final ItemInstance item = player.getInventory().getItemByItemId(_itemId); if ((item == null) || (item.getEtcItem() == null) || (item.getEtcItem().getHandlerName() == null) || !item.getEtcItem().getHandlerName().equalsIgnoreCase("NicknameColor")) { return; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index ed027fe297..cc4f7ce1d8 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { - private final int _itemObjectId; + private final int _itemId; - public ExRequestChangeNicknameColor(int itemObjectId) + public ExRequestChangeNicknameColor(int itemId) { - _itemObjectId = itemObjectId; + _itemId = itemId; } @Override @@ -36,7 +36,7 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemObjectId); + packet.writeD(_itemId); return true; } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index a44d439586..5cc4bbdb45 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -33,7 +33,7 @@ public class NicknameColor implements IItemHandler return false; } - playable.sendPacket(new ExRequestChangeNicknameColor(item.getObjectId())); + playable.sendPacket(new ExRequestChangeNicknameColor(item.getId())); return true; } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index f0270fe7a8..0cfe6a7076 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -41,7 +41,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket }; private int _colorNum; - private int _itemObjectId; + private int _itemId; private String _title; @Override @@ -49,7 +49,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket { _colorNum = packet.readD(); _title = packet.readS(); - _itemObjectId = packet.readD(); + _itemId = packet.readD(); return true; } @@ -67,7 +67,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket return; } - final ItemInstance item = player.getInventory().getItemByObjectId(_itemObjectId); + final ItemInstance item = player.getInventory().getItemByItemId(_itemId); if ((item == null) || (item.getEtcItem() == null) || (item.getEtcItem().getHandlerName() == null) || !item.getEtcItem().getHandlerName().equalsIgnoreCase("NicknameColor")) { return; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index ed027fe297..cc4f7ce1d8 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { - private final int _itemObjectId; + private final int _itemId; - public ExRequestChangeNicknameColor(int itemObjectId) + public ExRequestChangeNicknameColor(int itemId) { - _itemObjectId = itemObjectId; + _itemId = itemId; } @Override @@ -36,7 +36,7 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemObjectId); + packet.writeD(_itemId); return true; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index a44d439586..5cc4bbdb45 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -33,7 +33,7 @@ public class NicknameColor implements IItemHandler return false; } - playable.sendPacket(new ExRequestChangeNicknameColor(item.getObjectId())); + playable.sendPacket(new ExRequestChangeNicknameColor(item.getId())); return true; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index f0270fe7a8..0cfe6a7076 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -41,7 +41,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket }; private int _colorNum; - private int _itemObjectId; + private int _itemId; private String _title; @Override @@ -49,7 +49,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket { _colorNum = packet.readD(); _title = packet.readS(); - _itemObjectId = packet.readD(); + _itemId = packet.readD(); return true; } @@ -67,7 +67,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket return; } - final ItemInstance item = player.getInventory().getItemByObjectId(_itemObjectId); + final ItemInstance item = player.getInventory().getItemByItemId(_itemId); if ((item == null) || (item.getEtcItem() == null) || (item.getEtcItem().getHandlerName() == null) || !item.getEtcItem().getHandlerName().equalsIgnoreCase("NicknameColor")) { return; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index ed027fe297..cc4f7ce1d8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { - private final int _itemObjectId; + private final int _itemId; - public ExRequestChangeNicknameColor(int itemObjectId) + public ExRequestChangeNicknameColor(int itemId) { - _itemObjectId = itemObjectId; + _itemId = itemId; } @Override @@ -36,7 +36,7 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemObjectId); + packet.writeD(_itemId); return true; } } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index a44d439586..5cc4bbdb45 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -33,7 +33,7 @@ public class NicknameColor implements IItemHandler return false; } - playable.sendPacket(new ExRequestChangeNicknameColor(item.getObjectId())); + playable.sendPacket(new ExRequestChangeNicknameColor(item.getId())); return true; } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index f0270fe7a8..0cfe6a7076 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -41,7 +41,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket }; private int _colorNum; - private int _itemObjectId; + private int _itemId; private String _title; @Override @@ -49,7 +49,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket { _colorNum = packet.readD(); _title = packet.readS(); - _itemObjectId = packet.readD(); + _itemId = packet.readD(); return true; } @@ -67,7 +67,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket return; } - final ItemInstance item = player.getInventory().getItemByObjectId(_itemObjectId); + final ItemInstance item = player.getInventory().getItemByItemId(_itemId); if ((item == null) || (item.getEtcItem() == null) || (item.getEtcItem().getHandlerName() == null) || !item.getEtcItem().getHandlerName().equalsIgnoreCase("NicknameColor")) { return; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index ed027fe297..cc4f7ce1d8 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { - private final int _itemObjectId; + private final int _itemId; - public ExRequestChangeNicknameColor(int itemObjectId) + public ExRequestChangeNicknameColor(int itemId) { - _itemObjectId = itemObjectId; + _itemId = itemId; } @Override @@ -36,7 +36,7 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemObjectId); + packet.writeD(_itemId); return true; } } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index a44d439586..5cc4bbdb45 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -33,7 +33,7 @@ public class NicknameColor implements IItemHandler return false; } - playable.sendPacket(new ExRequestChangeNicknameColor(item.getObjectId())); + playable.sendPacket(new ExRequestChangeNicknameColor(item.getId())); return true; } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index f0270fe7a8..0cfe6a7076 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -41,7 +41,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket }; private int _colorNum; - private int _itemObjectId; + private int _itemId; private String _title; @Override @@ -49,7 +49,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket { _colorNum = packet.readD(); _title = packet.readS(); - _itemObjectId = packet.readD(); + _itemId = packet.readD(); return true; } @@ -67,7 +67,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket return; } - final ItemInstance item = player.getInventory().getItemByObjectId(_itemObjectId); + final ItemInstance item = player.getInventory().getItemByItemId(_itemId); if ((item == null) || (item.getEtcItem() == null) || (item.getEtcItem().getHandlerName() == null) || !item.getEtcItem().getHandlerName().equalsIgnoreCase("NicknameColor")) { return; diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index ed027fe297..cc4f7ce1d8 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { - private final int _itemObjectId; + private final int _itemId; - public ExRequestChangeNicknameColor(int itemObjectId) + public ExRequestChangeNicknameColor(int itemId) { - _itemObjectId = itemObjectId; + _itemId = itemId; } @Override @@ -36,7 +36,7 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemObjectId); + packet.writeD(_itemId); return true; } } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index a44d439586..5cc4bbdb45 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -33,7 +33,7 @@ public class NicknameColor implements IItemHandler return false; } - playable.sendPacket(new ExRequestChangeNicknameColor(item.getObjectId())); + playable.sendPacket(new ExRequestChangeNicknameColor(item.getId())); return true; } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index f0270fe7a8..0cfe6a7076 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -41,7 +41,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket }; private int _colorNum; - private int _itemObjectId; + private int _itemId; private String _title; @Override @@ -49,7 +49,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket { _colorNum = packet.readD(); _title = packet.readS(); - _itemObjectId = packet.readD(); + _itemId = packet.readD(); return true; } @@ -67,7 +67,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket return; } - final ItemInstance item = player.getInventory().getItemByObjectId(_itemObjectId); + final ItemInstance item = player.getInventory().getItemByItemId(_itemId); if ((item == null) || (item.getEtcItem() == null) || (item.getEtcItem().getHandlerName() == null) || !item.getEtcItem().getHandlerName().equalsIgnoreCase("NicknameColor")) { return; diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index ed027fe297..cc4f7ce1d8 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { - private final int _itemObjectId; + private final int _itemId; - public ExRequestChangeNicknameColor(int itemObjectId) + public ExRequestChangeNicknameColor(int itemId) { - _itemObjectId = itemObjectId; + _itemId = itemId; } @Override @@ -36,7 +36,7 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemObjectId); + packet.writeD(_itemId); return true; } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index a44d439586..5cc4bbdb45 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -33,7 +33,7 @@ public class NicknameColor implements IItemHandler return false; } - playable.sendPacket(new ExRequestChangeNicknameColor(item.getObjectId())); + playable.sendPacket(new ExRequestChangeNicknameColor(item.getId())); return true; } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index f0270fe7a8..0cfe6a7076 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -41,7 +41,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket }; private int _colorNum; - private int _itemObjectId; + private int _itemId; private String _title; @Override @@ -49,7 +49,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket { _colorNum = packet.readD(); _title = packet.readS(); - _itemObjectId = packet.readD(); + _itemId = packet.readD(); return true; } @@ -67,7 +67,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket return; } - final ItemInstance item = player.getInventory().getItemByObjectId(_itemObjectId); + final ItemInstance item = player.getInventory().getItemByItemId(_itemId); if ((item == null) || (item.getEtcItem() == null) || (item.getEtcItem().getHandlerName() == null) || !item.getEtcItem().getHandlerName().equalsIgnoreCase("NicknameColor")) { return; diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index ed027fe297..cc4f7ce1d8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { - private final int _itemObjectId; + private final int _itemId; - public ExRequestChangeNicknameColor(int itemObjectId) + public ExRequestChangeNicknameColor(int itemId) { - _itemObjectId = itemObjectId; + _itemId = itemId; } @Override @@ -36,7 +36,7 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemObjectId); + packet.writeD(_itemId); return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index a44d439586..5cc4bbdb45 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -33,7 +33,7 @@ public class NicknameColor implements IItemHandler return false; } - playable.sendPacket(new ExRequestChangeNicknameColor(item.getObjectId())); + playable.sendPacket(new ExRequestChangeNicknameColor(item.getId())); return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index f0270fe7a8..0cfe6a7076 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -41,7 +41,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket }; private int _colorNum; - private int _itemObjectId; + private int _itemId; private String _title; @Override @@ -49,7 +49,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket { _colorNum = packet.readD(); _title = packet.readS(); - _itemObjectId = packet.readD(); + _itemId = packet.readD(); return true; } @@ -67,7 +67,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket return; } - final ItemInstance item = player.getInventory().getItemByObjectId(_itemObjectId); + final ItemInstance item = player.getInventory().getItemByItemId(_itemId); if ((item == null) || (item.getEtcItem() == null) || (item.getEtcItem().getHandlerName() == null) || !item.getEtcItem().getHandlerName().equalsIgnoreCase("NicknameColor")) { return; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index ed027fe297..cc4f7ce1d8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { - private final int _itemObjectId; + private final int _itemId; - public ExRequestChangeNicknameColor(int itemObjectId) + public ExRequestChangeNicknameColor(int itemId) { - _itemObjectId = itemObjectId; + _itemId = itemId; } @Override @@ -36,7 +36,7 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemObjectId); + packet.writeD(_itemId); return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index a44d439586..5cc4bbdb45 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -33,7 +33,7 @@ public class NicknameColor implements IItemHandler return false; } - playable.sendPacket(new ExRequestChangeNicknameColor(item.getObjectId())); + playable.sendPacket(new ExRequestChangeNicknameColor(item.getId())); return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index f0270fe7a8..0cfe6a7076 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -41,7 +41,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket }; private int _colorNum; - private int _itemObjectId; + private int _itemId; private String _title; @Override @@ -49,7 +49,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket { _colorNum = packet.readD(); _title = packet.readS(); - _itemObjectId = packet.readD(); + _itemId = packet.readD(); return true; } @@ -67,7 +67,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket return; } - final ItemInstance item = player.getInventory().getItemByObjectId(_itemObjectId); + final ItemInstance item = player.getInventory().getItemByItemId(_itemId); if ((item == null) || (item.getEtcItem() == null) || (item.getEtcItem().getHandlerName() == null) || !item.getEtcItem().getHandlerName().equalsIgnoreCase("NicknameColor")) { return; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index ed027fe297..cc4f7ce1d8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { - private final int _itemObjectId; + private final int _itemId; - public ExRequestChangeNicknameColor(int itemObjectId) + public ExRequestChangeNicknameColor(int itemId) { - _itemObjectId = itemObjectId; + _itemId = itemId; } @Override @@ -36,7 +36,7 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemObjectId); + packet.writeD(_itemId); return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index a44d439586..5cc4bbdb45 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -33,7 +33,7 @@ public class NicknameColor implements IItemHandler return false; } - playable.sendPacket(new ExRequestChangeNicknameColor(item.getObjectId())); + playable.sendPacket(new ExRequestChangeNicknameColor(item.getId())); return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index f0270fe7a8..0cfe6a7076 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -41,7 +41,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket }; private int _colorNum; - private int _itemObjectId; + private int _itemId; private String _title; @Override @@ -49,7 +49,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket { _colorNum = packet.readD(); _title = packet.readS(); - _itemObjectId = packet.readD(); + _itemId = packet.readD(); return true; } @@ -67,7 +67,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket return; } - final ItemInstance item = player.getInventory().getItemByObjectId(_itemObjectId); + final ItemInstance item = player.getInventory().getItemByItemId(_itemId); if ((item == null) || (item.getEtcItem() == null) || (item.getEtcItem().getHandlerName() == null) || !item.getEtcItem().getHandlerName().equalsIgnoreCase("NicknameColor")) { return; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index ed027fe297..cc4f7ce1d8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { - private final int _itemObjectId; + private final int _itemId; - public ExRequestChangeNicknameColor(int itemObjectId) + public ExRequestChangeNicknameColor(int itemId) { - _itemObjectId = itemObjectId; + _itemId = itemId; } @Override @@ -36,7 +36,7 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemObjectId); + packet.writeD(_itemId); return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index a44d439586..5cc4bbdb45 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -33,7 +33,7 @@ public class NicknameColor implements IItemHandler return false; } - playable.sendPacket(new ExRequestChangeNicknameColor(item.getObjectId())); + playable.sendPacket(new ExRequestChangeNicknameColor(item.getId())); return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index f0270fe7a8..0cfe6a7076 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -41,7 +41,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket }; private int _colorNum; - private int _itemObjectId; + private int _itemId; private String _title; @Override @@ -49,7 +49,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket { _colorNum = packet.readD(); _title = packet.readS(); - _itemObjectId = packet.readD(); + _itemId = packet.readD(); return true; } @@ -67,7 +67,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket return; } - final ItemInstance item = player.getInventory().getItemByObjectId(_itemObjectId); + final ItemInstance item = player.getInventory().getItemByItemId(_itemId); if ((item == null) || (item.getEtcItem() == null) || (item.getEtcItem().getHandlerName() == null) || !item.getEtcItem().getHandlerName().equalsIgnoreCase("NicknameColor")) { return; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index ed027fe297..cc4f7ce1d8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { - private final int _itemObjectId; + private final int _itemId; - public ExRequestChangeNicknameColor(int itemObjectId) + public ExRequestChangeNicknameColor(int itemId) { - _itemObjectId = itemObjectId; + _itemId = itemId; } @Override @@ -36,7 +36,7 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemObjectId); + packet.writeD(_itemId); return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index a44d439586..5cc4bbdb45 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -33,7 +33,7 @@ public class NicknameColor implements IItemHandler return false; } - playable.sendPacket(new ExRequestChangeNicknameColor(item.getObjectId())); + playable.sendPacket(new ExRequestChangeNicknameColor(item.getId())); return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index f0270fe7a8..0cfe6a7076 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -41,7 +41,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket }; private int _colorNum; - private int _itemObjectId; + private int _itemId; private String _title; @Override @@ -49,7 +49,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket { _colorNum = packet.readD(); _title = packet.readS(); - _itemObjectId = packet.readD(); + _itemId = packet.readD(); return true; } @@ -67,7 +67,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket return; } - final ItemInstance item = player.getInventory().getItemByObjectId(_itemObjectId); + final ItemInstance item = player.getInventory().getItemByItemId(_itemId); if ((item == null) || (item.getEtcItem() == null) || (item.getEtcItem().getHandlerName() == null) || !item.getEtcItem().getHandlerName().equalsIgnoreCase("NicknameColor")) { return; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index ed027fe297..cc4f7ce1d8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { - private final int _itemObjectId; + private final int _itemId; - public ExRequestChangeNicknameColor(int itemObjectId) + public ExRequestChangeNicknameColor(int itemId) { - _itemObjectId = itemObjectId; + _itemId = itemId; } @Override @@ -36,7 +36,7 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemObjectId); + packet.writeD(_itemId); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index a44d439586..5cc4bbdb45 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -33,7 +33,7 @@ public class NicknameColor implements IItemHandler return false; } - playable.sendPacket(new ExRequestChangeNicknameColor(item.getObjectId())); + playable.sendPacket(new ExRequestChangeNicknameColor(item.getId())); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index f0270fe7a8..0cfe6a7076 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -41,7 +41,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket }; private int _colorNum; - private int _itemObjectId; + private int _itemId; private String _title; @Override @@ -49,7 +49,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket { _colorNum = packet.readD(); _title = packet.readS(); - _itemObjectId = packet.readD(); + _itemId = packet.readD(); return true; } @@ -67,7 +67,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket return; } - final ItemInstance item = player.getInventory().getItemByObjectId(_itemObjectId); + final ItemInstance item = player.getInventory().getItemByItemId(_itemId); if ((item == null) || (item.getEtcItem() == null) || (item.getEtcItem().getHandlerName() == null) || !item.getEtcItem().getHandlerName().equalsIgnoreCase("NicknameColor")) { return; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index ed027fe297..cc4f7ce1d8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { - private final int _itemObjectId; + private final int _itemId; - public ExRequestChangeNicknameColor(int itemObjectId) + public ExRequestChangeNicknameColor(int itemId) { - _itemObjectId = itemObjectId; + _itemId = itemId; } @Override @@ -36,7 +36,7 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemObjectId); + packet.writeD(_itemId); return true; } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index a44d439586..5cc4bbdb45 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -33,7 +33,7 @@ public class NicknameColor implements IItemHandler return false; } - playable.sendPacket(new ExRequestChangeNicknameColor(item.getObjectId())); + playable.sendPacket(new ExRequestChangeNicknameColor(item.getId())); return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index f0270fe7a8..0cfe6a7076 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -41,7 +41,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket }; private int _colorNum; - private int _itemObjectId; + private int _itemId; private String _title; @Override @@ -49,7 +49,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket { _colorNum = packet.readD(); _title = packet.readS(); - _itemObjectId = packet.readD(); + _itemId = packet.readD(); return true; } @@ -67,7 +67,7 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket return; } - final ItemInstance item = player.getInventory().getItemByObjectId(_itemObjectId); + final ItemInstance item = player.getInventory().getItemByItemId(_itemId); if ((item == null) || (item.getEtcItem() == null) || (item.getEtcItem().getHandlerName() == null) || !item.getEtcItem().getHandlerName().equalsIgnoreCase("NicknameColor")) { return; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index ed027fe297..cc4f7ce1d8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { - private final int _itemObjectId; + private final int _itemId; - public ExRequestChangeNicknameColor(int itemObjectId) + public ExRequestChangeNicknameColor(int itemId) { - _itemObjectId = itemObjectId; + _itemId = itemId; } @Override @@ -36,7 +36,7 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemObjectId); + packet.writeD(_itemId); return true; } }