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

Removed charId from player.

Browse Source
This commit is contained in:
MobiusDevelopment 2019-05-14 21:30:24 +00:00
parent 574fbd3927
commit e5bc00862c
3 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminPForge.java
View File

@ -96,9 +96,9 @@ public class AdminPForge implements IAdminCommandHandler
val = String.valueOf(activeChar.getBoat().getObjectId()); 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")) else if (val.toLowerCase().equals("$allyid"))
{ {
@ -106,7 +106,7 @@ public class AdminPForge implements IAdminCommandHandler
} }
else if (val.toLowerCase().equals("$tclanid")) 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")) else if (val.toLowerCase().equals("$tallyid"))
{ {

23
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -304,7 +304,6 @@ public final class PlayerInstance extends Playable
private int pcBangPoint = 0; private int pcBangPoint = 0;
private final Map<Integer, SubClass> _subClasses = new ConcurrentHashMap<>(); private final Map<Integer, SubClass> _subClasses = new ConcurrentHashMap<>();
private PlayerAppearance _appearance; private PlayerAppearance _appearance;
private int _charId = 0x00030b7a;
private long _expBeforeDeath; private long _expBeforeDeath;
private int _karma; private int _karma;
private int _pvpKills; private int _pvpKills;
@ -3833,26 +3832,6 @@ public final class PlayerInstance extends Playable
return _freight; 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> * Return the Adena amount of the PlayerInstance.<BR>
* <BR> * <BR>
@ -4206,7 +4185,7 @@ public final class PlayerInstance extends Playable
{ {
if (!isCastingNow() && !isCastingPotionNow()) if (!isCastingNow() && !isCastingPotionNow())
{ {
ItemInstance herb = new ItemInstance(_charId, itemId); ItemInstance herb = new ItemInstance(getObjectId(), itemId);
IItemHandler handler = ItemHandler.getInstance().getItemHandler(herb.getItemId()); IItemHandler handler = ItemHandler.getInstance().getItemHandler(herb.getItemId());
if (handler == null) if (handler == null)

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java
View File

@ -43,7 +43,7 @@ public class CharSelected extends GameServerPacket
writeC(0x15); writeC(0x15);
writeS(_player.getName()); writeS(_player.getName());
writeD(_player.getCharId()); // ?? writeD(_player.getObjectId()); // ??
writeS(_player.getTitle()); writeS(_player.getTitle());
writeD(_sessionId); writeD(_sessionId);
writeD(_player.getClanId()); writeD(_player.getClanId());