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

Make use of stored player variable for simplicity reasons.

Browse Source
This commit is contained in:
MobiusDevelopment 2021-12-13 19:39:37 +00:00
parent 49a6897d1d
commit 63c6248cac
3332 changed files with 17264 additions and 12947 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
View File

@ -70,7 +70,7 @@ public class Action implements IClientIncomingPacket
if (player.inObserverMode())
{
player.sendPacket(SystemMessageId.OBSERVERS_CANNOT_PARTICIPATE);
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -106,27 +106,27 @@ public class Action implements IClientIncomingPacket
if (obj == null)
{
// pressing e.g. pickup many times quickly would get you here
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if ((!obj.isTargetable() || player.isTargetingDisabled()) && !player.canOverrideCond(PlayerCondOverride.TARGET_ALL))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Players can't interact with objects in the other instances
if (obj.getInstanceWorld() != player.getInstanceWorld())
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Only GMs can directly interact with invisible characters
if (!obj.isVisibleFor(player))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -134,7 +134,7 @@ public class Action implements IClientIncomingPacket
if (player.getActiveRequester() != null)
{
// Actions prohibited when in trade
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -163,7 +163,7 @@ public class Action implements IClientIncomingPacket
{
// Invalid action detected (probably client cheating), log this
PacketLogger.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId);
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
break;
}
}

4
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
View File

@ -53,10 +53,12 @@ public class AnswerCoupleAction implements IClientIncomingPacket
{
return;
}
if ((target.getMultiSocialTarget() != player.getObjectId()) || (target.getMultiSociaAction() != _actionId))
{
return;
}
if (_answer == 0) // cancel
{
target.sendPacket(SystemMessageId.THE_COUPLE_ACTION_WAS_DENIED);
@ -66,7 +68,7 @@ public class AnswerCoupleAction implements IClientIncomingPacket
final int distance = (int) player.calculateDistance2D(target);
if ((distance > 125) || (distance < 15) || (player.getObjectId() == target.getObjectId()))
{
client.sendPacket(SystemMessageId.THE_REQUEST_CANNOT_BE_COMPLETED_BECAUSE_THE_TARGET_DOES_NOT_MEET_LOCATION_REQUIREMENTS);
player.sendPacket(SystemMessageId.THE_REQUEST_CANNOT_BE_COMPLETED_BECAUSE_THE_TARGET_DOES_NOT_MEET_LOCATION_REQUIREMENTS);
target.sendPacket(SystemMessageId.THE_REQUEST_CANNOT_BE_COMPLETED_BECAUSE_THE_TARGET_DOES_NOT_MEET_LOCATION_REQUIREMENTS);
return;
}

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
View File

@ -51,7 +51,7 @@ public class AnswerTradeRequest implements IClientIncomingPacket
if (!player.getAccessLevel().allowTransaction())
{
player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
View File

@ -51,6 +51,6 @@ public class Appearing implements IClientIncomingPacket
player.onTeleported();
}
client.sendPacket(new UserInfo(player));
player.sendPacket(new UserInfo(player));
}
}

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
View File

@ -55,7 +55,7 @@ public class BypassUserCmd implements IClientIncomingPacket
}
else
{
handler.useUserCommand(_command, client.getPlayer());
handler.useUserCommand(_command, player);
}
}
}

22
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -318,16 +318,16 @@ public class EnterWorld implements IClientIncomingPacket
player.getMacros().sendAllMacros();
// Send Teleport Bookmark List
client.sendPacket(new ExGetBookMarkInfoPacket(player));
player.sendPacket(new ExGetBookMarkInfoPacket(player));
// Send Item List
client.sendPacket(new ItemList(player, false));
player.sendPacket(new ItemList(player, false));
// Send Quest Item List
client.sendPacket(new ExQuestItemList(player));
player.sendPacket(new ExQuestItemList(player));
// Send Shortcuts
client.sendPacket(new ShortCutInit(player));
player.sendPacket(new ShortCutInit(player));
// Send Action list
player.sendPacket(ExBasicActionList.STATIC_PACKET);
@ -437,7 +437,7 @@ public class EnterWorld implements IClientIncomingPacket
player.sendPacket(new ExStorageMaxCount(player));
// Friend list
client.sendPacket(new L2FriendList(player));
player.sendPacket(new L2FriendList(player));
if (Config.SHOW_GOD_VIDEO_INTRO && player.getVariables().getBoolean("intro_god_video", false))
{
player.getVariables().remove("intro_god_video");
@ -478,14 +478,14 @@ public class EnterWorld implements IClientIncomingPacket
notice.replace("%clan_name%", player.getClan().getName());
notice.replace("%notice_text%", player.getClan().getNotice().replaceAll("\r\n", "<br>"));
notice.disableValidation();
client.sendPacket(notice);
player.sendPacket(notice);
}
else if (Config.SERVER_NEWS)
{
final String serverNews = HtmCache.getInstance().getHtm(player, "data/html/servnews.htm");
if (serverNews != null)
{
client.sendPacket(new NpcHtmlMessage(serverNews));
player.sendPacket(new NpcHtmlMessage(serverNews));
}
}
@ -497,13 +497,13 @@ public class EnterWorld implements IClientIncomingPacket
if (player.isAlikeDead()) // dead or fake dead
{
// no broadcast needed since the player will already spawn dead to others
client.sendPacket(new Die(player));
player.sendPacket(new Die(player));
}
player.onPlayerEnter();
client.sendPacket(new SkillCoolTime(player));
client.sendPacket(new ExVoteSystemInfo(player));
player.sendPacket(new SkillCoolTime(player));
player.sendPacket(new ExVoteSystemInfo(player));
for (Item item : player.getInventory().getItems())
{
if (item.isTimeLimitedItem())
@ -566,7 +566,7 @@ public class EnterWorld implements IClientIncomingPacket
{
if (MailManager.getInstance().hasUnreadPost(player))
{
client.sendPacket(ExNoticePostArrived.valueOf(false));
player.sendPacket(ExNoticePostArrived.valueOf(false));
}
}

14
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
View File

@ -94,12 +94,12 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket
case TRANSFER:
case DUALCLASS:
{
client.sendPacket(new AcquireSkillInfo(_skillType, s));
player.sendPacket(new AcquireSkillInfo(_skillType, s));
break;
}
case CLASS:
{
client.sendPacket(new ExAcquireSkillInfo(player, s));
player.sendPacket(new ExAcquireSkillInfo(player, s));
break;
}
case PLEDGE:
@ -108,7 +108,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket
{
return;
}
client.sendPacket(new AcquireSkillInfo(_skillType, s));
player.sendPacket(new AcquireSkillInfo(_skillType, s));
break;
}
case SUBPLEDGE:
@ -117,7 +117,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket
{
return;
}
client.sendPacket(new AcquireSkillInfo(_skillType, s));
player.sendPacket(new AcquireSkillInfo(_skillType, s));
break;
}
case ALCHEMY:
@ -126,7 +126,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket
{
return;
}
client.sendPacket(new AcquireSkillInfo(_skillType, s));
player.sendPacket(new AcquireSkillInfo(_skillType, s));
break;
}
case REVELATION:
@ -135,7 +135,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket
{
return;
}
client.sendPacket(new AcquireSkillInfo(_skillType, s));
player.sendPacket(new AcquireSkillInfo(_skillType, s));
break;
}
case REVELATION_DUALCLASS:
@ -144,7 +144,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket
{
return;
}
client.sendPacket(new AcquireSkillInfo(_skillType, s));
player.sendPacket(new AcquireSkillInfo(_skillType, s));
break;
}
}

10
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
View File

@ -66,7 +66,7 @@ public class RequestActionUse implements IClientIncomingPacket
// Don't do anything if player is dead or confused
if ((player.isFakeDeath() && (_actionId != 0)) || player.isDead() || player.isControlBlocked())
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -90,7 +90,7 @@ public class RequestActionUse implements IClientIncomingPacket
final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
if (Arrays.binarySearch(allowedActions, _actionId) < 0)
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId());
return;
}
@ -116,13 +116,13 @@ public class RequestActionUse implements IClientIncomingPacket
// Player shouldn't be able to set stores if he/she is alike dead (dead or fake death)
if (player.isAlikeDead())
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (player.isSellingBuffs())
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -136,7 +136,7 @@ public class RequestActionUse implements IClientIncomingPacket
player.standUp();
}
client.sendPacket(new RecipeShopManageList(player, false));
player.sendPacket(new RecipeShopManageList(player, false));
break;
}
default:

3
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
View File

@ -41,6 +41,7 @@ public class RequestAlchemySkillList implements IClientIncomingPacket
{
return;
}
client.sendPacket(new ExAlchemySkillList(player));
player.sendPacket(new ExAlchemySkillList(player));
}
}

9
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
View File

@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExShowAgitInfo;
@ -34,6 +35,12 @@ public class RequestAllAgitInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
client.sendPacket(ExShowAgitInfo.STATIC_PACKET);
final Player player = client.getPlayer();
if (player == null)
{
return;
}
player.sendPacket(ExShowAgitInfo.STATIC_PACKET);
}
}

9
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
View File

@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExShowCastleInfo;
@ -34,6 +35,12 @@ public class RequestAllCastleInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
client.sendPacket(ExShowCastleInfo.STATIC_PACKET);
final Player player = client.getPlayer();
if (player == null)
{
return;
}
player.sendPacket(ExShowCastleInfo.STATIC_PACKET);
}
}

9
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
View File

@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressInfo;
@ -34,6 +35,12 @@ public class RequestAllFortressInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
client.sendPacket(ExShowFortressInfo.STATIC_PACKET);
final Player player = client.getPlayer();
if (player == null)
{
return;
}
player.sendPacket(ExShowFortressInfo.STATIC_PACKET);
}
}

9
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
View File

@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.AllyCrest;
@ -39,6 +40,12 @@ public class RequestAllyCrest implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
client.sendPacket(new AllyCrest(_crestId));
final Player player = client.getPlayer();
if (player == null)
{
return;
}
player.sendPacket(new AllyCrest(_crestId));
}
}

26
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
View File

@ -49,61 +49,61 @@ public class RequestAllyInfo implements IClientIncomingPacket
if (allianceId > 0)
{
final AllianceInfo ai = new AllianceInfo(allianceId);
client.sendPacket(ai);
player.sendPacket(ai);
// send for player
sm = new SystemMessage(SystemMessageId.ALLIANCE_INFORMATION);
client.sendPacket(sm);
player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.ALLIANCE_NAME_S1);
sm.addString(ai.getName());
client.sendPacket(sm);
player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.ALLIANCE_LEADER_S2_OF_S1);
sm.addString(ai.getLeaderC());
sm.addString(ai.getLeaderP());
client.sendPacket(sm);
player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.CONNECTION_S1_TOTAL_S2);
sm.addInt(ai.getOnline());
sm.addInt(ai.getTotal());
client.sendPacket(sm);
player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.AFFILIATED_CLANS_TOTAL_S1_CLAN_S);
sm.addInt(ai.getAllies().length);
client.sendPacket(sm);
player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.CLAN_INFORMATION);
for (ClanInfo aci : ai.getAllies())
{
client.sendPacket(sm);
player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.CLAN_NAME_S1);
sm.addString(aci.getClan().getName());
client.sendPacket(sm);
player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.CLAN_LEADER_S1);
sm.addString(aci.getClan().getLeaderName());
client.sendPacket(sm);
player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.CLAN_LEVEL_S1);
sm.addInt(aci.getClan().getLevel());
client.sendPacket(sm);
player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.CONNECTION_S1_TOTAL_S2);
sm.addInt(aci.getOnline());
sm.addInt(aci.getTotal());
client.sendPacket(sm);
player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.EMPTY_4);
}
sm = new SystemMessage(SystemMessageId.EMPTY_5);
client.sendPacket(sm);
player.sendPacket(sm);
}
else
{
client.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_ALLIED_WITH_ANY_CLANS);
player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_ALLIED_WITH_ANY_CLANS);
}
}
}

22
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
View File

@ -92,7 +92,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket
}
if (soulshotCount > item.getCount())
{
client.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_PET_SERVITOR);
player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_PET_SERVITOR);
return;
}
}
@ -110,14 +110,14 @@ public class RequestAutoSoulShot implements IClientIncomingPacket
}
if (spiritshotCount > item.getCount())
{
client.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_PET_SERVITOR);
player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_PET_SERVITOR);
return;
}
}
// Activate shots
player.addAutoSoulShot(_itemId);
client.sendPacket(new ExAutoSoulShot(_itemId, _enable, _type));
player.sendPacket(new ExAutoSoulShot(_itemId, _enable, _type));
// Recharge summon's shots
final Summon pet = player.getPet();
@ -128,7 +128,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_ACTIVATED);
sm.addItemName(item);
client.sendPacket(sm);
player.sendPacket(sm);
}
// Charge
pet.rechargeShots(isSoulshot, isSpiritshot, false);
@ -140,7 +140,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_ACTIVATED);
sm.addItemName(item);
client.sendPacket(sm);
player.sendPacket(sm);
}
// Charge
summon.rechargeShots(isSoulshot, isSpiritshot, false);
@ -148,7 +148,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket
}
else
{
client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR_OR_PET_AND_THEREFORE_CANNOT_USE_THE_AUTOMATIC_USE_FUNCTION);
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR_OR_PET_AND_THEREFORE_CANNOT_USE_THE_AUTOMATIC_USE_FUNCTION);
}
}
else if (isPlayerShot(item.getItem()))
@ -158,18 +158,18 @@ public class RequestAutoSoulShot implements IClientIncomingPacket
final boolean isFishingshot = item.getEtcItem().getDefaultAction() == ActionType.FISHINGSHOT;
if ((player.getActiveWeaponItem() == player.getFistsWeaponItem()) || (item.getItem().getCrystalType() != player.getActiveWeaponItem().getCrystalTypePlus()))
{
client.sendPacket(isSoulshot ? SystemMessageId.THE_SOULSHOT_YOU_ARE_ATTEMPTING_TO_USE_DOES_NOT_MATCH_THE_GRADE_OF_YOUR_EQUIPPED_WEAPON : SystemMessageId.YOUR_SPIRITSHOT_DOES_NOT_MATCH_THE_WEAPON_S_GRADE);
player.sendPacket(isSoulshot ? SystemMessageId.THE_SOULSHOT_YOU_ARE_ATTEMPTING_TO_USE_DOES_NOT_MATCH_THE_GRADE_OF_YOUR_EQUIPPED_WEAPON : SystemMessageId.YOUR_SPIRITSHOT_DOES_NOT_MATCH_THE_WEAPON_S_GRADE);
return;
}
// Activate shots
player.addAutoSoulShot(_itemId);
client.sendPacket(new ExAutoSoulShot(_itemId, _enable, _type));
player.sendPacket(new ExAutoSoulShot(_itemId, _enable, _type));
// Send message
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_ACTIVATED);
sm.addItemName(item);
client.sendPacket(sm);
player.sendPacket(sm);
// Recharge player's shots
player.rechargeShots(isSoulshot, isSpiritshot, isFishingshot);
@ -179,12 +179,12 @@ public class RequestAutoSoulShot implements IClientIncomingPacket
{
// Cancel auto shots
player.removeAutoSoulShot(_itemId);
client.sendPacket(new ExAutoSoulShot(_itemId, _enable, _type));
player.sendPacket(new ExAutoSoulShot(_itemId, _enable, _type));
// Send message
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_DEACTIVATED);
sm.addItemName(item);
client.sendPacket(sm);
player.sendPacket(sm);
}
}
}

9
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
View File

@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.handler.CommunityBoardHandler;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
/**
@ -48,6 +49,12 @@ public class RequestBBSwrite implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
CommunityBoardHandler.getInstance().handleWriteCommand(client.getPlayer(), _url, _arg1, _arg2, _arg3, _arg4, _arg5);
final Player player = client.getPlayer();
if (player == null)
{
return;
}
CommunityBoardHandler.getInstance().handleWriteCommand(player, _url, _arg1, _arg2, _arg3, _arg4, _arg5);
}
}

32
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
View File

@ -91,14 +91,14 @@ public class RequestBuyItem implements IClientIncomingPacket
if (_items == null)
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Alt game - Karma punishment
if (!Config.ALT_GAME_KARMA_PLAYER_CAN_SHOP && (player.getReputation() < 0))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -108,7 +108,7 @@ public class RequestBuyItem implements IClientIncomingPacket
{
if (!(target instanceof Merchant) || (!player.isInsideRadius3D(target, INTERACTION_DISTANCE)) || (player.getInstanceWorld() != target.getInstanceWorld()))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
merchant = (Merchant) target; // FIXME: Doesn't work for GMs.
@ -116,7 +116,7 @@ public class RequestBuyItem implements IClientIncomingPacket
if ((merchant == null) && !player.isGM() && (_listId != CUSTOM_CB_SELL_LIST))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -132,7 +132,7 @@ public class RequestBuyItem implements IClientIncomingPacket
{
if (!buyList.isNpcAllowed(merchant.getId()))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
castleTaxRate = merchant.getCastleTaxRate(TaxType.BUY);
@ -155,7 +155,7 @@ public class RequestBuyItem implements IClientIncomingPacket
if (!product.getItem().isStackable() && (i.getCount() > 1))
{
Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to purchase invalid quantity of items at the same time.", Config.DEFAULT_PUNISH);
client.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED));
player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED));
return;
}
@ -163,7 +163,7 @@ public class RequestBuyItem implements IClientIncomingPacket
if (price < 0)
{
PacketLogger.warning("ERROR, no price found .. wrong buylist ??");
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -177,7 +177,7 @@ public class RequestBuyItem implements IClientIncomingPacket
// trying to buy more then available
if (product.hasLimitedStock() && (i.getCount() > product.getCount()))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -204,23 +204,23 @@ public class RequestBuyItem implements IClientIncomingPacket
if (!player.isGM() && ((weight > Integer.MAX_VALUE) || (weight < 0) || !player.getInventory().validateWeight((int) weight)))
{
client.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT);
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!player.isGM() && ((slots > Integer.MAX_VALUE) || (slots < 0) || !player.getInventory().validateCapacity((int) slots)))
{
client.sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL);
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Charge buyer and add tax to castle treasury if not owned by npc clan
if ((subTotal < 0) || !player.reduceAdena("Buy", subTotal, player.getLastFolkNPC(), false))
{
client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -253,7 +253,7 @@ public class RequestBuyItem implements IClientIncomingPacket
merchant.handleTaxPayment((long) (subTotal * castleTaxRate));
}
client.sendPacket(new ExUserInfoInvenWeight(player));
client.sendPacket(new ExBuySellList(player, true));
player.sendPacket(new ExUserInfoInvenWeight(player));
player.sendPacket(new ExBuySellList(player, true));
}
}

12
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
View File

@ -90,28 +90,28 @@ public class RequestBuySeed implements IClientIncomingPacket
}
else if (_items == null)
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final CastleManorManager manor = CastleManorManager.getInstance();
if (manor.isUnderMaintenance())
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final Castle castle = CastleManager.getInstance().getCastleById(_manorId);
if (castle == null)
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final Npc manager = player.getLastFolkNPC();
if (!(manager instanceof Merchant) || !manager.canInteract(player) || (manager.getParameters().getInt("manor_id", -1) != _manorId))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -125,7 +125,7 @@ public class RequestBuySeed implements IClientIncomingPacket
final SeedProduction sp = manor.getSeedProduct(_manorId, ih.getId(), false);
if ((sp == null) || (sp.getPrice() <= 0) || (sp.getAmount() < ih.getCount()) || ((MAX_ADENA / ih.getCount()) < sp.getPrice()))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -134,7 +134,7 @@ public class RequestBuySeed implements IClientIncomingPacket
if (totalPrice > MAX_ADENA)
{
Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to purchase over " + MAX_ADENA + " adena worth of goods.", Config.DEFAULT_PUNISH);
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
View File

@ -57,7 +57,7 @@ public class RequestConfirmCancelItem implements IClientIncomingPacket
if (item.getOwnerId() != player.getObjectId())
{
Util.handleIllegalPlayerAction(client.getPlayer(), "Warning!! Character " + client.getPlayer().getName() + " of account " + client.getPlayer().getAccountName() + " tryied to destroy augment on item that doesn't own.", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tryied to destroy augment on item that doesn't own.", Config.DEFAULT_PUNISH);
return;
}

6
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
View File

@ -76,17 +76,17 @@ public class RequestConfirmGemStone extends AbstractRefinePacket
final VariationFee fee = VariationData.getInstance().getFee(targetItem.getId(), refinerItem.getId());
if (!isValid(player, targetItem, refinerItem, gemStoneItem, fee))
{
client.sendPacket(SystemMessageId.THIS_IS_NOT_A_SUITABLE_ITEM);
player.sendPacket(SystemMessageId.THIS_IS_NOT_A_SUITABLE_ITEM);
return;
}
// Check for fee count
if (_feeCount != fee.getItemCount())
{
client.sendPacket(SystemMessageId.GEMSTONE_QUANTITY_IS_INCORRECT);
player.sendPacket(SystemMessageId.GEMSTONE_QUANTITY_IS_INCORRECT);
return;
}
client.sendPacket(new ExPutCommissionResultForVariationMake(_feeItemObjId, _feeCount, gemStoneItem.getId()));
player.sendPacket(new ExPutCommissionResultForVariationMake(_feeItemObjId, _feeCount, gemStoneItem.getId()));
}
}

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
View File

@ -96,6 +96,6 @@ public class RequestConfirmSiegeWaitingList implements IClientIncomingPacket
}
// Update the defender list
client.sendPacket(new SiegeDefenderList(castle));
player.sendPacket(new SiegeDefenderList(castle));
}
}

8
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
View File

@ -56,7 +56,7 @@ public class RequestConfirmTargetItem extends AbstractRefinePacket
if (!VariationData.getInstance().hasFeeData(item.getId()))
{
client.sendPacket(SystemMessageId.THIS_IS_NOT_A_SUITABLE_ITEM);
player.sendPacket(SystemMessageId.THIS_IS_NOT_A_SUITABLE_ITEM);
return;
}
@ -65,14 +65,14 @@ public class RequestConfirmTargetItem extends AbstractRefinePacket
// Different system message here
if (item.isAugmented())
{
client.sendPacket(SystemMessageId.ONCE_AN_ITEM_IS_AUGMENTED_IT_CANNOT_BE_AUGMENTED_AGAIN);
player.sendPacket(SystemMessageId.ONCE_AN_ITEM_IS_AUGMENTED_IT_CANNOT_BE_AUGMENTED_AGAIN);
return;
}
client.sendPacket(SystemMessageId.THIS_IS_NOT_A_SUITABLE_ITEM);
player.sendPacket(SystemMessageId.THIS_IS_NOT_A_SUITABLE_ITEM);
return;
}
client.sendPacket(new ExPutItemResultForVariationMake(_itemObjId, item.getId()));
player.sendPacket(new ExPutItemResultForVariationMake(_itemObjId, item.getId()));
}
}

25
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
View File

@ -69,6 +69,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
// player.sendMessage("You are crystallizing too fast.");
// return;
// }
if (_count <= 0)
{
Util.handleIllegalPlayerAction(player, "[RequestCrystallizeItem] count <= 0! ban! oid: " + _objectId + " owner: " + player.getName(), Config.DEFAULT_PUNISH);
@ -77,15 +78,15 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
if ((player.getPrivateStoreType() != PrivateStoreType.NONE) || !player.isInCrystallize())
{
client.sendPacket(SystemMessageId.WHILE_OPERATING_A_PRIVATE_STORE_OR_WORKSHOP_YOU_CANNOT_DISCARD_DESTROY_OR_TRADE_AN_ITEM);
player.sendPacket(SystemMessageId.WHILE_OPERATING_A_PRIVATE_STORE_OR_WORKSHOP_YOU_CANNOT_DISCARD_DESTROY_OR_TRADE_AN_ITEM);
return;
}
final int skillLevel = player.getSkillLevel(CommonSkill.CRYSTALLIZE.getId());
if (skillLevel <= 0)
{
client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW);
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW);
player.sendPacket(ActionFailed.STATIC_PACKET);
if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55))
{
PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId());
@ -99,7 +100,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
final Item item = inventory.getItemByObjectId(_objectId);
if ((item == null) || item.isHeroItem() || (!Config.ALT_ALLOW_AUGMENT_DESTROY && item.isAugmented()))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -112,19 +113,19 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
final Item itemToRemove = player.getInventory().getItemByObjectId(_objectId);
if ((itemToRemove == null) || itemToRemove.isShadowItem() || itemToRemove.isTimeLimitedItem())
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!itemToRemove.getItem().isCrystallizable() || (itemToRemove.getItem().getCrystalCount() <= 0) || (itemToRemove.getItem().getCrystalType() == CrystalType.NONE))
{
client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_CRYSTALLIZED);
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_CRYSTALLIZED);
return;
}
if (!player.getInventory().canManipulateWithItemId(itemToRemove.getId()))
{
client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_CRYSTALLIZED);
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_CRYSTALLIZED);
return;
}
@ -185,8 +186,8 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
if (!canCrystallize)
{
client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW);
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -221,7 +222,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
sm.addItemName(itemToRemove);
}
client.sendPacket(sm);
player.sendPacket(sm);
}
// remove from inventory
@ -240,13 +241,13 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
sm.addItemName(createdItem);
sm.addLong(holder.getCount());
client.sendPacket(sm);
player.sendPacket(sm);
}
}
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_CRYSTALLIZED);
sm.addItemName(removedItem);
client.sendPacket(sm);
player.sendPacket(sm);
player.broadcastUserInfo();

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
View File

@ -42,6 +42,6 @@ public class RequestCursedWeaponList implements IClientIncomingPacket
return;
}
client.sendPacket(new ExCursedWeaponList());
player.sendPacket(new ExCursedWeaponList());
}
}

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
View File

@ -67,7 +67,7 @@ public class RequestCursedWeaponLocation implements IClientIncomingPacket
// send the ExCursedWeaponLocation
if (!list.isEmpty())
{
client.sendPacket(new ExCursedWeaponLocation(list));
player.sendPacket(new ExCursedWeaponLocation(list));
}
}
}

4
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
View File

@ -64,7 +64,7 @@ public class RequestDeleteReceivedPost implements IClientIncomingPacket
if (!player.isInsideZone(ZoneId.PEACE))
{
client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
return;
}
@ -88,6 +88,6 @@ public class RequestDeleteReceivedPost implements IClientIncomingPacket
msg.setDeletedByReceiver();
}
client.sendPacket(new ExChangePostState(true, _msgIds, Message.DELETED));
player.sendPacket(new ExChangePostState(true, _msgIds, Message.DELETED));
}
}

4
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
View File

@ -64,7 +64,7 @@ public class RequestDeleteSentPost implements IClientIncomingPacket
if (!player.isInsideZone(ZoneId.PEACE))
{
client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
return;
}
@ -88,6 +88,6 @@ public class RequestDeleteSentPost implements IClientIncomingPacket
msg.setDeletedBySender();
}
client.sendPacket(new ExChangePostState(false, _msgIds, Message.DELETED));
player.sendPacket(new ExChangePostState(false, _msgIds, Message.DELETED));
}
}

14
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
View File

@ -81,7 +81,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
long count = _count;
if (player.isProcessingTransaction() || (player.getPrivateStoreType() != PrivateStoreType.NONE))
{
client.sendPacket(SystemMessageId.WHILE_OPERATING_A_PRIVATE_STORE_OR_WORKSHOP_YOU_CANNOT_DISCARD_DESTROY_OR_TRADE_AN_ITEM);
player.sendPacket(SystemMessageId.WHILE_OPERATING_A_PRIVATE_STORE_OR_WORKSHOP_YOU_CANNOT_DISCARD_DESTROY_OR_TRADE_AN_ITEM);
return;
}
@ -111,14 +111,14 @@ public class RequestDestroyItem implements IClientIncomingPacket
return;
}
client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED);
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED);
return;
}
// Cannot discard item that the skill is consuming
if (player.isCastingNow(s -> s.getSkill().getItemConsumeId() == itemToRemove.getId()))
{
client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED);
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED);
return;
}
@ -127,11 +127,11 @@ public class RequestDestroyItem implements IClientIncomingPacket
{
if (itemToRemove.isHeroItem())
{
client.sendPacket(SystemMessageId.HERO_WEAPONS_CANNOT_BE_DESTROYED);
player.sendPacket(SystemMessageId.HERO_WEAPONS_CANNOT_BE_DESTROYED);
}
else
{
client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED);
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED);
}
return;
}
@ -184,13 +184,13 @@ public class RequestDestroyItem implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
sm.addInt(itemToRemove.getEnchantLevel());
sm.addItemName(itemToRemove);
client.sendPacket(sm);
player.sendPacket(sm);
}
else
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
sm.addItemName(itemToRemove);
client.sendPacket(sm);
player.sendPacket(sm);
}
final InventoryUpdate iu = new InventoryUpdate();

4
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
View File

@ -40,11 +40,13 @@ public class RequestDismissAlly implements IClientIncomingPacket
{
return;
}
if (!player.isClanLeader())
{
client.sendPacket(SystemMessageId.THIS_FEATURE_IS_ONLY_AVAILABLE_TO_ALLIANCE_LEADERS);
player.sendPacket(SystemMessageId.THIS_FEATURE_IS_ONLY_AVAILABLE_TO_ALLIANCE_LEADERS);
return;
}
player.getClan().dissolveAlly(player);
}
}

9
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
View File

@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.DuelManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
/**
@ -35,6 +36,12 @@ public class RequestDuelSurrender implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
DuelManager.getInstance().doSurrender(client.getPlayer());
final Player player = client.getPlayer();
if (player == null)
{
return;
}
DuelManager.getInstance().doSurrender(player);
}
}

46
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
View File

@ -84,7 +84,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
if (player.isProcessingTransaction() || player.isInStoreMode())
{
client.sendPacket(SystemMessageId.YOU_CANNOT_ENCHANT_WHILE_OPERATING_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
player.sendPacket(SystemMessageId.YOU_CANNOT_ENCHANT_WHILE_OPERATING_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
player.removeRequest(request.getClass());
return;
}
@ -120,9 +120,9 @@ public class RequestEnchantItem implements IClientIncomingPacket
// first validation check - also over enchant check
if (!scrollTemplate.isValid(item, supportTemplate) || (Config.DISABLE_OVER_ENCHANTING && ((item.getEnchantLevel() == scrollTemplate.getMaxEnchantLevel()) || (!(item.getItem().getEnchantLimit() == 0) && (item.getEnchantLevel() == item.getItem().getEnchantLimit())))))
{
client.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
player.removeRequest(request.getClass());
client.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
return;
}
@ -131,27 +131,27 @@ public class RequestEnchantItem implements IClientIncomingPacket
{
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH);
player.removeRequest(request.getClass());
client.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
return;
}
// attempting to destroy scroll
if (player.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, player, item) == null)
{
client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH);
player.removeRequest(request.getClass());
client.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
return;
}
// attempting to destroy support if exist
if ((support != null) && (player.getInventory().destroyItem("Enchant", support.getObjectId(), 1, player, item) == null))
{
client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH);
player.removeRequest(request.getClass());
client.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
return;
}
@ -161,9 +161,9 @@ public class RequestEnchantItem implements IClientIncomingPacket
// last validation check
if ((item.getOwnerId() != player.getObjectId()) || !item.isEnchantable())
{
client.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
player.removeRequest(request.getClass());
client.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
return;
}
@ -172,9 +172,9 @@ public class RequestEnchantItem implements IClientIncomingPacket
{
case ERROR:
{
client.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
player.removeRequest(request.getClass());
client.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
break;
}
case SUCCESS:
@ -193,7 +193,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
}
item.updateDatabase();
}
client.sendPacket(new EnchantResult(EnchantResult.SUCCESS, item));
player.sendPacket(new EnchantResult(EnchantResult.SUCCESS, item));
if (Config.LOG_ITEM_ENCHANTS)
{
if (item.getEnchantLevel() > 0)
@ -258,8 +258,8 @@ public class RequestEnchantItem implements IClientIncomingPacket
if (scrollTemplate.isSafe())
{
// safe enchant - remain old value
client.sendPacket(SystemMessageId.ENCHANT_FAILED_THE_ENCHANT_SKILL_FOR_THE_CORRESPONDING_ITEM_WILL_BE_EXACTLY_RETAINED);
client.sendPacket(new EnchantResult(EnchantResult.SAFE_FAIL, item));
player.sendPacket(SystemMessageId.ENCHANT_FAILED_THE_ENCHANT_SKILL_FOR_THE_CORRESPONDING_ITEM_WILL_BE_EXACTLY_RETAINED);
player.sendPacket(new EnchantResult(EnchantResult.SAFE_FAIL, item));
if (Config.LOG_ITEM_ENCHANTS)
{
if (item.getEnchantLevel() > 0)
@ -293,13 +293,13 @@ public class RequestEnchantItem implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
sm.addInt(item.getEnchantLevel());
sm.addItemName(item);
client.sendPacket(sm);
player.sendPacket(sm);
}
else
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
sm.addItemName(item);
client.sendPacket(sm);
player.sendPacket(sm);
}
for (Item itm : player.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot()))
@ -319,11 +319,11 @@ public class RequestEnchantItem implements IClientIncomingPacket
}
else // blessed enchant - clear enchant value
{
client.sendPacket(SystemMessageId.THE_BLESSED_ENCHANT_FAILED_THE_ENCHANT_VALUE_OF_THE_ITEM_BECAME_0);
player.sendPacket(SystemMessageId.THE_BLESSED_ENCHANT_FAILED_THE_ENCHANT_VALUE_OF_THE_ITEM_BECAME_0);
item.setEnchantLevel(0);
}
item.updateDatabase();
client.sendPacket(new EnchantResult(EnchantResult.BLESSED_FAIL, 0, 0));
player.sendPacket(new EnchantResult(EnchantResult.BLESSED_FAIL, 0, 0));
if (Config.LOG_ITEM_ENCHANTS)
{
if (item.getEnchantLevel() > 0)
@ -355,7 +355,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
// unable to destroy item, cheater ?
Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from player " + player.getName() + ", possible cheater !", Config.DEFAULT_PUNISH);
player.removeRequest(request.getClass());
client.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
if (Config.LOG_ITEM_ENCHANTS)
{
if (item.getEnchantLevel() > 0)
@ -398,7 +398,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);
sm.addItemName(crystals);
sm.addLong(count);
client.sendPacket(sm);
player.sendPacket(sm);
}
if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null))
@ -408,11 +408,11 @@ public class RequestEnchantItem implements IClientIncomingPacket
if ((crystalId == 0) || (count == 0))
{
client.sendPacket(new EnchantResult(EnchantResult.NO_CRYSTAL, 0, 0));
player.sendPacket(new EnchantResult(EnchantResult.NO_CRYSTAL, 0, 0));
}
else
{
client.sendPacket(new EnchantResult(EnchantResult.FAIL, crystalId, count));
player.sendPacket(new EnchantResult(EnchantResult.FAIL, crystalId, count));
}
if (Config.LOG_ITEM_ENCHANTS)

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
View File

@ -42,7 +42,7 @@ public class RequestExCancelEnchantItem implements IClientIncomingPacket
return;
}
client.sendPacket(new EnchantResult(2, 0, 0));
player.sendPacket(new EnchantResult(2, 0, 0));
player.removeRequest(EnchantItemRequest.class);
}
}

20
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
View File

@ -68,7 +68,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket
{
// Player canceled enchant
player.removeRequest(request.getClass());
client.sendPacket(SystemMessageId.ATTRIBUTE_ITEM_USAGE_HAS_BEEN_CANCELLED);
player.sendPacket(SystemMessageId.ATTRIBUTE_ITEM_USAGE_HAS_BEEN_CANCELLED);
return;
}
@ -80,7 +80,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket
if (player.getPrivateStoreType() != PrivateStoreType.NONE)
{
client.sendPacket(SystemMessageId.YOU_CANNOT_ADD_ELEMENTAL_POWER_WHILE_OPERATING_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
player.sendPacket(SystemMessageId.YOU_CANNOT_ADD_ELEMENTAL_POWER_WHILE_OPERATING_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
player.removeRequest(request.getClass());
return;
}
@ -91,7 +91,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket
// Cancel trade
player.cancelActiveTrade();
player.removeRequest(request.getClass());
client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_TRADING);
player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_TRADING);
return;
}
@ -100,13 +100,13 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket
if ((item == null) || (stone == null))
{
player.removeRequest(request.getClass());
client.sendPacket(SystemMessageId.ATTRIBUTE_ITEM_USAGE_HAS_BEEN_CANCELLED);
player.sendPacket(SystemMessageId.ATTRIBUTE_ITEM_USAGE_HAS_BEEN_CANCELLED);
return;
}
if (!item.isElementable())
{
client.sendPacket(SystemMessageId.ELEMENTAL_POWER_ENHANCER_USAGE_REQUIREMENT_IS_NOT_SUFFICIENT);
player.sendPacket(SystemMessageId.ELEMENTAL_POWER_ENHANCER_USAGE_REQUIREMENT_IS_NOT_SUFFICIENT);
player.removeRequest(request.getClass());
return;
}
@ -146,7 +146,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket
int powerToAdd = getPowerToAdd(stoneId, elementValue, item);
if ((item.isWeapon() && (oldElement != null) && (oldElement.getType() != elementToAdd) && (oldElement.getType() != AttributeType.NONE)) || (item.isArmor() && (item.getAttribute(elementToAdd) == null) && (item.getAttributes() != null) && (item.getAttributes().size() >= 3)))
{
client.sendPacket(SystemMessageId.ANOTHER_ELEMENTAL_POWER_HAS_ALREADY_BEEN_ADDED_THIS_ELEMENTAL_POWER_CANNOT_BE_ADDED);
player.sendPacket(SystemMessageId.ANOTHER_ELEMENTAL_POWER_HAS_ALREADY_BEEN_ADDED_THIS_ELEMENTAL_POWER_CANNOT_BE_ADDED);
player.removeRequest(request.getClass());
return;
}
@ -174,7 +174,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket
if (powerToAdd <= 0)
{
client.sendPacket(SystemMessageId.ATTRIBUTE_ITEM_USAGE_HAS_BEEN_CANCELLED);
player.sendPacket(SystemMessageId.ATTRIBUTE_ITEM_USAGE_HAS_BEEN_CANCELLED);
player.removeRequest(request.getClass());
return;
}
@ -251,7 +251,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket
}
else
{
client.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_ADD_ELEMENTAL_POWER);
player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_ADD_ELEMENTAL_POWER);
}
int result = 0;
@ -272,8 +272,8 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket
}
player.removeRequest(request.getClass());
client.sendPacket(new ExAttributeEnchantResult(result, item.isWeapon(), elementToAdd, elementValue, newValue, successfulAttempts, failedAttempts));
client.sendPacket(new UserInfo(player));
player.sendPacket(new ExAttributeEnchantResult(result, item.isWeapon(), elementToAdd, elementValue, newValue, successfulAttempts, failedAttempts));
player.sendPacket(new UserInfo(player));
player.sendInventoryUpdate(iu);
}

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
View File

@ -92,7 +92,7 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket
return;
}
client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel, playerSkill.getSubLevel()));
player.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel, playerSkill.getSubLevel()));
// ExEnchantSkillInfoDetail - not really necessary I think
// client.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar));
}

1
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
View File

@ -65,6 +65,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket
{
return;
}
player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player));
}
}

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
View File

@ -47,6 +47,6 @@ public class RequestExFriendListExtended implements IClientIncomingPacket
return;
}
client.sendPacket(new FriendList(player));
player.sendPacket(new FriendList(player));
}
}

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
View File

@ -49,7 +49,7 @@ public class RequestExMPCCShowPartyMembersInfo implements IClientIncomingPacket
final Player target = World.getInstance().getPlayer(_partyLeaderId);
if ((target != null) && (target.getParty() != null))
{
client.sendPacket(new ExMPCCShowPartyMemberInfo(target.getParty()));
player.sendPacket(new ExMPCCShowPartyMemberInfo(target.getParty()));
}
}
}

4
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
View File

@ -67,7 +67,7 @@ public class RequestExMagicSkillUseGround implements IClientIncomingPacket
final int level = player.getSkillLevel(_skillId);
if (level <= 0)
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -86,7 +86,7 @@ public class RequestExMagicSkillUseGround implements IClientIncomingPacket
}
else
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
PacketLogger.warning("No skill found with id " + _skillId + " and level " + level + " !!");
}
}

9
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
View File

@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.sql.CrestTable;
import org.l2jmobius.gameserver.model.Crest;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExPledgeEmblem;
@ -41,6 +42,12 @@ public class RequestExPledgeCrestLarge implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
final Player player = client.getPlayer();
if (player == null)
{
return;
}
final Crest crest = CrestTable.getInstance().getCrest(_crestId);
final byte[] data = crest != null ? crest.getData() : null;
if (data != null)
@ -54,7 +61,7 @@ public class RequestExPledgeCrestLarge implements IClientIncomingPacket
}
final byte[] chunk = new byte[size];
System.arraycopy(data, (14336 * i), chunk, 0, size);
client.sendPacket(new ExPledgeEmblem(_crestId, chunk, _clanId, i));
player.sendPacket(new ExPledgeEmblem(_crestId, chunk, _clanId, i));
}
}
}

8
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
View File

@ -71,7 +71,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket
if (player.reduceAdena("RemoveElement", getPrice(targetItem), player, true))
{
targetItem.clearAttribute(type);
client.sendPacket(new UserInfo(player));
player.sendPacket(new UserInfo(player));
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(targetItem);
@ -113,12 +113,12 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket
sm.addAttribute(realElement.getOpposite().getClientId());
}
}
client.sendPacket(sm);
client.sendPacket(new ExBaseAttributeCancelResult(targetItem.getObjectId(), _element));
player.sendPacket(sm);
player.sendPacket(new ExBaseAttributeCancelResult(targetItem.getObjectId(), _element));
}
else
{
client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_FUNDS_TO_CANCEL_THIS_ATTRIBUTE);
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_FUNDS_TO_CANCEL_THIS_ATTRIBUTE);
}
}

9
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
View File

@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExRpItemLink;
@ -40,13 +41,19 @@ public class RequestExRqItemLink implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
final Player player = client.getPlayer();
if (player == null)
{
return;
}
final WorldObject object = World.getInstance().findObject(_objectId);
if ((object != null) && object.isItem())
{
final Item item = (Item) object;
if (item.isPublished())
{
client.sendPacket(new ExRpItemLink(item));
player.sendPacket(new ExRpItemLink(item));
}
}
}

12
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
View File

@ -66,19 +66,19 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket
if ((_length < 0) || (_length > 2176))
{
client.sendPacket(SystemMessageId.THE_SIZE_OF_THE_UPLOADED_SYMBOL_DOES_NOT_MEET_THE_STANDARD_REQUIREMENTS);
player.sendPacket(SystemMessageId.THE_SIZE_OF_THE_UPLOADED_SYMBOL_DOES_NOT_MEET_THE_STANDARD_REQUIREMENTS);
return;
}
if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis())
{
client.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST);
player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST);
return;
}
if (!player.hasClanPrivilege(ClanPrivilege.CL_REGISTER_CREST))
{
client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
return;
}
@ -87,14 +87,14 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket
if (clan.getCrestLargeId() != 0)
{
clan.changeLargeCrest(0);
client.sendPacket(SystemMessageId.THE_CLAN_MARK_HAS_BEEN_DELETED);
player.sendPacket(SystemMessageId.THE_CLAN_MARK_HAS_BEEN_DELETED);
}
}
else
{
if (clan.getLevel() < 3)
{
client.sendPacket(SystemMessageId.A_CLAN_CREST_CAN_ONLY_BE_REGISTERED_WHEN_THE_CLAN_S_SKILL_LEVEL_IS_3_OR_ABOVE);
player.sendPacket(SystemMessageId.A_CLAN_CREST_CAN_ONLY_BE_REGISTERED_WHEN_THE_CLAN_S_SKILL_LEVEL_IS_3_OR_ABOVE);
return;
}
@ -102,7 +102,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket
if (crest != null)
{
clan.changeLargeCrest(crest.getId());
client.sendPacket(SystemMessageId.THE_CLAN_MARK_WAS_SUCCESSFULLY_REGISTERED_THE_SYMBOL_WILL_APPEAR_ON_THE_CLAN_FLAG_AND_THE_INSIGNIA_IS_ONLY_DISPLAYED_ON_ITEMS_PERTAINING_TO_A_CLAN_THAT_OWNS_A_CLAN_HALL_OR_CASTLE);
player.sendPacket(SystemMessageId.THE_CLAN_MARK_WAS_SUCCESSFULLY_REGISTERED_THE_SYMBOL_WILL_APPEAR_ON_THE_CLAN_FLAG_AND_THE_INSIGNIA_IS_ONLY_DISPLAYED_ON_ITEMS_PERTAINING_TO_A_CLAN_THAT_OWNS_A_CLAN_HALL_OR_CASTLE);
}
}
}

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
View File

@ -48,6 +48,6 @@ public class RequestExShowContactList implements IClientIncomingPacket
return;
}
client.sendPacket(new ExShowContactList(player));
player.sendPacket(new ExShowContactList(player));
}
}

6
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
View File

@ -69,9 +69,9 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null))
{
client.sendPacket(SystemMessageId.DOES_NOT_FIT_STRENGTHENING_CONDITIONS_OF_THE_SCROLL);
player.sendPacket(SystemMessageId.DOES_NOT_FIT_STRENGTHENING_CONDITIONS_OF_THE_SCROLL);
player.removeRequest(request.getClass());
client.sendPacket(new ExPutEnchantTargetItemResult(0));
player.sendPacket(new ExPutEnchantTargetItemResult(0));
if (scrollTemplate == null)
{
PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId());
@ -79,6 +79,6 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
return;
}
request.setTimestamp(Chronos.currentTimeMillis());
client.sendPacket(new ExPutEnchantTargetItemResult(_objectId));
player.sendPacket(new ExPutEnchantTargetItemResult(_objectId));
}
}

19
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
View File

@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.FortManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger;
@ -41,18 +42,20 @@ public class RequestFortressMapInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
final Player player = client.getPlayer();
if (player == null)
{
return;
}
final Fort fort = FortManager.getInstance().getFortById(_fortressId);
if (fort == null)
{
PacketLogger.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")");
if (client.getPlayer() == null)
{
return;
}
client.sendPacket(ActionFailed.STATIC_PACKET);
PacketLogger.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + player + ")");
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
client.sendPacket(new ExShowFortressMapInfo(fort));
player.sendPacket(new ExShowFortressMapInfo(fort));
}
}

9
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
View File

@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.FortManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressSiegeInfo;
@ -36,11 +37,17 @@ public class RequestFortressSiegeInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
final Player player = client.getPlayer();
if (player == null)
{
return;
}
for (Fort fort : FortManager.getInstance().getForts())
{
if ((fort != null) && fort.getSiege().isInProgress())
{
client.sendPacket(new ExShowFortressSiegeInfo(fort));
player.sendPacket(new ExShowFortressSiegeInfo(fort));
}
}
}

4
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
View File

@ -54,14 +54,14 @@ public class RequestGetOffVehicle implements IClientIncomingPacket
}
if (!player.isInBoat() || (player.getBoat().getObjectId() != _boatId) || player.getBoat().isMoving() || !player.isInsideRadius3D(_x, _y, _z, 1000))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
player.broadcastPacket(new StopMoveInVehicle(player, _boatId));
player.setVehicle(null);
player.setInVehiclePosition(null);
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
player.broadcastPacket(new GetOffVehicle(player.getObjectId(), _boatId, _x, _y, _z));
player.setXYZ(_x, _y, _z);
player.setInsideZone(ZoneId.PEACE, false);

4
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
View File

@ -57,7 +57,7 @@ public class RequestGetOnVehicle implements IClientIncomingPacket
boat = player.getBoat();
if (boat.getObjectId() != _boatId)
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@ -66,7 +66,7 @@ public class RequestGetOnVehicle implements IClientIncomingPacket
boat = BoatManager.getInstance().getBoat(_boatId);
if ((boat == null) || boat.isMoving() || !player.isInsideRadius3D(boat, 1000))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}

10
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
View File

@ -49,7 +49,7 @@ public class RequestGiveNickName implements IClientIncomingPacket
if (player.isNoble() && _target.equalsIgnoreCase(player.getName()))
{
player.setTitle(_title);
client.sendPacket(SystemMessageId.YOUR_TITLE_HAS_BEEN_CHANGED);
player.sendPacket(SystemMessageId.YOUR_TITLE_HAS_BEEN_CHANGED);
player.broadcastTitleInfo();
}
else
@ -57,13 +57,13 @@ public class RequestGiveNickName implements IClientIncomingPacket
// Can the player change/give a title?
if (!player.hasClanPrivilege(ClanPrivilege.CL_GIVE_TITLE))
{
client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
return;
}
if (player.getClan().getLevel() < 3)
{
client.sendPacket(SystemMessageId.A_PLAYER_CAN_ONLY_BE_GRANTED_A_TITLE_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE);
player.sendPacket(SystemMessageId.A_PLAYER_CAN_ONLY_BE_GRANTED_A_TITLE_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE);
return;
}
@ -80,12 +80,12 @@ public class RequestGiveNickName implements IClientIncomingPacket
}
else
{
client.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE);
player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE);
}
}
else
{
client.sendPacket(SystemMessageId.THE_TARGET_MUST_BE_A_CLAN_MEMBER);
player.sendPacket(SystemMessageId.THE_TARGET_MUST_BE_A_CLAN_MEMBER);
}
}
}

10
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
View File

@ -62,7 +62,7 @@ public class RequestHennaEquip implements IClientIncomingPacket
if (henna == null)
{
PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player);
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -73,20 +73,20 @@ public class RequestHennaEquip implements IClientIncomingPacket
if (player.getHenna(4) != null)
{
player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL);
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
else
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
else if (player.getHennaEmptySlots() == 0)
{
player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL);
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -108,7 +108,7 @@ public class RequestHennaEquip implements IClientIncomingPacket
{
Util.handleIllegalPlayerAction(player, "Exploit attempt: Character " + player.getName() + " of account " + player.getAccountName() + " tryed to add a forbidden henna.", Config.DEFAULT_PUNISH);
}
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
}
}
}

5
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
View File

@ -55,9 +55,10 @@ public class RequestHennaItemInfo implements IClientIncomingPacket
{
PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player);
}
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
client.sendPacket(new HennaItemDrawInfo(henna, player));
player.sendPacket(new HennaItemDrawInfo(henna, player));
}
}

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
View File

@ -52,7 +52,7 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket
if (henna == null)
{
PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player);
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}

6
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
View File

@ -49,7 +49,7 @@ public class RequestHennaRemove implements IClientIncomingPacket
if (!client.getFloodProtectors().canPerformTransaction())
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -67,7 +67,7 @@ public class RequestHennaRemove implements IClientIncomingPacket
else
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
}
found = true;
break;
@ -77,7 +77,7 @@ public class RequestHennaRemove implements IClientIncomingPacket
if (!found)
{
PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna.");
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
}
}
}

3
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
View File

@ -41,6 +41,7 @@ public class RequestHennaRemoveList implements IClientIncomingPacket
{
return;
}
client.sendPacket(new HennaRemoveList(player));
player.sendPacket(new HennaRemoveList(player));
}
}

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
View File

@ -65,6 +65,6 @@ public class RequestInfoItemAuction implements IClientIncomingPacket
}
player.updateLastItemAuctionRequest();
client.sendPacket(new ExItemAuctionInfoPacket(true, auction, instance.getNextAuction()));
player.sendPacket(new ExItemAuctionInfoPacket(true, auction, instance.getNextAuction()));
}
}

3
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
View File

@ -40,6 +40,7 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{
return;
}
client.sendPacket(new ExInzoneWaiting(player));
player.sendPacket(new ExInzoneWaiting(player));
}
}

13
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
View File

@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
/**
@ -33,9 +34,17 @@ public class RequestItemList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
if ((client != null) && (client.getPlayer() != null) && !client.getPlayer().isInventoryDisabled())
final Player player = client.getPlayer();
if (player == null)
{
client.getPlayer().sendItemList(true);
return;
}
if (player.isInventoryDisabled())
{
return;
}
player.sendItemList(true);
}
}

4
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
View File

@ -55,7 +55,7 @@ public class RequestJoinSiege implements IClientIncomingPacket
if (!player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_SIEGE))
{
client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
return;
}
@ -72,7 +72,7 @@ public class RequestJoinSiege implements IClientIncomingPacket
{
if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime())
{
client.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION);
player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION);
return;
}
if (_isAttacker == 1)

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
View File

@ -44,7 +44,7 @@ public class RequestKeyMapping implements IClientIncomingPacket
if (Config.STORE_UI_SETTINGS)
{
client.sendPacket(new ExUISetting(player));
player.sendPacket(new ExUISetting(player));
}
}
}

18
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
View File

@ -42,32 +42,32 @@ public class RequestLinkHtml implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
final Player actor = client.getPlayer();
if (actor == null)
final Player player = client.getPlayer();
if (player == null)
{
return;
}
if (_link.isEmpty())
{
PacketLogger.warning("Player " + actor.getName() + " sent empty html link!");
PacketLogger.warning("Player " + player.getName() + " sent empty html link!");
return;
}
if (_link.contains(".."))
{
PacketLogger.warning("Player " + actor.getName() + " sent invalid html link: link " + _link);
PacketLogger.warning("Player " + player.getName() + " sent invalid html link: link " + _link);
return;
}
final int htmlObjectId = actor.validateHtmlAction("link " + _link);
final int htmlObjectId = player.validateHtmlAction("link " + _link);
if (htmlObjectId == -1)
{
PacketLogger.warning("Player " + actor.getName() + " sent non cached html link: link " + _link);
PacketLogger.warning("Player " + player.getName() + " sent non cached html link: link " + _link);
return;
}
if ((htmlObjectId > 0) && !Util.isInsideRangeOfObjectId(actor, htmlObjectId, Npc.INTERACTION_DISTANCE))
if ((htmlObjectId > 0) && !Util.isInsideRangeOfObjectId(player, htmlObjectId, Npc.INTERACTION_DISTANCE))
{
// No logging here, this could be a common case
return;
@ -75,7 +75,7 @@ public class RequestLinkHtml implements IClientIncomingPacket
final String filename = "data/html/" + _link;
final NpcHtmlMessage msg = new NpcHtmlMessage(htmlObjectId);
msg.setFile(actor, filename);
actor.sendPacket(msg);
msg.setFile(player, filename);
player.sendPacket(msg);
}
}

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
View File

@ -67,6 +67,6 @@ public class RequestListPartyMatchingWaitingRoom implements IClientIncomingPacke
return;
}
client.sendPacket(new ExListPartyMatchingWaitingRoom(_page, _minLevel, _maxLevel, _classId, _query));
player.sendPacket(new ExListPartyMatchingWaitingRoom(_page, _minLevel, _maxLevel, _classId, _query));
}
}

9
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
View File

@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExSendManorList;
@ -34,6 +35,12 @@ public class RequestManorList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
client.sendPacket(ExSendManorList.STATIC_PACKET);
final Player player = client.getPlayer();
if (player == null)
{
return;
}
player.sendPacket(ExSendManorList.STATIC_PACKET);
}
}

18
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
View File

@ -64,40 +64,40 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket
if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis()))
{
client.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE);
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if ((_targetX == _originX) && (_targetY == _originY) && (_targetZ == _originZ))
{
client.sendPacket(new StopMoveInVehicle(player, _boatId));
player.sendPacket(new StopMoveInVehicle(player, _boatId));
return;
}
if (player.isAttackingNow() && (player.getActiveWeaponItem() != null) && (player.getActiveWeaponItem().getItemType() == WeaponType.BOW))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (player.isSitting() || player.isMovementDisabled())
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (player.hasSummon())
{
client.sendPacket(SystemMessageId.YOU_SHOULD_RELEASE_YOUR_PET_OR_SERVITOR_SO_THAT_IT_DOES_NOT_FALL_OFF_OF_THE_BOAT_AND_DROWN);
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(SystemMessageId.YOU_SHOULD_RELEASE_YOUR_PET_OR_SERVITOR_SO_THAT_IT_DOES_NOT_FALL_OFF_OF_THE_BOAT_AND_DROWN);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (player.isTransformed())
{
client.sendPacket(SystemMessageId.YOU_CANNOT_POLYMORPH_WHILE_RIDING_A_BOAT);
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(SystemMessageId.YOU_CANNOT_POLYMORPH_WHILE_RIDING_A_BOAT);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
View File

@ -65,7 +65,7 @@ public class RequestOustFromPartyRoom implements IClientIncomingPacket
final Party memberParty = player.getParty();
if ((playerParty != null) && (memberParty != null) && (playerParty.getLeaderObjectId() == memberParty.getLeaderObjectId()))
{
client.sendPacket(SystemMessageId.YOU_CANNOT_DISMISS_A_PARTY_MEMBER_BY_FORCE);
player.sendPacket(SystemMessageId.YOU_CANNOT_DISMISS_A_PARTY_MEMBER_BY_FORCE);
}
else
{

12
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
View File

@ -54,17 +54,17 @@ public class RequestOustPledgeMember implements IClientIncomingPacket
}
if (player.getClan() == null)
{
client.sendPacket(SystemMessageId.YOU_ARE_NOT_A_CLAN_MEMBER_AND_CANNOT_PERFORM_THIS_ACTION);
player.sendPacket(SystemMessageId.YOU_ARE_NOT_A_CLAN_MEMBER_AND_CANNOT_PERFORM_THIS_ACTION);
return;
}
if (!player.hasClanPrivilege(ClanPrivilege.CL_DISMISS))
{
client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
return;
}
if (player.getName().equalsIgnoreCase(_target))
{
client.sendPacket(SystemMessageId.YOU_CANNOT_DISMISS_YOURSELF);
player.sendPacket(SystemMessageId.YOU_CANNOT_DISMISS_YOURSELF);
return;
}
@ -77,7 +77,7 @@ public class RequestOustPledgeMember implements IClientIncomingPacket
}
if (member.isOnline() && member.getPlayer().isInCombat())
{
client.sendPacket(SystemMessageId.A_CLAN_MEMBER_MAY_NOT_BE_DISMISSED_DURING_COMBAT);
player.sendPacket(SystemMessageId.A_CLAN_MEMBER_MAY_NOT_BE_DISMISSED_DURING_COMBAT);
return;
}
@ -89,8 +89,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED);
sm.addString(member.getName());
clan.broadcastToOnlineMembers(sm);
client.sendPacket(SystemMessageId.YOU_HAVE_SUCCEEDED_IN_EXPELLING_THE_CLAN_MEMBER);
client.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER);
player.sendPacket(SystemMessageId.YOU_HAVE_SUCCEEDED_IN_EXPELLING_THE_CLAN_MEMBER);
player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER);
// Remove the Player From the Member list
clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(_target));

3
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
View File

@ -44,6 +44,7 @@ public class RequestPackageSendableItemList implements IClientIncomingPacket
{
return;
}
client.sendPacket(new PackageSendableList(player, _objectId));
player.sendPacket(new PackageSendableList(player, _objectId));
}
}

30
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
View File

@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.instance.Pet;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.siege.Castle;
@ -43,37 +44,48 @@ public class RequestPetGetItem implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
final World world = World.getInstance();
final Item item = (Item) world.findObject(_objectId);
if ((item == null) || (client.getPlayer() == null) || !client.getPlayer().hasPet())
final Player player = client.getPlayer();
if (player == null)
{
client.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!player.hasPet())
{
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final Item item = (Item) World.getInstance().findObject(_objectId);
if (item == null)
{
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final Castle castle = CastleManager.getInstance().getCastle(item);
if ((castle != null) && (SiegeGuardManager.getInstance().getSiegeGuardByItem(castle.getResidenceId(), item.getId()) != null))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (FortSiegeManager.getInstance().isCombat(item.getId()))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final Pet pet = client.getPlayer().getPet();
final Pet pet = player.getPet();
if (pet.isDead() || pet.isControlBlocked())
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (pet.isUncontrollable())
{
client.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
return;
}

18
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
View File

@ -64,25 +64,25 @@ public class RequestPetition implements IClientIncomingPacket
if (!AdminData.getInstance().isGmOnline(false))
{
client.sendPacket(SystemMessageId.THERE_ARE_NO_GMS_CURRENTLY_VISIBLE_IN_THE_PUBLIC_LIST_AS_THEY_MAY_BE_PERFORMING_OTHER_FUNCTIONS_AT_THE_MOMENT);
player.sendPacket(SystemMessageId.THERE_ARE_NO_GMS_CURRENTLY_VISIBLE_IN_THE_PUBLIC_LIST_AS_THEY_MAY_BE_PERFORMING_OTHER_FUNCTIONS_AT_THE_MOMENT);
return;
}
if (!PetitionManager.getInstance().isPetitioningAllowed())
{
client.sendPacket(SystemMessageId.THE_GAME_CLIENT_ENCOUNTERED_AN_ERROR_AND_WAS_UNABLE_TO_CONNECT_TO_THE_PETITION_SERVER);
player.sendPacket(SystemMessageId.THE_GAME_CLIENT_ENCOUNTERED_AN_ERROR_AND_WAS_UNABLE_TO_CONNECT_TO_THE_PETITION_SERVER);
return;
}
if (PetitionManager.getInstance().isPlayerPetitionPending(player))
{
client.sendPacket(SystemMessageId.YOU_MAY_ONLY_SUBMIT_ONE_PETITION_ACTIVE_AT_A_TIME);
player.sendPacket(SystemMessageId.YOU_MAY_ONLY_SUBMIT_ONE_PETITION_ACTIVE_AT_A_TIME);
return;
}
if (PetitionManager.getInstance().getPendingPetitionCount() == Config.MAX_PETITIONS_PENDING)
{
client.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_ON_HTTPS_LINEAGE2_CUSTHELP_COM);
player.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_ON_HTTPS_LINEAGE2_CUSTHELP_COM);
return;
}
@ -91,28 +91,28 @@ public class RequestPetition implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.WE_HAVE_RECEIVED_S1_PETITIONS_FROM_YOU_TODAY_AND_THAT_IS_THE_MAXIMUM_THAT_YOU_CAN_SUBMIT_IN_ONE_DAY_YOU_CANNOT_SUBMIT_ANY_MORE_PETITIONS);
sm.addInt(totalPetitions);
client.sendPacket(sm);
player.sendPacket(sm);
return;
}
if (_content.length() > 255)
{
client.sendPacket(SystemMessageId.THE_PETITION_CAN_CONTAIN_UP_TO_800_CHARACTERS);
player.sendPacket(SystemMessageId.THE_PETITION_CAN_CONTAIN_UP_TO_800_CHARACTERS);
return;
}
final int petitionId = PetitionManager.getInstance().submitPetition(player, _content, _type);
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_PETITION_APPLICATION_HAS_BEEN_ACCEPTED_NRECEIPT_NO_IS_S1);
sm.addInt(petitionId);
client.sendPacket(sm);
player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_SUBMITTED_S1_PETITION_S_NYOU_MAY_SUBMIT_S2_MORE_PETITION_S_TODAY);
sm.addInt(totalPetitions);
sm.addInt(Config.MAX_PETITIONS_PER_PLAYER - totalPetitions);
client.sendPacket(sm);
player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.THERE_ARE_S1_PETITIONS_CURRENTLY_ON_THE_WAITING_LIST);
sm.addInt(PetitionManager.getInstance().getPendingPetitionCount());
client.sendPacket(sm);
player.sendPacket(sm);
}
}

9
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
View File

@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.PledgeCrest;
@ -38,6 +39,12 @@ public class RequestPledgeCrest implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
client.sendPacket(new PledgeCrest(_crestId));
final Player player = client.getPlayer();
if (player == null)
{
return;
}
player.sendPacket(new PledgeCrest(_crestId));
}
}

8
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
View File

@ -51,7 +51,7 @@ public class RequestPledgeDraftListApply implements IClientIncomingPacket
if (player.getClan() != null)
{
client.sendPacket(SystemMessageId.ONLY_THE_CLAN_LEADER_OR_SOMEONE_WITH_RANK_MANAGEMENT_AUTHORITY_MAY_REGISTER_THE_CLAN);
player.sendPacket(SystemMessageId.ONLY_THE_CLAN_LEADER_OR_SOMEONE_WITH_RANK_MANAGEMENT_AUTHORITY_MAY_REGISTER_THE_CLAN);
return;
}
@ -61,7 +61,7 @@ public class RequestPledgeDraftListApply implements IClientIncomingPacket
{
if (ClanEntryManager.getInstance().removeFromWaitingList(player.getObjectId()))
{
client.sendPacket(SystemMessageId.ENTRY_APPLICATION_CANCELLED_YOU_MAY_APPLY_TO_A_NEW_CLAN_AFTER_5_MINUTES);
player.sendPacket(SystemMessageId.ENTRY_APPLICATION_CANCELLED_YOU_MAY_APPLY_TO_A_NEW_CLAN_AFTER_5_MINUTES);
}
break;
}
@ -70,13 +70,13 @@ public class RequestPledgeDraftListApply implements IClientIncomingPacket
final PledgeWaitingInfo pledgeDraftList = new PledgeWaitingInfo(player.getObjectId(), player.getLevel(), _karma, player.getClassId().getId(), player.getName());
if (ClanEntryManager.getInstance().addToWaitingList(player.getObjectId(), pledgeDraftList))
{
client.sendPacket(SystemMessageId.ENTERED_INTO_WAITING_LIST_NAME_IS_AUTOMATICALLY_DELETED_AFTER_30_DAYS_IF_DELETE_FROM_WAITING_LIST_IS_USED_YOU_CANNOT_ENTER_NAMES_INTO_THE_WAITING_LIST_FOR_5_MINUTES);
player.sendPacket(SystemMessageId.ENTERED_INTO_WAITING_LIST_NAME_IS_AUTOMATICALLY_DELETED_AFTER_30_DAYS_IF_DELETE_FROM_WAITING_LIST_IS_USED_YOU_CANNOT_ENTER_NAMES_INTO_THE_WAITING_LIST_FOR_5_MINUTES);
}
else
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_MAY_APPLY_FOR_ENTRY_AFTER_S1_MINUTE_S_DUE_TO_CANCELLING_YOUR_APPLICATION);
sm.addLong(ClanEntryManager.getInstance().getPlayerLockTime(player.getObjectId()));
client.sendPacket(sm);
player.sendPacket(sm);
}
break;
}

4
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
View File

@ -58,11 +58,11 @@ public class RequestPledgeDraftListSearch implements IClientIncomingPacket
if (_query.isEmpty())
{
client.sendPacket(new ExPledgeDraftListSearch(ClanEntryManager.getInstance().getSortedWaitingList(_levelMin, _levelMax, _classId, _sortBy, _descending)));
player.sendPacket(new ExPledgeDraftListSearch(ClanEntryManager.getInstance().getSortedWaitingList(_levelMin, _levelMax, _classId, _sortBy, _descending)));
}
else
{
client.sendPacket(new ExPledgeDraftListSearch(ClanEntryManager.getInstance().queryWaitingListByName(_query.toLowerCase())));
player.sendPacket(new ExPledgeDraftListSearch(ClanEntryManager.getInstance().queryWaitingListByName(_query.toLowerCase())));
}
}
}

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
View File

@ -49,6 +49,6 @@ public class RequestPledgeInfo implements IClientIncomingPacket
return; // we have no clan data ?!? should not happen
}
client.sendPacket(new PledgeInfo(clan));
player.sendPacket(new PledgeInfo(clan));
}
}

3
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
View File

@ -64,6 +64,7 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket
{
return;
}
client.sendPacket(new PledgeReceiveMemberInfo(member));
player.sendPacket(new PledgeReceiveMemberInfo(member));
}
}

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
View File

@ -53,7 +53,7 @@ public class RequestPledgePower implements IClientIncomingPacket
return;
}
player.sendPacket(new ManagePledgePower(client.getPlayer().getClan(), _action, _rank));
player.sendPacket(new ManagePledgePower(player.getClan(), _action, _rank));
if ((_action == 2) && player.isClanLeader())
{
if (_rank == 9)

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
View File

@ -52,6 +52,6 @@ public class RequestPledgeRecruitBoardDetail implements IClientIncomingPacket
return;
}
client.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
player.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
}
}

4
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
View File

@ -66,7 +66,7 @@ public class RequestPledgeWaitingApply implements IClientIncomingPacket
final PledgeApplicantInfo info = new PledgeApplicantInfo(player.getObjectId(), player.getName(), player.getLevel(), _karma, _clanId, _message);
if (ClanEntryManager.getInstance().addPlayerApplicationToClan(_clanId, info))
{
client.sendPacket(new ExPledgeRecruitApplyInfo(ClanEntryStatus.WAITING));
player.sendPacket(new ExPledgeRecruitApplyInfo(ClanEntryStatus.WAITING));
final Player clanLeader = World.getInstance().getPlayer(clan.getLeaderId());
if (clanLeader != null)
@ -78,7 +78,7 @@ public class RequestPledgeWaitingApply implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_MAY_APPLY_FOR_ENTRY_AFTER_S1_MINUTE_S_DUE_TO_CANCELLING_YOUR_APPLICATION);
sm.addLong(ClanEntryManager.getInstance().getPlayerLockTime(player.getObjectId()));
client.sendPacket(sm);
player.sendPacket(sm);
}
}
}

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
View File

@ -44,6 +44,6 @@ public class RequestPledgeWaitingList implements IClientIncomingPacket
return;
}
client.sendPacket(new ExPledgeWaitingList(_clanId));
player.sendPacket(new ExPledgeWaitingList(_clanId));
}
}

4
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
View File

@ -52,11 +52,11 @@ public class RequestPledgeWaitingUser implements IClientIncomingPacket
final PledgeApplicantInfo infos = ClanEntryManager.getInstance().getPlayerApplication(_clanId, _playerId);
if (infos == null)
{
client.sendPacket(new ExPledgeWaitingList(_clanId));
player.sendPacket(new ExPledgeWaitingList(_clanId));
}
else
{
client.sendPacket(new ExPledgeWaitingUser(infos));
player.sendPacket(new ExPledgeWaitingUser(infos));
}
}
}

20
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
View File

@ -78,25 +78,25 @@ public class RequestPostAttachment implements IClientIncomingPacket
if (!player.isInsideZone(ZoneId.PEACE))
{
client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_IN_A_NON_PEACE_ZONE_LOCATION);
player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_IN_A_NON_PEACE_ZONE_LOCATION);
return;
}
if (player.getActiveTradeList() != null)
{
client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_DURING_AN_EXCHANGE);
player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_DURING_AN_EXCHANGE);
return;
}
if (player.hasItemRequest())
{
client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_MAIL_WHILE_ENCHANTING_AN_ITEM_BESTOWING_AN_ATTRIBUTE_OR_COMBINING_JEWELS);
player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_MAIL_WHILE_ENCHANTING_AN_ITEM_BESTOWING_AN_ATTRIBUTE_OR_COMBINING_JEWELS);
return;
}
if (player.getPrivateStoreType() != PrivateStoreType.NONE)
{
client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_BECAUSE_THE_PRIVATE_STORE_OR_WORKSHOP_IS_IN_PROGRESS);
player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_BECAUSE_THE_PRIVATE_STORE_OR_WORKSHOP_IS_IN_PROGRESS);
return;
}
@ -165,21 +165,21 @@ public class RequestPostAttachment implements IClientIncomingPacket
// Item Max Limit Check
if (!player.getInventory().validateCapacity(slots))
{
client.sendPacket(SystemMessageId.YOU_COULD_NOT_RECEIVE_BECAUSE_YOUR_INVENTORY_IS_FULL);
player.sendPacket(SystemMessageId.YOU_COULD_NOT_RECEIVE_BECAUSE_YOUR_INVENTORY_IS_FULL);
return;
}
// Weight limit Check
if (!player.getInventory().validateWeight(weight))
{
client.sendPacket(SystemMessageId.YOU_COULD_NOT_RECEIVE_BECAUSE_YOUR_INVENTORY_IS_FULL);
player.sendPacket(SystemMessageId.YOU_COULD_NOT_RECEIVE_BECAUSE_YOUR_INVENTORY_IS_FULL);
return;
}
final long adena = msg.getReqAdena();
if ((adena > 0) && !player.reduceAdena("PayMail", adena, null, true))
{
client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_BECAUSE_YOU_DON_T_HAVE_ENOUGH_ADENA);
player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_BECAUSE_YOU_DON_T_HAVE_ENOUGH_ADENA);
return;
}
@ -219,7 +219,7 @@ public class RequestPostAttachment implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1);
sm.addItemName(item.getId());
sm.addLong(count);
client.sendPacket(sm);
player.sendPacket(sm);
}
// Send updated item list to the player
@ -262,7 +262,7 @@ public class RequestPostAttachment implements IClientIncomingPacket
sender.sendPacket(sm);
}
client.sendPacket(new ExChangePostState(true, _msgId, Message.READED));
client.sendPacket(SystemMessageId.MAIL_SUCCESSFULLY_RECEIVED);
player.sendPacket(new ExChangePostState(true, _msgId, Message.READED));
player.sendPacket(SystemMessageId.MAIL_SUCCESSFULLY_RECEIVED);
}
}

4
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
View File

@ -51,10 +51,10 @@ public class RequestPostItemList implements IClientIncomingPacket
if (!player.isInsideZone(ZoneId.PEACE))
{
client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
return;
}
client.sendPacket(new ExReplyPostItemList(player));
player.sendPacket(new ExReplyPostItemList(player));
}
}

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
View File

@ -144,7 +144,7 @@ public class RequestPreviewItem implements IClientIncomingPacket
if ((_count < 1) || (_listId >= 4000000))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}

10
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
View File

@ -82,7 +82,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket
if (_items == null)
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -129,21 +129,21 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket
if (!player.getAccessLevel().allowTransaction())
{
player.sendMessage("Transactions are disabled for your Access Level.");
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if ((storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL) && (storeList.getItemCount() > _items.size()))
{
final String msgErr = "[RequestPrivateStoreBuy] player " + client.getPlayer().getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!";
Util.handleIllegalPlayerAction(client.getPlayer(), msgErr, Config.DEFAULT_PUNISH);
final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!";
Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH);
return;
}
final int result = storeList.privateStoreBuy(player, _items);
if (result > 0)
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
if (result > 1)
{
PacketLogger.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName());

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
View File

@ -47,7 +47,7 @@ public class RequestPrivateStoreManageSell implements IClientIncomingPacket
// Player shouldn't be able to set stores if he/she is alike dead (dead or fake death)
if (player.isAlikeDead() || player.isInOlympiadMode())
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
}
}
}

6
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
View File

@ -79,7 +79,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
if (_items == null)
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -120,13 +120,13 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
if (!player.getAccessLevel().allowTransaction())
{
player.sendMessage("Transactions are disabled for your Access Level.");
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!storeList.privateStoreSell(player, _items))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName());
return;
}

10
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
View File

@ -87,21 +87,21 @@ public class RequestProcureCropList implements IClientIncomingPacket
final CastleManorManager manor = CastleManorManager.getInstance();
if (manor.isUnderMaintenance())
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final Npc manager = player.getLastFolkNPC();
if (!(manager instanceof Merchant) || !manager.canInteract(player))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final int castleId = manager.getCastle().getResidenceId();
if (manager.getParameters().getInt("manor_id", -1) != castleId)
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -112,14 +112,14 @@ public class RequestProcureCropList implements IClientIncomingPacket
final Item item = player.getInventory().getItemByObjectId(i.getObjectId());
if ((item == null) || (item.getCount() < i.getCount()) || (item.getId() != i.getId()))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final CropProcure cp = i.getCropProcure();
if ((cp == null) || (cp.getAmount() < i.getCount()))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}

9
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
View File

@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.QuestList;
@ -34,6 +35,12 @@ public class RequestQuestList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
client.sendPacket(new QuestList(client.getPlayer()));
final Player player = client.getPlayer();
if (player == null)
{
return;
}
player.sendPacket(new QuestList(player));
}
}

6
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
View File

@ -59,7 +59,7 @@ public class RequestReceivedPost implements IClientIncomingPacket
if (!player.isInsideZone(ZoneId.PEACE) && msg.hasAttachments())
{
client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
return;
}
@ -74,8 +74,8 @@ public class RequestReceivedPost implements IClientIncomingPacket
return;
}
client.sendPacket(new ExReplyReceivedPost(msg));
client.sendPacket(new ExChangePostState(true, _msgId, Message.READED));
player.sendPacket(new ExReplyReceivedPost(msg));
player.sendPacket(new ExChangePostState(true, _msgId, Message.READED));
msg.markAsRead();
}
}

3
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
View File

@ -47,6 +47,7 @@ public class RequestReceivedPostList implements IClientIncomingPacket
// player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
// return;
// }
client.sendPacket(new ExShowReceivedPostList(player.getObjectId()));
player.sendPacket(new ExShowReceivedPostList(player.getObjectId()));
}
}

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
View File

@ -44,7 +44,7 @@ public class RequestRecipeBookOpen implements IClientIncomingPacket
if (player.isCastingNow())
{
client.sendPacket(SystemMessageId.YOUR_RECIPE_BOOK_MAY_NOT_BE_ACCESSED_WHILE_USING_A_SKILL);
player.sendPacket(SystemMessageId.YOUR_RECIPE_BOOK_MAY_NOT_BE_ACCESSED_WHILE_USING_A_SKILL);
return;
}

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
View File

@ -41,6 +41,6 @@ public class RequestRecipeItemMakeInfo implements IClientIncomingPacket
return;
}
client.sendPacket(new RecipeItemMakeInfo(_id, player));
player.sendPacket(new RecipeItemMakeInfo(_id, player));
}
}

8
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
View File

@ -85,15 +85,15 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket
if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player) || player.isInDuel())
{
client.sendPacket(SystemMessageId.WHILE_YOU_ARE_ENGAGED_IN_COMBAT_YOU_CANNOT_OPERATE_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(SystemMessageId.WHILE_YOU_ARE_ENGAGED_IN_COMBAT_YOU_CANNOT_OPERATE_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (player.isInsideZone(ZoneId.NO_STORE))
{
client.sendPacket(SystemMessageId.YOU_CANNOT_OPEN_A_PRIVATE_WORKSHOP_HERE);
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(SystemMessageId.YOU_CANNOT_OPEN_A_PRIVATE_WORKSHOP_HERE);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
View File

@ -54,6 +54,6 @@ public class RequestRecipeShopMakeInfo implements IClientIncomingPacket
return;
}
client.sendPacket(new RecipeShopItemInfo(shop, _recipeId));
player.sendPacket(new RecipeShopItemInfo(shop, _recipeId));
}
}

4
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
View File

@ -43,7 +43,7 @@ public class RequestRecipeShopManageList implements IClientIncomingPacket
// Player shouldn't be able to set stores if he/she is alike dead (dead or fake death)
if (player.isAlikeDead())
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (player.getPrivateStoreType() != PrivateStoreType.NONE)
@ -56,6 +56,6 @@ public class RequestRecipeShopManageList implements IClientIncomingPacket
}
}
client.sendPacket(new RecipeShopManageList(player, true));
player.sendPacket(new RecipeShopManageList(player, true));
}
}

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
View File

@ -43,7 +43,7 @@ public class RequestRecipeShopManagePrev implements IClientIncomingPacket
}
else if (player.isAlikeDead() || (player.getTarget() == null) || !player.getTarget().isPlayer())
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
View File

@ -41,7 +41,7 @@ public class RequestRecordInfo implements IClientIncomingPacket
return;
}
client.sendPacket(new UserInfo(player));
player.sendPacket(new UserInfo(player));
World.getInstance().forEachVisibleObject(player, WorldObject.class, object ->
{
if (object.isVisibleFor(player))

16
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
View File

@ -54,21 +54,21 @@ public class RequestRefineCancel implements IClientIncomingPacket
final Item targetItem = player.getInventory().getItemByObjectId(_targetItemObjId);
if (targetItem == null)
{
client.sendPacket(ExVariationCancelResult.STATIC_PACKET_FAILURE);
player.sendPacket(ExVariationCancelResult.STATIC_PACKET_FAILURE);
return;
}
if (targetItem.getOwnerId() != player.getObjectId())
{
Util.handleIllegalPlayerAction(client.getPlayer(), "Warning!! Character " + client.getPlayer().getName() + " of account " + client.getPlayer().getAccountName() + " tryied to augment item that doesn't own.", Config.DEFAULT_PUNISH);
Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tryied to augment item that doesn't own.", Config.DEFAULT_PUNISH);
return;
}
// cannot remove augmentation from a not augmented item
if (!targetItem.isAugmented())
{
client.sendPacket(SystemMessageId.AUGMENTATION_REMOVAL_CAN_ONLY_BE_DONE_ON_AN_AUGMENTED_ITEM);
client.sendPacket(ExVariationCancelResult.STATIC_PACKET_FAILURE);
player.sendPacket(SystemMessageId.AUGMENTATION_REMOVAL_CAN_ONLY_BE_DONE_ON_AN_AUGMENTED_ITEM);
player.sendPacket(ExVariationCancelResult.STATIC_PACKET_FAILURE);
return;
}
@ -76,15 +76,15 @@ public class RequestRefineCancel implements IClientIncomingPacket
final long price = VariationData.getInstance().getCancelFee(targetItem.getId(), targetItem.getAugmentation().getMineralId());
if (price < 0)
{
client.sendPacket(ExVariationCancelResult.STATIC_PACKET_FAILURE);
player.sendPacket(ExVariationCancelResult.STATIC_PACKET_FAILURE);
return;
}
// try to reduce the players adena
if (!player.reduceAdena("RequestRefineCancel", price, targetItem, true))
{
client.sendPacket(ExVariationCancelResult.STATIC_PACKET_FAILURE);
client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
player.sendPacket(ExVariationCancelResult.STATIC_PACKET_FAILURE);
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
return;
}
@ -102,7 +102,7 @@ public class RequestRefineCancel implements IClientIncomingPacket
targetItem.removeAugmentation();
// send ExVariationCancelResult
client.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
player.sendPacket(ExVariationCancelResult.STATIC_PACKET_SUCCESS);
// send inventory update
iu.addModifiedItem(targetItem);

24
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
View File

@ -81,7 +81,7 @@ public class RequestRefundItem implements IClientIncomingPacket
if ((_items == null) || !player.hasRefund())
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -91,7 +91,7 @@ public class RequestRefundItem implements IClientIncomingPacket
{
if (!(target instanceof Merchant) || !player.isInsideRadius3D(target, INTERACTION_DISTANCE) || (player.getInstanceId() != target.getInstanceId()))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
merchant = (Merchant) target;
@ -99,7 +99,7 @@ public class RequestRefundItem implements IClientIncomingPacket
if ((merchant == null) && !player.isGM() && (_listId != CUSTOM_CB_SELL_LIST))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -112,7 +112,7 @@ public class RequestRefundItem implements IClientIncomingPacket
if ((merchant != null) && !buyList.isNpcAllowed(merchant.getId()))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -170,22 +170,22 @@ public class RequestRefundItem implements IClientIncomingPacket
if ((weight > Integer.MAX_VALUE) || (weight < 0) || !player.getInventory().validateWeight((int) weight))
{
client.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT);
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if ((slots > Integer.MAX_VALUE) || (slots < 0) || !player.getInventory().validateCapacity((int) slots))
{
client.sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL);
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!Config.MERCHANT_ZERO_SELL_PRICE && ((adena < 0) || !player.reduceAdena("Refund", adena, player.getLastFolkNPC(), false)))
{
client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -199,7 +199,7 @@ public class RequestRefundItem implements IClientIncomingPacket
}
// Update current load status on player
client.sendPacket(new ExUserInfoInvenWeight(player));
client.sendPacket(new ExBuySellList(player, true));
player.sendPacket(new ExUserInfoInvenWeight(player));
player.sendPacket(new ExBuySellList(player, true));
}
}

6
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
View File

@ -65,7 +65,7 @@ public class RequestRejectPostAttachment implements IClientIncomingPacket
if (!player.isInsideZone(ZoneId.PEACE))
{
client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
return;
}
@ -87,8 +87,8 @@ public class RequestRejectPostAttachment implements IClientIncomingPacket
}
MailManager.getInstance().sendMessage(new Message(msg));
client.sendPacket(SystemMessageId.MAIL_SUCCESSFULLY_RETURNED);
client.sendPacket(new ExChangePostState(true, _msgId, Message.REJECTED));
player.sendPacket(SystemMessageId.MAIL_SUCCESSFULLY_RETURNED);
player.sendPacket(new ExChangePostState(true, _msgId, Message.REJECTED));
final Player sender = World.getInstance().getPlayer(msg.getSenderId());
if (sender != null)

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
View File

@ -57,7 +57,7 @@ public class RequestRestart implements IClientIncomingPacket
if (!player.canLogout())
{
client.sendPacket(RestartResponse.FALSE);
player.sendPacket(RestartResponse.FALSE);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}

16
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
View File

@ -90,14 +90,14 @@ public class RequestSellItem implements IClientIncomingPacket
if (_items == null)
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Alt game - Karma punishment
if (!Config.ALT_GAME_KARMA_PLAYER_CAN_SHOP && (player.getReputation() < 0))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -107,7 +107,7 @@ public class RequestSellItem implements IClientIncomingPacket
{
if ((target == null) || !player.isInsideRadius3D(target, INTERACTION_DISTANCE) || (player.getInstanceId() != target.getInstanceId()))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (target instanceof Merchant)
@ -116,14 +116,14 @@ public class RequestSellItem implements IClientIncomingPacket
}
else
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
if ((merchant == null) && !player.isGM() && (_listId != CUSTOM_CB_SELL_LIST))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -136,7 +136,7 @@ public class RequestSellItem implements IClientIncomingPacket
if ((merchant != null) && !buyList.isNpcAllowed(merchant.getId()))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -174,7 +174,7 @@ public class RequestSellItem implements IClientIncomingPacket
}
// Update current load as well
client.sendPacket(new ExUserInfoInvenWeight(player));
client.sendPacket(new ExBuySellList(player, true));
player.sendPacket(new ExUserInfoInvenWeight(player));
player.sendPacket(new ExBuySellList(player, true));
}
}

Some files were not shown because too many files have changed in this diff Show More