From e5bc00862c01b16f1974f893e7205b1553c10130 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 14 May 2019 21:30:24 +0000
Subject: [PATCH] Removed charId from player.

---
 .../admincommandhandlers/AdminPForge.java     |  6 ++---
 .../model/actor/instance/PlayerInstance.java  | 23 +------------------
 .../network/serverpackets/CharSelected.java   |  2 +-
 3 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminPForge.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminPForge.java
index c8b94388c2..b3218a6a47 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminPForge.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminPForge.java
@@ -96,9 +96,9 @@ public class AdminPForge implements IAdminCommandHandler
 							val = String.valueOf(activeChar.getBoat().getObjectId());
 						}
 					}
-					else if (val.toLowerCase().equals("$clanid"))
+					else if (val.toLowerCase().equals("$clarid"))
 					{
-						val = String.valueOf(activeChar.getCharId());
+						val = String.valueOf(((PlayerInstance) activeChar.getTarget()).getObjectId());
 					}
 					else if (val.toLowerCase().equals("$allyid"))
 					{
@@ -106,7 +106,7 @@ public class AdminPForge implements IAdminCommandHandler
 					}
 					else if (val.toLowerCase().equals("$tclanid"))
 					{
-						val = String.valueOf(((PlayerInstance) activeChar.getTarget()).getCharId());
+						val = String.valueOf(((PlayerInstance) activeChar.getTarget()).getClanId());
 					}
 					else if (val.toLowerCase().equals("$tallyid"))
 					{
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 5e50e751be..cefa3bf605 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -304,7 +304,6 @@ public final class PlayerInstance extends Playable
 	private int pcBangPoint = 0;
 	private final Map<Integer, SubClass> _subClasses = new ConcurrentHashMap<>();
 	private PlayerAppearance _appearance;
-	private int _charId = 0x00030b7a;
 	private long _expBeforeDeath;
 	private int _karma;
 	private int _pvpKills;
@@ -3833,26 +3832,6 @@ public final class PlayerInstance extends Playable
 		return _freight;
 	}
 	
-	/**
-	 * Return the Identifier of the PlayerInstance.<BR>
-	 * <BR>
-	 * @return the char id
-	 */
-	public int getCharId()
-	{
-		return _charId;
-	}
-	
-	/**
-	 * Set the Identifier of the PlayerInstance.<BR>
-	 * <BR>
-	 * @param charId the new char id
-	 */
-	public void setCharId(int charId)
-	{
-		_charId = charId;
-	}
-	
 	/**
 	 * Return the Adena amount of the PlayerInstance.<BR>
 	 * <BR>
@@ -4206,7 +4185,7 @@ public final class PlayerInstance extends Playable
 			{
 				if (!isCastingNow() && !isCastingPotionNow())
 				{
-					ItemInstance herb = new ItemInstance(_charId, itemId);
+					ItemInstance herb = new ItemInstance(getObjectId(), itemId);
 					IItemHandler handler = ItemHandler.getInstance().getItemHandler(herb.getItemId());
 					
 					if (handler == null)
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java
index 6c14547e1c..12c57cc09e 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java
@@ -43,7 +43,7 @@ public class CharSelected extends GameServerPacket
 		writeC(0x15);
 		
 		writeS(_player.getName());
-		writeD(_player.getCharId()); // ??
+		writeD(_player.getObjectId()); // ??
 		writeS(_player.getTitle());
 		writeD(_sessionId);
 		writeD(_player.getClanId());