diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
index ef3f4acc18..25ba232162 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
@@ -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;
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
index c6ea588540..acab47f316 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
@@ -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;
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
index cdfaa128cb..129d1a52d1 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
@@ -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;
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
index ba988591d0..370aeba2c5 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
@@ -51,6 +51,6 @@ public class Appearing implements IClientIncomingPacket
player.onTeleported();
}
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
index 0ea780c5b4..b47439803f 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
@@ -55,7 +55,7 @@ public class BypassUserCmd implements IClientIncomingPacket
}
else
{
- handler.useUserCommand(_command, client.getPlayer());
+ handler.useUserCommand(_command, player);
}
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 97c6ceef1d..6267d19156 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -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", "
"));
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));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 4bb789645a..218e629395 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -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;
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 8078d0c10e..6ac4cc7ca0 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -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:
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
index 65c69620a0..94911328a2 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
@@ -41,6 +41,7 @@ public class RequestAlchemySkillList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExAlchemySkillList(player));
+
+ player.sendPacket(new ExAlchemySkillList(player));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
index 49bb9c2285..fb6b18d662 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
index c6f8fe2045..b6f8d4fb9e 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
index 5669f5691a..beb5024780 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
index 7ee18d42b3..3e864837f8 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
index 2baf948bc7..4dc52e2648 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
index 0d6677701d..2d209f1612 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
index 83ffc494d5..4b817c3e70 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index 803dbd3fa6..7ddfb76706 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
index d77d8eba6a..f841f306a1 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
@@ -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;
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
index 4534c39c18..b65ad7c589 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
@@ -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;
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
index f1ddb94865..5ae334f854 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
index 21710a1eb0..dd69523f80 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
@@ -96,6 +96,6 @@ public class RequestConfirmSiegeWaitingList implements IClientIncomingPacket
}
// Update the defender list
- client.sendPacket(new SiegeDefenderList(castle));
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
index dc81cb23dc..b2f53bed92 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
index 03d610fe78..1491cb1bfb 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
@@ -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();
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
index 36d36097c1..5fd67b8759 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
@@ -42,6 +42,6 @@ public class RequestCursedWeaponList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExCursedWeaponList());
+ player.sendPacket(new ExCursedWeaponList());
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
index 573a4f7950..193c436d7e 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
index ce21646986..6d59e89936 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
index 5882d1ea46..88fd8b949d 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index 71bb657bf9..0984f53c0b 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -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();
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
index 224a640ef5..5227396561 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
@@ -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);
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
index ed981b63f7..f5607f7fa5 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
@@ -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);
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index 77d06322de..63765d269a 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -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)
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
index 4652f15ddc..22d6a0efa5 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
@@ -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);
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
index 9565b3e5ca..f6b8d47c50 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
@@ -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);
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
index f0065ab287..29fff9784d 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -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));
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
index e44b22545b..080a28d724 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
@@ -65,6 +65,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket
{
return;
}
+
player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
index 6ec3504089..79088e0c3a 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
@@ -47,6 +47,6 @@ public class RequestExFriendListExtended implements IClientIncomingPacket
return;
}
- client.sendPacket(new FriendList(player));
+ player.sendPacket(new FriendList(player));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
index 2e0c2154ac..150caed567 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
@@ -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()));
}
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
index 8851aef463..00bb331778 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
@@ -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 + " !!");
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 16f28d5d04..3ee3f7a9aa 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
index 1b20e2e248..f35c069743 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
@@ -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);
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
index c55df32ab6..2b1000f445 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
index 3842d82eb9..f6b2724012 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
index f868d0e26f..056262b4ab 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
@@ -48,6 +48,6 @@ public class RequestExShowContactList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExShowContactList(player));
+ player.sendPacket(new ExShowContactList(player));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
index 2d9f0456f4..1589ff8175 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
index 0a4522bf64..a2667da070 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
index b2f32527da..1355a122ce 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
index 73dd408134..1233ad294b 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
@@ -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);
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
index f1c10ee605..10070bbbeb 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
@@ -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;
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
index a6ede07bb0..71e028b3be 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
index 04b9115f3d..fe2f9940a9 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
index a7c019d65d..7253226656 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
index ff96a400c9..79db1768e6 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
@@ -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;
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
index 2e95a321ee..1c19213904 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
index 25d004a7b7..2240af9a6e 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
@@ -41,6 +41,7 @@ public class RequestHennaRemoveList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new HennaRemoveList(player));
+
+ player.sendPacket(new HennaRemoveList(player));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
index 1c1fc6d8c2..bc9710d465 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
@@ -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()));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
index baeef8fd01..c5e78e39bc 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
@@ -40,6 +40,7 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExInzoneWaiting(player));
+
+ player.sendPacket(new ExInzoneWaiting(player));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
index 12e0b41dda..1597a7ab37 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
@@ -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);
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
index 99965602f9..cb5c08f036 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
@@ -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)
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
index 226f085fb0..9793d6e1d8 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
@@ -44,7 +44,7 @@ public class RequestKeyMapping implements IClientIncomingPacket
if (Config.STORE_UI_SETTINGS)
{
- client.sendPacket(new ExUISetting(player));
+ player.sendPacket(new ExUISetting(player));
}
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
index ada67e190c..2cdc066ead 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
@@ -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);
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
index bffa403c8a..96b1664122 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
@@ -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));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
index 7b4703d69c..9fcb5e9736 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index 14f42293bf..7973ca5674 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -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;
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
index 9372163aea..769c2af9e2 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
@@ -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
{
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
index 9149ce1284..8e7c3ee9fe 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
@@ -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));
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
index e1f9061af7..2d4de9a500 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
@@ -44,6 +44,7 @@ public class RequestPackageSendableItemList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PackageSendableList(player, _objectId));
+
+ player.sendPacket(new PackageSendableList(player, _objectId));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
index e8d53e1a19..e4ddcee7e8 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
@@ -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;
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
index d8e012178b..ff584840b6 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
@@ -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);
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
index b7f1ab30a7..7d148f2d91 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
index 77725a6557..3e43762127 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
@@ -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;
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
index e3ec88ca13..34af0251ca 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
@@ -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())));
}
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
index 76d591b14c..a4f9ba1784 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
index 3459b04c80..4c077a4c9e 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
@@ -64,6 +64,7 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PledgeReceiveMemberInfo(member));
+
+ player.sendPacket(new PledgeReceiveMemberInfo(member));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
index e380ce68c8..464ad76c9f 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
@@ -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)
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
index 8fabbb1f4a..beee5121dd 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
@@ -52,6 +52,6 @@ public class RequestPledgeRecruitBoardDetail implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
+ player.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
index 1d0458db08..0d0d86f7db 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
index fe019fe6d6..dde18f32a4 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
@@ -44,6 +44,6 @@ public class RequestPledgeWaitingList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeWaitingList(_clanId));
+ player.sendPacket(new ExPledgeWaitingList(_clanId));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
index add0aa2f01..618c787a17 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
@@ -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));
}
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
index d66024cc52..a6bebf3a42 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
@@ -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);
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
index 8668dfbb61..624591a6f3 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
index 44bbd9d34c..a038920c8b 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
@@ -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;
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
index 94958bc4fe..2ded12e55d 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
@@ -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());
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
index 2d616f2e94..bb2f0e8e6f 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
index f571151603..d7f8448ee0 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
@@ -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;
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
index bee0568e03..365e1f598f 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
@@ -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;
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
index b64136dc79..21ba9b39af 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
index 8badb24c5f..6ffcc69313 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
@@ -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();
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
index 461f09492a..06d51160dd 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
index 5e7754bcbe..71dc3aa8da 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
@@ -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;
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
index 891d914e07..e30bee1ac5 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
@@ -41,6 +41,6 @@ public class RequestRecipeItemMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeItemMakeInfo(_id, player));
+ player.sendPacket(new RecipeItemMakeInfo(_id, player));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
index d8e5ef166c..fd6b816fde 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
@@ -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;
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
index d96459999d..b82a2048c7 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
@@ -54,6 +54,6 @@ public class RequestRecipeShopMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeShopItemInfo(shop, _recipeId));
+ player.sendPacket(new RecipeShopItemInfo(shop, _recipeId));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
index 39546dc93f..afc1ee3ecc 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
index 85e67c77ed..82f12af318 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
@@ -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;
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index 1bb51eff9d..87a0574a9f 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -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))
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
index 4da834c30d..3d01f1e525 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
@@ -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);
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
index 1632df189f..9c0c240bd4 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
index b3e709c5db..1a7c1ebc0f 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
@@ -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)
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index 662058f4d8..dfda7319fc 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
@@ -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;
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
index 7b82b33d56..af5f6876b7 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
index e5c53c86d0..1cf200da52 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
@@ -58,7 +58,7 @@ public class RequestSentPost 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;
}
@@ -73,6 +73,6 @@ public class RequestSentPost implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExReplySentPost(msg));
+ player.sendPacket(new ExReplySentPost(msg));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
index 99aec4ba86..05a414f453 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
@@ -47,6 +47,7 @@ public class RequestSentPostList implements IClientIncomingPacket
// player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
// return;
// }
- client.sendPacket(new ExShowSentPostList(player.getObjectId()));
+
+ player.sendPacket(new ExShowSentPostList(player.getObjectId()));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
index 72578e8d22..197ab07190 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
@@ -78,18 +78,23 @@ public class RequestSetCrop implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
index fe5ea44de4..a3e3ded0a3 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
@@ -77,18 +77,23 @@ public class RequestSetSeed implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index de15ebbe0c..81aa96f109 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
@@ -48,13 +49,19 @@ public class RequestShortCutReg implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- if ((client.getPlayer() == null) || (_page > 10) || (_page < 0))
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ if ((_page > 10) || (_page < 0))
{
return;
}
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, 0, _characterType);
- client.getPlayer().registerShortCut(sc);
- client.sendPacket(new ShortCutRegister(sc));
+ player.registerShortCut(sc);
+ player.sendPacket(new ShortCutRegister(sc));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
index 1053bb74c1..fc2725daa7 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
@@ -44,6 +44,6 @@ public class RequestShowBeautyList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExResponseBeautyList(player, _type));
+ player.sendPacket(new ExResponseBeautyList(player, _type));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
index 9c73551f59..541b987e91 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
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;
/**
@@ -40,6 +41,12 @@ public class RequestShowBoard implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, client.getPlayer());
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, player);
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
index 162de17679..f74c3abf4d 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
@@ -41,6 +41,7 @@ public class RequestShowMiniMap implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ShowMiniMap(0));
+
+ player.sendPacket(new ShowMiniMap(0));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
index 097e8f5d30..f055ad8a57 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeAttackerList;
@@ -40,9 +41,17 @@ public class RequestSiegeAttackerList implements IClientIncomingPacket
public void run(GameClient client)
{
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
- if (castle != null)
+ if (castle == null)
{
- client.sendPacket(new SiegeAttackerList(castle));
+ return;
}
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeAttackerList(castle));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
index 6df5163c58..a8d4c9f6d0 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList;
@@ -44,6 +45,13 @@ public class RequestSiegeDefenderList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new SiegeDefenderList(castle));
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
index 8ae03da07b..51c42f7b7c 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
@@ -34,10 +34,12 @@ public class RequestSkillList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- final Player cha = client.getPlayer();
- if (cha != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- cha.sendSkillList();
+ return;
}
+
+ player.sendSkillList();
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
index b5a06923ef..f2f60163d9 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
@@ -60,52 +60,52 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
if ((clanDeclaringWar.getLevel() < 5) || (clanDeclaringWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaringWar.getWarCount() >= 30)
{
- client.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final Clan clanDeclaredWar = ClanTable.getInstance().getClanByName(_pledgeName);
if (clanDeclaredWar == null)
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar == clanDeclaringWar)
{
- client.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaringWar.getAllyId() == clanDeclaredWar.getAllyId()) && (clanDeclaringWar.getAllyId() != 0))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaredWar.getLevel() < 5) || (clanDeclaredWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis())
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -116,15 +116,15 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_T_DECLARE_A_WAR_BECAUSE_THE_21_DAY_PERIOD_HASN_T_PASSED_AFTER_A_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ALREADY_BEEN_AT_WAR_WITH_THE_S1_CLAN_5_DAYS_MUST_PASS_BEFORE_YOU_CAN_DECLARE_WAR_AGAIN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
index 47c39e2e70..e8c4b1a0e1 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
@@ -60,7 +60,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if ((member != null) && member.isOnline() && member.getPlayer().isInCombat())
{
player.sendPacket(SystemMessageId.A_CEASE_FIRE_DURING_A_CLAN_WAR_CAN_NOT_BE_CALLED_WHILE_MEMBERS_OF_YOUR_CLAN_ARE_ENGAGED_IN_BATTLE);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -69,13 +69,13 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if (targetClan == null)
{
player.sendMessage("No such clan.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -85,14 +85,14 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_NOT_DECLARED_A_CLAN_WAR_AGAINST_THE_CLAN_S1);
sm.addString(targetClan.getName());
player.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{
player.sendPacket(SystemMessageId.YOU_CANNOT_DECLARE_DEFEAT_AS_IT_HAS_NOT_BEEN_7_DAYS_SINCE_STARTING_A_CLAN_WAR_WITH_CLAN_S1);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
index d7d4d2b449..c13d46b2bb 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
@@ -65,7 +65,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
// The English system message say weapon, but it's applied to any equipped item.
if (player.isAttackingNow() || player.isCastingNow())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
return;
}
@@ -89,13 +89,13 @@ public class RequestUnEquipItem implements IClientIncomingPacket
if (!player.getInventory().canManipulateWithItemId(item.getId()))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
if (item.isWeapon() && item.getWeaponItem().isForceEquip() && !player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
@@ -117,7 +117,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
}
sm.addItemName(unequippedItem);
- client.sendPacket(sm);
+ player.sendPacket(sm);
final InventoryUpdate iu = new InventoryUpdate();
iu.addItems(unequipped);
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
index 0b38bcb67c..9e95fb93e1 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
@@ -51,28 +51,28 @@ public class RequestVoteNew implements IClientIncomingPacket
{
if (object == null)
{
- client.sendPacket(SystemMessageId.SELECT_TARGET);
+ player.sendPacket(SystemMessageId.SELECT_TARGET);
}
else if (object.isFakePlayer() && FakePlayerData.getInstance().isTalkable(object.getName()))
{
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addString(FakePlayerData.getInstance().getProperName(object.getName()));
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
player.setRecomLeft(player.getRecomLeft() - 1);
- client.sendPacket(new UserInfo(player));
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new UserInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
}
else
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
}
return;
}
@@ -85,19 +85,19 @@ public class RequestVoteNew implements IClientIncomingPacket
if (target == player)
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
return;
}
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
if (target.getRecomHave() >= 255)
{
- client.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
+ player.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
return;
}
@@ -106,16 +106,16 @@ public class RequestVoteNew implements IClientIncomingPacket
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addPcName(target);
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_BEEN_RECOMMENDED_BY_C1);
sm.addPcName(player);
target.sendPacket(sm);
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
target.broadcastUserInfo();
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
target.sendPacket(new ExVoteSystemInfo(target));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
index 05261ba813..0e3300d03c 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
@@ -67,12 +67,12 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
}
else if ((player.getWeightPenalty() >= 3) || !player.isInventoryUnder90(false))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
return;
}
else if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
return;
}
@@ -101,11 +101,11 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
if (player.getPremiumItemList().isEmpty())
{
- client.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
+ player.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
}
else
{
- client.sendPacket(new ExGetPremiumItemList(player));
+ player.sendPacket(new ExGetPremiumItemList(player));
}
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
index c3f29fe9c9..d23918130b 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
@@ -48,17 +48,17 @@ public class RequestWithdrawalPledge 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.isClanLeader())
{
- client.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
+ player.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
return;
}
if (player.isInCombat())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
return;
}
@@ -72,7 +72,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
// Remove the Player From the Member list
clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(player.getName()));
clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
- client.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
- client.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
+ player.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
+ player.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
index 7cdde1c7bb..db6358f368 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
@@ -150,14 +150,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
// Item Max Limit Check
if (!warehouse.validateCapacity(slots))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
+ player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
return;
}
// Check if enough adena and charge the fee
if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, manager, false))
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
return;
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
index a5462164d1..76e8ac2a68 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket
}
player.getBuyList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgBuy(player));
+ player.sendPacket(new PrivateStoreMsgBuy(player));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
index ac64c43c5c..d86bfc8f84 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket
}
player.getSellList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgSell(player));
+ player.sendPacket(new PrivateStoreMsgSell(player));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
index f3078c3e52..2726f99c08 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket
}
player.getSellList().setTitle(_msg);
- client.sendPacket(new ExPrivateStoreSetWholeMsg(player));
+ player.sendPacket(new ExPrivateStoreSetWholeMsg(player));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
index 8e7e6f9b2d..1022c9061d 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
@@ -73,7 +73,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!player.getAccessLevel().allowTransaction())
{
player.sendMessage("Transactions are disabled for your current Access Level.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -84,8 +84,8 @@ public class TradeRequest implements IClientIncomingPacket
{
if (!effect.checkCondition(BotReportTable.TRADE_ACTION_BLOCK_ID))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -104,7 +104,7 @@ public class TradeRequest implements IClientIncomingPacket
// and the following system message is sent to acting player.
if (target.getObjectId() == player.getObjectId())
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
return;
}
@@ -141,7 +141,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!target.isPlayer())
{
- client.sendPacket(SystemMessageId.INVALID_TARGET);
+ player.sendPacket(SystemMessageId.INVALID_TARGET);
return;
}
@@ -161,8 +161,8 @@ public class TradeRequest implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_IS_CURRENTLY_BEING_INVESTIGATED);
sm.addString(partner.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -189,13 +189,13 @@ public class TradeRequest implements IClientIncomingPacket
if ((player.getPrivateStoreType() != PrivateStoreType.NONE) || (partner.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;
}
if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
+ player.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
return;
}
@@ -204,7 +204,7 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
@@ -218,13 +218,13 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
if (player.calculateDistance3D(partner) > 150)
{
- client.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
+ player.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
return;
}
@@ -232,6 +232,6 @@ public class TradeRequest implements IClientIncomingPacket
partner.sendPacket(new SendTradeRequest(player.getObjectId()));
sm = new SystemMessage(SystemMessageId.YOU_HAVE_REQUESTED_A_TRADE_WITH_C1);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
index 50a9ace4da..d7e4715886 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
@@ -116,7 +116,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (learn == null)
{
PacketLogger.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
break;
}
@@ -124,7 +124,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (skill == null)
{
PacketLogger.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
break;
}
@@ -157,7 +157,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1])
{
PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -167,7 +167,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel())
{
PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -176,7 +176,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points)
{
PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
index fa80f37ec5..3225398d2c 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
@@ -60,12 +60,12 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
}
else if ((player.getLevel() < 99) || !player.isNoble())
{
- client.sendPacket(SystemMessageId.ABILITIES_CAN_BE_USED_BY_NOBLESSE_EXALTED_LV_99_OR_ABOVE);
+ player.sendPacket(SystemMessageId.ABILITIES_CAN_BE_USED_BY_NOBLESSE_EXALTED_LV_99_OR_ABOVE);
return;
}
else if (player.isInOlympiadMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_OR_RESET_ABILITY_POINTS_WHILE_PARTICIPATING_IN_THE_OLYMPIAD_OR_CEREMONY_OF_CHAOS);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_OR_RESET_ABILITY_POINTS_WHILE_PARTICIPATING_IN_THE_OLYMPIAD_OR_CEREMONY_OF_CHAOS);
return;
}
else if (player.isOnEvent())
@@ -85,7 +85,7 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
}
else if (player.getAdena() < Config.ABILITY_POINTS_RESET_ADENA)
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
return;
}
@@ -101,7 +101,7 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
}
}
player.setAbilityPointsUsed(0);
- client.sendPacket(new ExAcquireAPSkillList(player));
+ player.sendPacket(new ExAcquireAPSkillList(player));
}
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
index afbd8b0b76..3ccf45b47f 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
@@ -44,6 +44,6 @@ public class RequestExCancelShape_Shifting_Item implements IClientIncomingPacket
}
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
index 055dc2dd1e..6d286b4894 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
@@ -60,7 +60,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -83,7 +83,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (!extractItem.getItem().isAppearanceable())
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -113,15 +113,15 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,20 +129,20 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -154,6 +154,6 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
}
request.setAppearanceExtractItem(extractItem);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
index f7aa0f3047..1c8eaa09c2 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
@@ -55,8 +55,8 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -65,35 +65,35 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -101,7 +101,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -112,6 +112,6 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
return;
}
- client.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
+ player.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 1de9056bda..2a6d3e9bb9 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -64,8 +64,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -74,36 +74,36 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -111,14 +111,14 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!appearanceStone.checkConditions(player, targetItem))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,56 +129,56 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
{
if (extractItem == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getOwnerId() != player.getObjectId())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!extractItem.getItem().isAppearanceable())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -189,21 +189,21 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final long cost = appearanceStone.getCost();
if (cost > player.getAdena())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (stone.getCount() < 1L)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((appearanceStone.getType() == AppearanceType.NORMAL) && (inventory.destroyItem(getClass().getSimpleName(), extractItem, 1, player, this) == null))
{
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -276,7 +276,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
player.sendInventoryUpdate(iu);
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
+ player.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
if (targetItem.isEquipped())
{
player.broadcastUserInfo();
@@ -288,8 +288,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
slots.addComponentType(slot);
}
}
- client.sendPacket(slots);
+ player.sendPacket(slots);
}
- client.sendPacket(new ExAdenaInvenCount(player));
+ player.sendPacket(new ExAdenaInvenCount(player));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
index abea70c48a..bf64e21529 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
@@ -65,8 +65,8 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket
// attempting to destroy item
if (player.getInventory().destroyItemByItemId("ChangeAttribute", _consumeItemId, 1, player, item) == null)
{
- client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
- client.sendPacket(ExChangeAttributeFail.STATIC);
+ player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
+ player.sendPacket(ExChangeAttributeFail.STATIC);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH);
return;
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
index a5001f4346..e79211ec85 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
@@ -52,26 +52,26 @@ public class RequestCommissionBuyInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
if (!player.isInventoryUnder80(false) || (player.getWeightPenalty() >= 3))
{
- client.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
return;
}
final CommissionItem commissionItem = ItemCommissionManager.getInstance().getCommissionItem(_commissionId);
if (commissionItem != null)
{
- client.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
+ player.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
}
else
{
- client.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
}
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
index aa794d2d96..16dec35e6f 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
@@ -49,7 +49,7 @@ public class RequestCommissionBuyItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
index 4f7141c09d..8a3ff5c955 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
@@ -50,7 +50,7 @@ public class RequestCommissionDelete implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
index 1a7edbbaac..01005d24c1 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
@@ -50,18 +50,18 @@ public class RequestCommissionInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
final Item itemInstance = player.getInventory().getItemByObjectId(_itemObjectId);
if (itemInstance != null)
{
- client.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
+ player.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
}
else
{
- client.sendPacket(ExResponseCommissionInfo.EMPTY);
+ player.sendPacket(ExResponseCommissionInfo.EMPTY);
}
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
index 1ad79b9031..57fd69ec8d 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
@@ -62,7 +62,7 @@ public class RequestCommissionList implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
index 6b2f96e87d..7eb252c475 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
@@ -95,7 +95,7 @@ public class RequestCommissionRegister implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
index 1e826566da..b19aefac8d 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
@@ -45,7 +45,7 @@ public class RequestCommissionRegisteredItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
index 5c587137cb..a0b4c518d2 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
@@ -46,10 +46,10 @@ public class RequestCommissionRegistrableItemList implements IClientIncomingPack
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
- client.sendPacket(new ExResponseCommissionItemList(player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(player.getInventory().getAvailableItems(false, false, false)));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
index 670f9a29ed..398352c0f7 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = new CompoundRequest(player);
if (!player.addRequest(request))
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
@@ -77,7 +79,7 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
final Item itemOne = request.getItemOne();
if (itemOne == null)
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -87,11 +89,11 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItems.isEmpty())
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
- client.sendPacket(ExEnchantOneOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
index 315704e4e5..b8f98ff7ba 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
@@ -51,23 +51,25 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -77,14 +79,14 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -93,10 +95,10 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
- client.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
index 0dbe123787..72a0b34bfc 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemOne();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
request.setItemOne(0);
- client.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
index 5743927fa1..4a05f6c92b 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemTwo();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
request.setItemTwo(0);
- client.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
index c0eb970566..70e94532db 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
return;
}
@@ -78,7 +80,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -86,7 +88,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -96,7 +98,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -113,11 +115,11 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item item = player.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true);
if (success)
{
- client.sendPacket(new ExEnchantSucess(item.getId()));
+ player.sendPacket(new ExEnchantSucess(item.getId()));
}
else
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
index e4e46a5271..d5165c28ec 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
@@ -65,6 +65,7 @@ public class RequestCrystallizeEstimate 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);
@@ -73,28 +74,28 @@ public class RequestCrystallizeEstimate 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);
return;
}
final Item item = player.getInventory().getItemByObjectId(_objectId);
if ((item == null) || item.isShadowItem() || item.isTimeLimitedItem() || item.isHeroItem() || (!Config.ALT_ALLOW_AUGMENT_DESTROY && item.isAugmented()))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
PacketLogger.warning(player + ": tried to crystallize " + item.getItem());
return;
}
@@ -167,8 +168,8 @@ public class RequestCrystallizeEstimate 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;
}
@@ -177,11 +178,11 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket
if ((crystallizationRewards != null) && !crystallizationRewards.isEmpty())
{
player.setInCrystallize(true);
- client.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
+ player.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
}
else
{
- client.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
+ player.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
}
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
index 584b6e3e4e..a0b7c23c20 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
@@ -40,9 +40,11 @@ public class RequestFriendDetailInfo implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExFriendDetailInfo(player, _name));
+ return;
}
+
+ player.sendPacket(new ExFriendDetailInfo(player, _name));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
index 82fa3a651a..e9e5d90e84 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
@@ -48,6 +48,7 @@ public class RequestMenteeWaitingList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
+
+ player.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
index 7c22e266ca..20ec347a77 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
@@ -41,6 +41,7 @@ public class RequestMentorList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExMentorList(player));
+
+ player.sendPacket(new ExMentorList(player));
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
index 4023b0cff0..618f6dc7ed 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
@@ -37,9 +37,11 @@ public class RequestBRGamePoint implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExBRGamePoint(player));
+ return;
}
+
+ player.sendPacket(new ExBRGamePoint(player));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
index 6813c75ed2..f8d602624b 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
@@ -34,7 +34,6 @@ public class ExRestartClient implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.EX_RESTART_CLIENT.writeId(packet);
-
return true;
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
index ef3f4acc18..25ba232162 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
@@ -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;
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
index c6ea588540..acab47f316 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
@@ -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;
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
index cdfaa128cb..129d1a52d1 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
@@ -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;
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
index ba988591d0..370aeba2c5 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
@@ -51,6 +51,6 @@ public class Appearing implements IClientIncomingPacket
player.onTeleported();
}
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
index 0ea780c5b4..b47439803f 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
@@ -55,7 +55,7 @@ public class BypassUserCmd implements IClientIncomingPacket
}
else
{
- handler.useUserCommand(_command, client.getPlayer());
+ handler.useUserCommand(_command, player);
}
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
index a3236b0d83..43c0172038 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
@@ -65,12 +65,12 @@ public class CannotMoveAnymore implements IClientIncomingPacket
// PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+
// " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ());
// StopMove smwl = new StopMove(player);
- // client.getPlayer().sendPacket(smwl);
- // client.getPlayer().broadcastPacket(smwl);
+ // cplayer.getPlayer().sendPacket(smwl);
+ // cplayer.getPlayer().broadcastPacket(smwl);
//
- // StopRotation sr = new StopRotation(client.getPlayer(),
+ // StopRotation sr = new StopRotation(cplayer.getPlayer(),
// _heading);
- // client.getPlayer().sendPacket(sr);
- // client.getPlayer().broadcastPacket(sr);
+ // cplayer.getPlayer().sendPacket(sr);
+ // cplayer.getPlayer().broadcastPacket(sr);
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 6c7ce742c3..985ed1bce2 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -323,16 +323,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);
@@ -442,7 +442,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");
@@ -483,14 +483,14 @@ public class EnterWorld implements IClientIncomingPacket
notice.replace("%clan_name%", player.getClan().getName());
notice.replace("%notice_text%", player.getClan().getNotice().replaceAll("\r\n", "
"));
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));
}
}
@@ -502,13 +502,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())
@@ -571,7 +571,7 @@ public class EnterWorld implements IClientIncomingPacket
{
if (MailManager.getInstance().hasUnreadPost(player))
{
- client.sendPacket(ExNoticePostArrived.valueOf(false));
+ player.sendPacket(ExNoticePostArrived.valueOf(false));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 4bb789645a..218e629395 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -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;
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 8078d0c10e..6ac4cc7ca0 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -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:
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
index 65c69620a0..94911328a2 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
@@ -41,6 +41,7 @@ public class RequestAlchemySkillList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExAlchemySkillList(player));
+
+ player.sendPacket(new ExAlchemySkillList(player));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
index 49bb9c2285..fb6b18d662 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
index c6f8fe2045..b6f8d4fb9e 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
index 5669f5691a..beb5024780 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
index 7ee18d42b3..3e864837f8 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
index 2baf948bc7..4dc52e2648 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
index b7a2c5c6c4..6795fe94e2 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
index 83ffc494d5..4b817c3e70 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index 803dbd3fa6..7ddfb76706 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
index d77d8eba6a..f841f306a1 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
@@ -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;
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
index 4534c39c18..b65ad7c589 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
@@ -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;
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
index f1ddb94865..5ae334f854 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
index 21710a1eb0..dd69523f80 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
@@ -96,6 +96,6 @@ public class RequestConfirmSiegeWaitingList implements IClientIncomingPacket
}
// Update the defender list
- client.sendPacket(new SiegeDefenderList(castle));
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
index dc81cb23dc..b2f53bed92 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
index 03d610fe78..1491cb1bfb 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
@@ -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();
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
index 36d36097c1..5fd67b8759 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
@@ -42,6 +42,6 @@ public class RequestCursedWeaponList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExCursedWeaponList());
+ player.sendPacket(new ExCursedWeaponList());
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
index 573a4f7950..193c436d7e 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
index ce21646986..6d59e89936 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
index 5882d1ea46..88fd8b949d 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index 71bb657bf9..0984f53c0b 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -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();
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
index 224a640ef5..5227396561 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
@@ -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);
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
index ed981b63f7..f5607f7fa5 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
@@ -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);
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index 1796d8b30a..3e97218445 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -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_VALUE_FOR_THE_CORRESPONDING_ITEM_WILL_BE_EXACTLY_RETAINED);
- client.sendPacket(new EnchantResult(EnchantResult.SAFE_FAIL, item));
+ player.sendPacket(SystemMessageId.ENCHANT_FAILED_THE_ENCHANT_VALUE_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)
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
index 4652f15ddc..22d6a0efa5 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
@@ -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);
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
index 9565b3e5ca..f6b8d47c50 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
@@ -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);
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
index 68bb180db1..7b967d8931 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -82,8 +82,8 @@ 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));
+ // cplayer.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
index 35fe136cbd..54a540188c 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
@@ -55,6 +55,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket
{
return;
}
+
player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
index 6ec3504089..79088e0c3a 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
@@ -47,6 +47,6 @@ public class RequestExFriendListExtended implements IClientIncomingPacket
return;
}
- client.sendPacket(new FriendList(player));
+ player.sendPacket(new FriendList(player));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
index 2e0c2154ac..150caed567 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
@@ -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()));
}
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
index 8851aef463..00bb331778 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
@@ -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 + " !!");
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 16f28d5d04..3ee3f7a9aa 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
index 1b20e2e248..f35c069743 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
@@ -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);
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
index c55df32ab6..2b1000f445 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
index 3842d82eb9..f6b2724012 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
index f868d0e26f..056262b4ab 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
@@ -48,6 +48,6 @@ public class RequestExShowContactList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExShowContactList(player));
+ player.sendPacket(new ExShowContactList(player));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
index 2d9f0456f4..1589ff8175 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
index 0a4522bf64..a2667da070 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
index b2f32527da..1355a122ce 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
index 73dd408134..1233ad294b 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
@@ -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);
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
index f1c10ee605..10070bbbeb 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
@@ -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;
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
index 2571e44eed..c0f903cf42 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
@@ -49,7 +49,7 @@ public class RequestGiveNickName implements IClientIncomingPacket
if ((player.getNobleLevel() > 0) && _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);
}
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
index 04b9115f3d..fe2f9940a9 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
index a7c019d65d..7253226656 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
index ff96a400c9..79db1768e6 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
@@ -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;
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
index 2e95a321ee..1c19213904 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
index 25d004a7b7..2240af9a6e 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
@@ -41,6 +41,7 @@ public class RequestHennaRemoveList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new HennaRemoveList(player));
+
+ player.sendPacket(new HennaRemoveList(player));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
index 1c1fc6d8c2..bc9710d465 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
@@ -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()));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
index baeef8fd01..c5e78e39bc 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
@@ -40,6 +40,7 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExInzoneWaiting(player));
+
+ player.sendPacket(new ExInzoneWaiting(player));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
index 12e0b41dda..1597a7ab37 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
@@ -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);
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
index 99965602f9..cb5c08f036 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
@@ -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)
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
index 226f085fb0..9793d6e1d8 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
@@ -44,7 +44,7 @@ public class RequestKeyMapping implements IClientIncomingPacket
if (Config.STORE_UI_SETTINGS)
{
- client.sendPacket(new ExUISetting(player));
+ player.sendPacket(new ExUISetting(player));
}
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
index ada67e190c..2cdc066ead 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
@@ -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);
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
index bffa403c8a..96b1664122 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
@@ -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));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
index 7b4703d69c..9fcb5e9736 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index 14f42293bf..7973ca5674 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -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;
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
index 9372163aea..769c2af9e2 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
@@ -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
{
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
index 9149ce1284..8e7c3ee9fe 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
@@ -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));
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
index e1f9061af7..2d4de9a500 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
@@ -44,6 +44,7 @@ public class RequestPackageSendableItemList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PackageSendableList(player, _objectId));
+
+ player.sendPacket(new PackageSendableList(player, _objectId));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
index e8d53e1a19..e4ddcee7e8 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
@@ -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;
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
index 84a719f406..514306c3f5 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
@@ -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_BY_VISITING_HTTPS_SUPPORT_LINEAGE2_COM);
+ player.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_BY_VISITING_HTTPS_SUPPORT_LINEAGE2_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);
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
index b7f1ab30a7..7d148f2d91 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
index 77725a6557..3e43762127 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
@@ -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;
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
index e3ec88ca13..34af0251ca 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
@@ -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())));
}
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
index 76d591b14c..a4f9ba1784 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
index 3459b04c80..4c077a4c9e 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
@@ -64,6 +64,7 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PledgeReceiveMemberInfo(member));
+
+ player.sendPacket(new PledgeReceiveMemberInfo(member));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
index e380ce68c8..464ad76c9f 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
@@ -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)
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
index 8fabbb1f4a..beee5121dd 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
@@ -52,6 +52,6 @@ public class RequestPledgeRecruitBoardDetail implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
+ player.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
index 1d0458db08..0d0d86f7db 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
index fe019fe6d6..dde18f32a4 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
@@ -44,6 +44,6 @@ public class RequestPledgeWaitingList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeWaitingList(_clanId));
+ player.sendPacket(new ExPledgeWaitingList(_clanId));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
index add0aa2f01..618c787a17 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
@@ -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));
}
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
index d66024cc52..a6bebf3a42 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
@@ -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);
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
index 8668dfbb61..624591a6f3 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
index 44bbd9d34c..a038920c8b 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
@@ -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;
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
index 94958bc4fe..2ded12e55d 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
@@ -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());
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
index 2d616f2e94..bb2f0e8e6f 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
index f571151603..d7f8448ee0 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
@@ -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;
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
index bee0568e03..365e1f598f 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
@@ -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;
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
index b64136dc79..21ba9b39af 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
index 8badb24c5f..6ffcc69313 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
@@ -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();
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
index 461f09492a..06d51160dd 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
index 5e7754bcbe..71dc3aa8da 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
@@ -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;
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
index 891d914e07..e30bee1ac5 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
@@ -41,6 +41,6 @@ public class RequestRecipeItemMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeItemMakeInfo(_id, player));
+ player.sendPacket(new RecipeItemMakeInfo(_id, player));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
index d8e5ef166c..fd6b816fde 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
@@ -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;
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
index d96459999d..b82a2048c7 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
@@ -54,6 +54,6 @@ public class RequestRecipeShopMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeShopItemInfo(shop, _recipeId));
+ player.sendPacket(new RecipeShopItemInfo(shop, _recipeId));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
index 39546dc93f..afc1ee3ecc 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
index 85e67c77ed..82f12af318 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
@@ -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;
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index 1bb51eff9d..87a0574a9f 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -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))
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
index 4da834c30d..3d01f1e525 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
@@ -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);
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
index 1632df189f..9c0c240bd4 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
index b3e709c5db..1a7c1ebc0f 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
@@ -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)
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index 662058f4d8..dfda7319fc 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
@@ -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;
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
index 7b82b33d56..af5f6876b7 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
index e5c53c86d0..1cf200da52 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
@@ -58,7 +58,7 @@ public class RequestSentPost 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;
}
@@ -73,6 +73,6 @@ public class RequestSentPost implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExReplySentPost(msg));
+ player.sendPacket(new ExReplySentPost(msg));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
index 99aec4ba86..05a414f453 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
@@ -47,6 +47,7 @@ public class RequestSentPostList implements IClientIncomingPacket
// player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
// return;
// }
- client.sendPacket(new ExShowSentPostList(player.getObjectId()));
+
+ player.sendPacket(new ExShowSentPostList(player.getObjectId()));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
index 72578e8d22..197ab07190 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
@@ -78,18 +78,23 @@ public class RequestSetCrop implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
index fe5ea44de4..a3e3ded0a3 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
@@ -77,18 +77,23 @@ public class RequestSetSeed implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index d46da9f0e8..0ed3f7fe56 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
@@ -50,13 +51,19 @@ public class RequestShortCutReg implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- if ((client.getPlayer() == null) || (_page > 10) || (_page < 0))
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ if ((_page > 10) || (_page < 0))
{
return;
}
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
- client.getPlayer().registerShortCut(sc);
- client.sendPacket(new ShortCutRegister(sc));
+ player.registerShortCut(sc);
+ player.sendPacket(new ShortCutRegister(sc));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
index 1053bb74c1..fc2725daa7 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
@@ -44,6 +44,6 @@ public class RequestShowBeautyList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExResponseBeautyList(player, _type));
+ player.sendPacket(new ExResponseBeautyList(player, _type));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
index 9c73551f59..541b987e91 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
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;
/**
@@ -40,6 +41,12 @@ public class RequestShowBoard implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, client.getPlayer());
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, player);
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
index 162de17679..f74c3abf4d 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
@@ -41,6 +41,7 @@ public class RequestShowMiniMap implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ShowMiniMap(0));
+
+ player.sendPacket(new ShowMiniMap(0));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
index 097e8f5d30..f055ad8a57 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeAttackerList;
@@ -40,9 +41,17 @@ public class RequestSiegeAttackerList implements IClientIncomingPacket
public void run(GameClient client)
{
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
- if (castle != null)
+ if (castle == null)
{
- client.sendPacket(new SiegeAttackerList(castle));
+ return;
}
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeAttackerList(castle));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
index 6df5163c58..a8d4c9f6d0 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList;
@@ -44,6 +45,13 @@ public class RequestSiegeDefenderList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new SiegeDefenderList(castle));
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
index 8ae03da07b..51c42f7b7c 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
@@ -34,10 +34,12 @@ public class RequestSkillList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- final Player cha = client.getPlayer();
- if (cha != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- cha.sendSkillList();
+ return;
}
+
+ player.sendSkillList();
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
index b5a06923ef..f2f60163d9 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
@@ -60,52 +60,52 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
if ((clanDeclaringWar.getLevel() < 5) || (clanDeclaringWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaringWar.getWarCount() >= 30)
{
- client.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final Clan clanDeclaredWar = ClanTable.getInstance().getClanByName(_pledgeName);
if (clanDeclaredWar == null)
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar == clanDeclaringWar)
{
- client.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaringWar.getAllyId() == clanDeclaredWar.getAllyId()) && (clanDeclaringWar.getAllyId() != 0))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaredWar.getLevel() < 5) || (clanDeclaredWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis())
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -116,15 +116,15 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_T_DECLARE_A_WAR_BECAUSE_THE_21_DAY_PERIOD_HASN_T_PASSED_AFTER_A_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ALREADY_BEEN_AT_WAR_WITH_THE_S1_CLAN_5_DAYS_MUST_PASS_BEFORE_YOU_CAN_DECLARE_WAR_AGAIN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
index 47c39e2e70..e8c4b1a0e1 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
@@ -60,7 +60,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if ((member != null) && member.isOnline() && member.getPlayer().isInCombat())
{
player.sendPacket(SystemMessageId.A_CEASE_FIRE_DURING_A_CLAN_WAR_CAN_NOT_BE_CALLED_WHILE_MEMBERS_OF_YOUR_CLAN_ARE_ENGAGED_IN_BATTLE);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -69,13 +69,13 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if (targetClan == null)
{
player.sendMessage("No such clan.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -85,14 +85,14 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_NOT_DECLARED_A_CLAN_WAR_AGAINST_THE_CLAN_S1);
sm.addString(targetClan.getName());
player.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{
player.sendPacket(SystemMessageId.YOU_CANNOT_DECLARE_DEFEAT_AS_IT_HAS_NOT_BEEN_7_DAYS_SINCE_STARTING_A_CLAN_WAR_WITH_CLAN_S1);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
index d7d4d2b449..c13d46b2bb 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
@@ -65,7 +65,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
// The English system message say weapon, but it's applied to any equipped item.
if (player.isAttackingNow() || player.isCastingNow())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
return;
}
@@ -89,13 +89,13 @@ public class RequestUnEquipItem implements IClientIncomingPacket
if (!player.getInventory().canManipulateWithItemId(item.getId()))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
if (item.isWeapon() && item.getWeaponItem().isForceEquip() && !player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
@@ -117,7 +117,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
}
sm.addItemName(unequippedItem);
- client.sendPacket(sm);
+ player.sendPacket(sm);
final InventoryUpdate iu = new InventoryUpdate();
iu.addItems(unequipped);
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
index 0b38bcb67c..9e95fb93e1 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
@@ -51,28 +51,28 @@ public class RequestVoteNew implements IClientIncomingPacket
{
if (object == null)
{
- client.sendPacket(SystemMessageId.SELECT_TARGET);
+ player.sendPacket(SystemMessageId.SELECT_TARGET);
}
else if (object.isFakePlayer() && FakePlayerData.getInstance().isTalkable(object.getName()))
{
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addString(FakePlayerData.getInstance().getProperName(object.getName()));
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
player.setRecomLeft(player.getRecomLeft() - 1);
- client.sendPacket(new UserInfo(player));
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new UserInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
}
else
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
}
return;
}
@@ -85,19 +85,19 @@ public class RequestVoteNew implements IClientIncomingPacket
if (target == player)
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
return;
}
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
if (target.getRecomHave() >= 255)
{
- client.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
+ player.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
return;
}
@@ -106,16 +106,16 @@ public class RequestVoteNew implements IClientIncomingPacket
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addPcName(target);
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_BEEN_RECOMMENDED_BY_C1);
sm.addPcName(player);
target.sendPacket(sm);
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
target.broadcastUserInfo();
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
target.sendPacket(new ExVoteSystemInfo(target));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
index 05261ba813..0e3300d03c 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
@@ -67,12 +67,12 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
}
else if ((player.getWeightPenalty() >= 3) || !player.isInventoryUnder90(false))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
return;
}
else if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
return;
}
@@ -101,11 +101,11 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
if (player.getPremiumItemList().isEmpty())
{
- client.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
+ player.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
}
else
{
- client.sendPacket(new ExGetPremiumItemList(player));
+ player.sendPacket(new ExGetPremiumItemList(player));
}
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
index c3f29fe9c9..d23918130b 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
@@ -48,17 +48,17 @@ public class RequestWithdrawalPledge 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.isClanLeader())
{
- client.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
+ player.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
return;
}
if (player.isInCombat())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
return;
}
@@ -72,7 +72,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
// Remove the Player From the Member list
clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(player.getName()));
clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
- client.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
- client.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
+ player.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
+ player.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
index 7cdde1c7bb..db6358f368 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
@@ -150,14 +150,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
// Item Max Limit Check
if (!warehouse.validateCapacity(slots))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
+ player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
return;
}
// Check if enough adena and charge the fee
if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, manager, false))
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
return;
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
index a5462164d1..76e8ac2a68 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket
}
player.getBuyList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgBuy(player));
+ player.sendPacket(new PrivateStoreMsgBuy(player));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
index ac64c43c5c..d86bfc8f84 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket
}
player.getSellList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgSell(player));
+ player.sendPacket(new PrivateStoreMsgSell(player));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
index f3078c3e52..2726f99c08 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket
}
player.getSellList().setTitle(_msg);
- client.sendPacket(new ExPrivateStoreSetWholeMsg(player));
+ player.sendPacket(new ExPrivateStoreSetWholeMsg(player));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
index 8e7e6f9b2d..1022c9061d 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
@@ -73,7 +73,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!player.getAccessLevel().allowTransaction())
{
player.sendMessage("Transactions are disabled for your current Access Level.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -84,8 +84,8 @@ public class TradeRequest implements IClientIncomingPacket
{
if (!effect.checkCondition(BotReportTable.TRADE_ACTION_BLOCK_ID))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -104,7 +104,7 @@ public class TradeRequest implements IClientIncomingPacket
// and the following system message is sent to acting player.
if (target.getObjectId() == player.getObjectId())
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
return;
}
@@ -141,7 +141,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!target.isPlayer())
{
- client.sendPacket(SystemMessageId.INVALID_TARGET);
+ player.sendPacket(SystemMessageId.INVALID_TARGET);
return;
}
@@ -161,8 +161,8 @@ public class TradeRequest implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_IS_CURRENTLY_BEING_INVESTIGATED);
sm.addString(partner.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -189,13 +189,13 @@ public class TradeRequest implements IClientIncomingPacket
if ((player.getPrivateStoreType() != PrivateStoreType.NONE) || (partner.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;
}
if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
+ player.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
return;
}
@@ -204,7 +204,7 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
@@ -218,13 +218,13 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
if (player.calculateDistance3D(partner) > 150)
{
- client.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
+ player.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
return;
}
@@ -232,6 +232,6 @@ public class TradeRequest implements IClientIncomingPacket
partner.sendPacket(new SendTradeRequest(player.getObjectId()));
sm = new SystemMessage(SystemMessageId.YOU_HAVE_REQUESTED_A_TRADE_WITH_C1);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
index f39c34b91b..623803ddea 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
@@ -116,7 +116,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (learn == null)
{
PacketLogger.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
break;
}
@@ -124,7 +124,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (skill == null)
{
PacketLogger.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
break;
}
@@ -157,7 +157,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1])
{
PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -167,7 +167,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel())
{
PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -176,7 +176,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points)
{
PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
index c1d320eb5c..6de864990e 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
@@ -60,12 +60,12 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
}
else if ((player.getLevel() < 99) || (player.getNobleLevel() == 0))
{
- client.sendPacket(SystemMessageId.ABILITIES_CAN_BE_USED_BY_NOBLESSE_EXALTED_LV_99_OR_ABOVE);
+ player.sendPacket(SystemMessageId.ABILITIES_CAN_BE_USED_BY_NOBLESSE_EXALTED_LV_99_OR_ABOVE);
return;
}
else if (player.isInOlympiadMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_OR_RESET_ABILITY_POINTS_WHILE_PARTICIPATING_IN_THE_OLYMPIAD_OR_CEREMONY_OF_CHAOS);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_OR_RESET_ABILITY_POINTS_WHILE_PARTICIPATING_IN_THE_OLYMPIAD_OR_CEREMONY_OF_CHAOS);
return;
}
else if (player.isOnEvent())
@@ -85,7 +85,7 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
}
else if (player.getAdena() < Config.ABILITY_POINTS_RESET_ADENA)
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
return;
}
@@ -101,7 +101,7 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
}
}
player.setAbilityPointsUsed(0);
- client.sendPacket(new ExAcquireAPSkillList(player));
+ player.sendPacket(new ExAcquireAPSkillList(player));
}
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
index afbd8b0b76..3ccf45b47f 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
@@ -44,6 +44,6 @@ public class RequestExCancelShape_Shifting_Item implements IClientIncomingPacket
}
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
index 055dc2dd1e..6d286b4894 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
@@ -60,7 +60,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -83,7 +83,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (!extractItem.getItem().isAppearanceable())
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -113,15 +113,15 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,20 +129,20 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -154,6 +154,6 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
}
request.setAppearanceExtractItem(extractItem);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
index f7aa0f3047..1c8eaa09c2 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
@@ -55,8 +55,8 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -65,35 +65,35 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -101,7 +101,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -112,6 +112,6 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
return;
}
- client.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
+ player.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 1de9056bda..2a6d3e9bb9 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -64,8 +64,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -74,36 +74,36 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -111,14 +111,14 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!appearanceStone.checkConditions(player, targetItem))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,56 +129,56 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
{
if (extractItem == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getOwnerId() != player.getObjectId())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!extractItem.getItem().isAppearanceable())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -189,21 +189,21 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final long cost = appearanceStone.getCost();
if (cost > player.getAdena())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (stone.getCount() < 1L)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((appearanceStone.getType() == AppearanceType.NORMAL) && (inventory.destroyItem(getClass().getSimpleName(), extractItem, 1, player, this) == null))
{
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -276,7 +276,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
player.sendInventoryUpdate(iu);
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
+ player.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
if (targetItem.isEquipped())
{
player.broadcastUserInfo();
@@ -288,8 +288,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
slots.addComponentType(slot);
}
}
- client.sendPacket(slots);
+ player.sendPacket(slots);
}
- client.sendPacket(new ExAdenaInvenCount(player));
+ player.sendPacket(new ExAdenaInvenCount(player));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
index abea70c48a..bf64e21529 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
@@ -65,8 +65,8 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket
// attempting to destroy item
if (player.getInventory().destroyItemByItemId("ChangeAttribute", _consumeItemId, 1, player, item) == null)
{
- client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
- client.sendPacket(ExChangeAttributeFail.STATIC);
+ player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
+ player.sendPacket(ExChangeAttributeFail.STATIC);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH);
return;
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
index a5001f4346..e79211ec85 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
@@ -52,26 +52,26 @@ public class RequestCommissionBuyInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
if (!player.isInventoryUnder80(false) || (player.getWeightPenalty() >= 3))
{
- client.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
return;
}
final CommissionItem commissionItem = ItemCommissionManager.getInstance().getCommissionItem(_commissionId);
if (commissionItem != null)
{
- client.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
+ player.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
}
else
{
- client.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
}
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
index aa794d2d96..16dec35e6f 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
@@ -49,7 +49,7 @@ public class RequestCommissionBuyItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
index 4f7141c09d..8a3ff5c955 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
@@ -50,7 +50,7 @@ public class RequestCommissionDelete implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
index 1a7edbbaac..01005d24c1 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
@@ -50,18 +50,18 @@ public class RequestCommissionInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
final Item itemInstance = player.getInventory().getItemByObjectId(_itemObjectId);
if (itemInstance != null)
{
- client.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
+ player.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
}
else
{
- client.sendPacket(ExResponseCommissionInfo.EMPTY);
+ player.sendPacket(ExResponseCommissionInfo.EMPTY);
}
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
index 1ad79b9031..57fd69ec8d 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
@@ -62,7 +62,7 @@ public class RequestCommissionList implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
index 6b2f96e87d..7eb252c475 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
@@ -95,7 +95,7 @@ public class RequestCommissionRegister implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
index 1e826566da..b19aefac8d 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
@@ -45,7 +45,7 @@ public class RequestCommissionRegisteredItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
index 5c587137cb..a0b4c518d2 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
@@ -46,10 +46,10 @@ public class RequestCommissionRegistrableItemList implements IClientIncomingPack
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
- client.sendPacket(new ExResponseCommissionItemList(player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(player.getInventory().getAvailableItems(false, false, false)));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
index 670f9a29ed..398352c0f7 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = new CompoundRequest(player);
if (!player.addRequest(request))
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
@@ -77,7 +79,7 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
final Item itemOne = request.getItemOne();
if (itemOne == null)
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -87,11 +89,11 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItems.isEmpty())
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
- client.sendPacket(ExEnchantOneOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
index 315704e4e5..b8f98ff7ba 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
@@ -51,23 +51,25 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -77,14 +79,14 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -93,10 +95,10 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
- client.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
index 0dbe123787..72a0b34bfc 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemOne();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
request.setItemOne(0);
- client.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
index 5743927fa1..4a05f6c92b 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemTwo();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
request.setItemTwo(0);
- client.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
index c0eb970566..70e94532db 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
return;
}
@@ -78,7 +80,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -86,7 +88,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -96,7 +98,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -113,11 +115,11 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item item = player.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true);
if (success)
{
- client.sendPacket(new ExEnchantSucess(item.getId()));
+ player.sendPacket(new ExEnchantSucess(item.getId()));
}
else
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
index e4e46a5271..d5165c28ec 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
@@ -65,6 +65,7 @@ public class RequestCrystallizeEstimate 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);
@@ -73,28 +74,28 @@ public class RequestCrystallizeEstimate 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);
return;
}
final Item item = player.getInventory().getItemByObjectId(_objectId);
if ((item == null) || item.isShadowItem() || item.isTimeLimitedItem() || item.isHeroItem() || (!Config.ALT_ALLOW_AUGMENT_DESTROY && item.isAugmented()))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
PacketLogger.warning(player + ": tried to crystallize " + item.getItem());
return;
}
@@ -167,8 +168,8 @@ public class RequestCrystallizeEstimate 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;
}
@@ -177,11 +178,11 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket
if ((crystallizationRewards != null) && !crystallizationRewards.isEmpty())
{
player.setInCrystallize(true);
- client.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
+ player.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
}
else
{
- client.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
+ player.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
}
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
index 584b6e3e4e..a0b7c23c20 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
@@ -40,9 +40,11 @@ public class RequestFriendDetailInfo implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExFriendDetailInfo(player, _name));
+ return;
}
+
+ player.sendPacket(new ExFriendDetailInfo(player, _name));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
index 82fa3a651a..e9e5d90e84 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
@@ -48,6 +48,7 @@ public class RequestMenteeWaitingList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
+
+ player.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
index 7c22e266ca..20ec347a77 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
@@ -41,6 +41,7 @@ public class RequestMentorList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExMentorList(player));
+
+ player.sendPacket(new ExMentorList(player));
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
index 4023b0cff0..618f6dc7ed 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
@@ -37,9 +37,11 @@ public class RequestBRGamePoint implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExBRGamePoint(player));
+ return;
}
+
+ player.sendPacket(new ExBRGamePoint(player));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
index de0446cfd8..7ac78cfe4f 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
@@ -34,7 +34,7 @@ public class RequestBRRecentProductList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- // Player player = client.getPlayer();
+ // Player player = cplayer.getPlayer();
// TODO: Implement it.
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
index 6813c75ed2..f8d602624b 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
@@ -34,7 +34,6 @@ public class ExRestartClient implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.EX_RESTART_CLIENT.writeId(packet);
-
return true;
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
index 89678c1836..4378479707 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
- * A packet used to draw points and lines on client.
+ * A packet used to draw points and lines on cplayer.
* Note: Names in points and lines are bugged they will appear even when not looking at them.
* @author NosBit
*/
@@ -62,7 +62,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -76,7 +76,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -88,7 +88,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -100,7 +100,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
@@ -110,7 +110,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -124,7 +124,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -136,7 +136,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -148,7 +148,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
index ef3f4acc18..25ba232162 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
@@ -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;
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
index c6ea588540..acab47f316 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
@@ -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;
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
index cdfaa128cb..129d1a52d1 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
@@ -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;
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
index ba988591d0..370aeba2c5 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
@@ -51,6 +51,6 @@ public class Appearing implements IClientIncomingPacket
player.onTeleported();
}
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
index 0ea780c5b4..b47439803f 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
@@ -55,7 +55,7 @@ public class BypassUserCmd implements IClientIncomingPacket
}
else
{
- handler.useUserCommand(_command, client.getPlayer());
+ handler.useUserCommand(_command, player);
}
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
index a3236b0d83..43c0172038 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
@@ -65,12 +65,12 @@ public class CannotMoveAnymore implements IClientIncomingPacket
// PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+
// " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ());
// StopMove smwl = new StopMove(player);
- // client.getPlayer().sendPacket(smwl);
- // client.getPlayer().broadcastPacket(smwl);
+ // cplayer.getPlayer().sendPacket(smwl);
+ // cplayer.getPlayer().broadcastPacket(smwl);
//
- // StopRotation sr = new StopRotation(client.getPlayer(),
+ // StopRotation sr = new StopRotation(cplayer.getPlayer(),
// _heading);
- // client.getPlayer().sendPacket(sr);
- // client.getPlayer().broadcastPacket(sr);
+ // cplayer.getPlayer().sendPacket(sr);
+ // cplayer.getPlayer().broadcastPacket(sr);
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 6c7ce742c3..985ed1bce2 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -323,16 +323,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);
@@ -442,7 +442,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");
@@ -483,14 +483,14 @@ public class EnterWorld implements IClientIncomingPacket
notice.replace("%clan_name%", player.getClan().getName());
notice.replace("%notice_text%", player.getClan().getNotice().replaceAll("\r\n", "
"));
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));
}
}
@@ -502,13 +502,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())
@@ -571,7 +571,7 @@ public class EnterWorld implements IClientIncomingPacket
{
if (MailManager.getInstance().hasUnreadPost(player))
{
- client.sendPacket(ExNoticePostArrived.valueOf(false));
+ player.sendPacket(ExNoticePostArrived.valueOf(false));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 4bb789645a..218e629395 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -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;
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 8078d0c10e..6ac4cc7ca0 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -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:
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
index 65c69620a0..94911328a2 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
@@ -41,6 +41,7 @@ public class RequestAlchemySkillList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExAlchemySkillList(player));
+
+ player.sendPacket(new ExAlchemySkillList(player));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
index 49bb9c2285..fb6b18d662 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
index c6f8fe2045..b6f8d4fb9e 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
index 5669f5691a..beb5024780 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
index 7ee18d42b3..3e864837f8 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
index 2baf948bc7..4dc52e2648 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
index b7a2c5c6c4..6795fe94e2 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
index 83ffc494d5..4b817c3e70 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index 106581d3f1..d02d20618a 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
@@ -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,8 +253,8 @@ 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));
player.sendPacket(SystemMessageId.THE_TRADE_WAS_SUCCESSFUL);
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
index d77d8eba6a..f841f306a1 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
@@ -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;
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
index 4534c39c18..b65ad7c589 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
@@ -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;
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
index f1ddb94865..5ae334f854 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
index 21710a1eb0..dd69523f80 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
@@ -96,6 +96,6 @@ public class RequestConfirmSiegeWaitingList implements IClientIncomingPacket
}
// Update the defender list
- client.sendPacket(new SiegeDefenderList(castle));
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
index dc81cb23dc..b2f53bed92 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
index 03d610fe78..1491cb1bfb 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
@@ -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();
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
index 36d36097c1..5fd67b8759 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
@@ -42,6 +42,6 @@ public class RequestCursedWeaponList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExCursedWeaponList());
+ player.sendPacket(new ExCursedWeaponList());
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
index 573a4f7950..193c436d7e 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
index ce21646986..6d59e89936 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
index 5882d1ea46..88fd8b949d 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index 71bb657bf9..0984f53c0b 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -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();
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
index 224a640ef5..5227396561 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
@@ -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);
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
index ed981b63f7..f5607f7fa5 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
@@ -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);
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index 1796d8b30a..3e97218445 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -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_VALUE_FOR_THE_CORRESPONDING_ITEM_WILL_BE_EXACTLY_RETAINED);
- client.sendPacket(new EnchantResult(EnchantResult.SAFE_FAIL, item));
+ player.sendPacket(SystemMessageId.ENCHANT_FAILED_THE_ENCHANT_VALUE_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)
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
index 4652f15ddc..22d6a0efa5 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
@@ -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);
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
index 9565b3e5ca..f6b8d47c50 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
@@ -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);
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
index 68bb180db1..7b967d8931 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -82,8 +82,8 @@ 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));
+ // cplayer.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
index 35fe136cbd..54a540188c 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
@@ -55,6 +55,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket
{
return;
}
+
player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
index 6ec3504089..79088e0c3a 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
@@ -47,6 +47,6 @@ public class RequestExFriendListExtended implements IClientIncomingPacket
return;
}
- client.sendPacket(new FriendList(player));
+ player.sendPacket(new FriendList(player));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
index 2e0c2154ac..150caed567 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
@@ -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()));
}
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
index 8851aef463..00bb331778 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
@@ -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 + " !!");
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 16f28d5d04..3ee3f7a9aa 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
index 1b20e2e248..f35c069743 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
@@ -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);
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
index c55df32ab6..2b1000f445 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
index 3842d82eb9..f6b2724012 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
index f868d0e26f..056262b4ab 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
@@ -48,6 +48,6 @@ public class RequestExShowContactList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExShowContactList(player));
+ player.sendPacket(new ExShowContactList(player));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
index 2d9f0456f4..1589ff8175 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
index 0a4522bf64..a2667da070 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
index b2f32527da..1355a122ce 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
index 73dd408134..1233ad294b 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
@@ -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);
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
index f1c10ee605..10070bbbeb 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
@@ -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;
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
index 2571e44eed..c0f903cf42 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
@@ -49,7 +49,7 @@ public class RequestGiveNickName implements IClientIncomingPacket
if ((player.getNobleLevel() > 0) && _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);
}
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
index 04b9115f3d..fe2f9940a9 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
index a7c019d65d..7253226656 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
index ff96a400c9..79db1768e6 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
@@ -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;
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
index 2e95a321ee..1c19213904 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
index 25d004a7b7..2240af9a6e 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
@@ -41,6 +41,7 @@ public class RequestHennaRemoveList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new HennaRemoveList(player));
+
+ player.sendPacket(new HennaRemoveList(player));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
index 1c1fc6d8c2..bc9710d465 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
@@ -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()));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
index baeef8fd01..c5e78e39bc 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
@@ -40,6 +40,7 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExInzoneWaiting(player));
+
+ player.sendPacket(new ExInzoneWaiting(player));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
index 12e0b41dda..1597a7ab37 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
@@ -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);
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
index 99965602f9..cb5c08f036 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
@@ -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)
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
index 226f085fb0..9793d6e1d8 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
@@ -44,7 +44,7 @@ public class RequestKeyMapping implements IClientIncomingPacket
if (Config.STORE_UI_SETTINGS)
{
- client.sendPacket(new ExUISetting(player));
+ player.sendPacket(new ExUISetting(player));
}
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
index ada67e190c..2cdc066ead 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
@@ -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);
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
index bffa403c8a..96b1664122 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
@@ -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));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
index 7b4703d69c..9fcb5e9736 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index 14f42293bf..7973ca5674 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -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;
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
index 9372163aea..769c2af9e2 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
@@ -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
{
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
index 9149ce1284..8e7c3ee9fe 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
@@ -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));
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
index e1f9061af7..2d4de9a500 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
@@ -44,6 +44,7 @@ public class RequestPackageSendableItemList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PackageSendableList(player, _objectId));
+
+ player.sendPacket(new PackageSendableList(player, _objectId));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
index e8d53e1a19..e4ddcee7e8 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
@@ -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;
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
index 84a719f406..514306c3f5 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
@@ -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_BY_VISITING_HTTPS_SUPPORT_LINEAGE2_COM);
+ player.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_BY_VISITING_HTTPS_SUPPORT_LINEAGE2_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);
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
index b7f1ab30a7..7d148f2d91 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
index 77725a6557..3e43762127 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
@@ -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;
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
index e3ec88ca13..34af0251ca 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
@@ -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())));
}
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
index 76d591b14c..a4f9ba1784 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
index 3459b04c80..4c077a4c9e 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
@@ -64,6 +64,7 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PledgeReceiveMemberInfo(member));
+
+ player.sendPacket(new PledgeReceiveMemberInfo(member));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
index e380ce68c8..464ad76c9f 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
@@ -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)
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
index 8fabbb1f4a..beee5121dd 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
@@ -52,6 +52,6 @@ public class RequestPledgeRecruitBoardDetail implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
+ player.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
index 1d0458db08..0d0d86f7db 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
index fe019fe6d6..dde18f32a4 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
@@ -44,6 +44,6 @@ public class RequestPledgeWaitingList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeWaitingList(_clanId));
+ player.sendPacket(new ExPledgeWaitingList(_clanId));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
index add0aa2f01..618c787a17 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
@@ -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));
}
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
index d66024cc52..a6bebf3a42 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
@@ -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);
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
index 8668dfbb61..624591a6f3 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
index 44bbd9d34c..a038920c8b 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
@@ -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;
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
index 94958bc4fe..2ded12e55d 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
@@ -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());
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
index 2d616f2e94..bb2f0e8e6f 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
index 8ab3d4962f..243e4a3674 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
@@ -87,7 +87,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
if (_items == null)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -128,13 +128,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;
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
index bee0568e03..365e1f598f 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
@@ -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;
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
index b64136dc79..21ba9b39af 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
index 8badb24c5f..6ffcc69313 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
@@ -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();
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
index 461f09492a..06d51160dd 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
index 5e7754bcbe..71dc3aa8da 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
@@ -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;
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
index 891d914e07..e30bee1ac5 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
@@ -41,6 +41,6 @@ public class RequestRecipeItemMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeItemMakeInfo(_id, player));
+ player.sendPacket(new RecipeItemMakeInfo(_id, player));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
index d8e5ef166c..fd6b816fde 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
@@ -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;
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
index d96459999d..b82a2048c7 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
@@ -54,6 +54,6 @@ public class RequestRecipeShopMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeShopItemInfo(shop, _recipeId));
+ player.sendPacket(new RecipeShopItemInfo(shop, _recipeId));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
index 39546dc93f..afc1ee3ecc 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
index 85e67c77ed..82f12af318 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
@@ -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;
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index 1bb51eff9d..87a0574a9f 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -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))
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
index 4da834c30d..3d01f1e525 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
@@ -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);
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
index 1632df189f..9c0c240bd4 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
index b3e709c5db..1a7c1ebc0f 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
@@ -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)
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index 662058f4d8..dfda7319fc 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
@@ -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;
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
index 7b82b33d56..af5f6876b7 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
index e5c53c86d0..1cf200da52 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
@@ -58,7 +58,7 @@ public class RequestSentPost 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;
}
@@ -73,6 +73,6 @@ public class RequestSentPost implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExReplySentPost(msg));
+ player.sendPacket(new ExReplySentPost(msg));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
index 99aec4ba86..05a414f453 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
@@ -47,6 +47,7 @@ public class RequestSentPostList implements IClientIncomingPacket
// player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
// return;
// }
- client.sendPacket(new ExShowSentPostList(player.getObjectId()));
+
+ player.sendPacket(new ExShowSentPostList(player.getObjectId()));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
index 72578e8d22..197ab07190 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
@@ -78,18 +78,23 @@ public class RequestSetCrop implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
index fe5ea44de4..a3e3ded0a3 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
@@ -77,18 +77,23 @@ public class RequestSetSeed implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index b30eb95f41..bf7d98030a 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
@@ -50,13 +51,19 @@ public class RequestShortCutReg implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- if ((client.getPlayer() == null) || (_page > 19) || (_page < 0))
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ if ((_page > 19) || (_page < 0))
{
return;
}
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
- client.getPlayer().registerShortCut(sc);
- client.sendPacket(new ShortCutRegister(sc));
+ player.registerShortCut(sc);
+ player.sendPacket(new ShortCutRegister(sc));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
index 1053bb74c1..fc2725daa7 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
@@ -44,6 +44,6 @@ public class RequestShowBeautyList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExResponseBeautyList(player, _type));
+ player.sendPacket(new ExResponseBeautyList(player, _type));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
index 9c73551f59..541b987e91 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
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;
/**
@@ -40,6 +41,12 @@ public class RequestShowBoard implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, client.getPlayer());
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, player);
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
index 162de17679..f74c3abf4d 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
@@ -41,6 +41,7 @@ public class RequestShowMiniMap implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ShowMiniMap(0));
+
+ player.sendPacket(new ShowMiniMap(0));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
index 097e8f5d30..f055ad8a57 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeAttackerList;
@@ -40,9 +41,17 @@ public class RequestSiegeAttackerList implements IClientIncomingPacket
public void run(GameClient client)
{
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
- if (castle != null)
+ if (castle == null)
{
- client.sendPacket(new SiegeAttackerList(castle));
+ return;
}
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeAttackerList(castle));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
index 6df5163c58..a8d4c9f6d0 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList;
@@ -44,6 +45,13 @@ public class RequestSiegeDefenderList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new SiegeDefenderList(castle));
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
index 8ae03da07b..51c42f7b7c 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
@@ -34,10 +34,12 @@ public class RequestSkillList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- final Player cha = client.getPlayer();
- if (cha != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- cha.sendSkillList();
+ return;
}
+
+ player.sendSkillList();
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
index b5a06923ef..f2f60163d9 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
@@ -60,52 +60,52 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
if ((clanDeclaringWar.getLevel() < 5) || (clanDeclaringWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaringWar.getWarCount() >= 30)
{
- client.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final Clan clanDeclaredWar = ClanTable.getInstance().getClanByName(_pledgeName);
if (clanDeclaredWar == null)
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar == clanDeclaringWar)
{
- client.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaringWar.getAllyId() == clanDeclaredWar.getAllyId()) && (clanDeclaringWar.getAllyId() != 0))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaredWar.getLevel() < 5) || (clanDeclaredWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis())
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -116,15 +116,15 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_T_DECLARE_A_WAR_BECAUSE_THE_21_DAY_PERIOD_HASN_T_PASSED_AFTER_A_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ALREADY_BEEN_AT_WAR_WITH_THE_S1_CLAN_5_DAYS_MUST_PASS_BEFORE_YOU_CAN_DECLARE_WAR_AGAIN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
index 47c39e2e70..e8c4b1a0e1 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
@@ -60,7 +60,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if ((member != null) && member.isOnline() && member.getPlayer().isInCombat())
{
player.sendPacket(SystemMessageId.A_CEASE_FIRE_DURING_A_CLAN_WAR_CAN_NOT_BE_CALLED_WHILE_MEMBERS_OF_YOUR_CLAN_ARE_ENGAGED_IN_BATTLE);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -69,13 +69,13 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if (targetClan == null)
{
player.sendMessage("No such clan.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -85,14 +85,14 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_NOT_DECLARED_A_CLAN_WAR_AGAINST_THE_CLAN_S1);
sm.addString(targetClan.getName());
player.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{
player.sendPacket(SystemMessageId.YOU_CANNOT_DECLARE_DEFEAT_AS_IT_HAS_NOT_BEEN_7_DAYS_SINCE_STARTING_A_CLAN_WAR_WITH_CLAN_S1);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
index d7d4d2b449..c13d46b2bb 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
@@ -65,7 +65,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
// The English system message say weapon, but it's applied to any equipped item.
if (player.isAttackingNow() || player.isCastingNow())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
return;
}
@@ -89,13 +89,13 @@ public class RequestUnEquipItem implements IClientIncomingPacket
if (!player.getInventory().canManipulateWithItemId(item.getId()))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
if (item.isWeapon() && item.getWeaponItem().isForceEquip() && !player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
@@ -117,7 +117,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
}
sm.addItemName(unequippedItem);
- client.sendPacket(sm);
+ player.sendPacket(sm);
final InventoryUpdate iu = new InventoryUpdate();
iu.addItems(unequipped);
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
index 0b38bcb67c..9e95fb93e1 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
@@ -51,28 +51,28 @@ public class RequestVoteNew implements IClientIncomingPacket
{
if (object == null)
{
- client.sendPacket(SystemMessageId.SELECT_TARGET);
+ player.sendPacket(SystemMessageId.SELECT_TARGET);
}
else if (object.isFakePlayer() && FakePlayerData.getInstance().isTalkable(object.getName()))
{
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addString(FakePlayerData.getInstance().getProperName(object.getName()));
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
player.setRecomLeft(player.getRecomLeft() - 1);
- client.sendPacket(new UserInfo(player));
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new UserInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
}
else
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
}
return;
}
@@ -85,19 +85,19 @@ public class RequestVoteNew implements IClientIncomingPacket
if (target == player)
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
return;
}
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
if (target.getRecomHave() >= 255)
{
- client.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
+ player.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
return;
}
@@ -106,16 +106,16 @@ public class RequestVoteNew implements IClientIncomingPacket
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addPcName(target);
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_BEEN_RECOMMENDED_BY_C1);
sm.addPcName(player);
target.sendPacket(sm);
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
target.broadcastUserInfo();
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
target.sendPacket(new ExVoteSystemInfo(target));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
index 05261ba813..0e3300d03c 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
@@ -67,12 +67,12 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
}
else if ((player.getWeightPenalty() >= 3) || !player.isInventoryUnder90(false))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
return;
}
else if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
return;
}
@@ -101,11 +101,11 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
if (player.getPremiumItemList().isEmpty())
{
- client.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
+ player.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
}
else
{
- client.sendPacket(new ExGetPremiumItemList(player));
+ player.sendPacket(new ExGetPremiumItemList(player));
}
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
index c3f29fe9c9..d23918130b 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
@@ -48,17 +48,17 @@ public class RequestWithdrawalPledge 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.isClanLeader())
{
- client.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
+ player.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
return;
}
if (player.isInCombat())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
return;
}
@@ -72,7 +72,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
// Remove the Player From the Member list
clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(player.getName()));
clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
- client.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
- client.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
+ player.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
+ player.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
index 7cdde1c7bb..db6358f368 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
@@ -150,14 +150,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
// Item Max Limit Check
if (!warehouse.validateCapacity(slots))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
+ player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
return;
}
// Check if enough adena and charge the fee
if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, manager, false))
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
return;
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
index a5462164d1..76e8ac2a68 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket
}
player.getBuyList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgBuy(player));
+ player.sendPacket(new PrivateStoreMsgBuy(player));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
index ac64c43c5c..d86bfc8f84 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket
}
player.getSellList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgSell(player));
+ player.sendPacket(new PrivateStoreMsgSell(player));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
index f3078c3e52..2726f99c08 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket
}
player.getSellList().setTitle(_msg);
- client.sendPacket(new ExPrivateStoreSetWholeMsg(player));
+ player.sendPacket(new ExPrivateStoreSetWholeMsg(player));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
index 8e7e6f9b2d..1022c9061d 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
@@ -73,7 +73,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!player.getAccessLevel().allowTransaction())
{
player.sendMessage("Transactions are disabled for your current Access Level.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -84,8 +84,8 @@ public class TradeRequest implements IClientIncomingPacket
{
if (!effect.checkCondition(BotReportTable.TRADE_ACTION_BLOCK_ID))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -104,7 +104,7 @@ public class TradeRequest implements IClientIncomingPacket
// and the following system message is sent to acting player.
if (target.getObjectId() == player.getObjectId())
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
return;
}
@@ -141,7 +141,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!target.isPlayer())
{
- client.sendPacket(SystemMessageId.INVALID_TARGET);
+ player.sendPacket(SystemMessageId.INVALID_TARGET);
return;
}
@@ -161,8 +161,8 @@ public class TradeRequest implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_IS_CURRENTLY_BEING_INVESTIGATED);
sm.addString(partner.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -189,13 +189,13 @@ public class TradeRequest implements IClientIncomingPacket
if ((player.getPrivateStoreType() != PrivateStoreType.NONE) || (partner.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;
}
if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
+ player.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
return;
}
@@ -204,7 +204,7 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
@@ -218,13 +218,13 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
if (player.calculateDistance3D(partner) > 150)
{
- client.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
+ player.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
return;
}
@@ -232,6 +232,6 @@ public class TradeRequest implements IClientIncomingPacket
partner.sendPacket(new SendTradeRequest(player.getObjectId()));
sm = new SystemMessage(SystemMessageId.YOU_HAVE_REQUESTED_A_TRADE_WITH_C1);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
index f39c34b91b..623803ddea 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
@@ -116,7 +116,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (learn == null)
{
PacketLogger.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
break;
}
@@ -124,7 +124,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (skill == null)
{
PacketLogger.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
break;
}
@@ -157,7 +157,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1])
{
PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -167,7 +167,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel())
{
PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -176,7 +176,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points)
{
PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
index c1d320eb5c..6de864990e 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
@@ -60,12 +60,12 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
}
else if ((player.getLevel() < 99) || (player.getNobleLevel() == 0))
{
- client.sendPacket(SystemMessageId.ABILITIES_CAN_BE_USED_BY_NOBLESSE_EXALTED_LV_99_OR_ABOVE);
+ player.sendPacket(SystemMessageId.ABILITIES_CAN_BE_USED_BY_NOBLESSE_EXALTED_LV_99_OR_ABOVE);
return;
}
else if (player.isInOlympiadMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_OR_RESET_ABILITY_POINTS_WHILE_PARTICIPATING_IN_THE_OLYMPIAD_OR_CEREMONY_OF_CHAOS);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_OR_RESET_ABILITY_POINTS_WHILE_PARTICIPATING_IN_THE_OLYMPIAD_OR_CEREMONY_OF_CHAOS);
return;
}
else if (player.isOnEvent())
@@ -85,7 +85,7 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
}
else if (player.getAdena() < Config.ABILITY_POINTS_RESET_ADENA)
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
return;
}
@@ -101,7 +101,7 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
}
}
player.setAbilityPointsUsed(0);
- client.sendPacket(new ExAcquireAPSkillList(player));
+ player.sendPacket(new ExAcquireAPSkillList(player));
}
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
index afbd8b0b76..3ccf45b47f 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
@@ -44,6 +44,6 @@ public class RequestExCancelShape_Shifting_Item implements IClientIncomingPacket
}
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
index 055dc2dd1e..6d286b4894 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
@@ -60,7 +60,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -83,7 +83,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (!extractItem.getItem().isAppearanceable())
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -113,15 +113,15 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,20 +129,20 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -154,6 +154,6 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
}
request.setAppearanceExtractItem(extractItem);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
index f7aa0f3047..1c8eaa09c2 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
@@ -55,8 +55,8 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -65,35 +65,35 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -101,7 +101,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -112,6 +112,6 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
return;
}
- client.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
+ player.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 1de9056bda..2a6d3e9bb9 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -64,8 +64,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -74,36 +74,36 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -111,14 +111,14 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!appearanceStone.checkConditions(player, targetItem))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,56 +129,56 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
{
if (extractItem == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getOwnerId() != player.getObjectId())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!extractItem.getItem().isAppearanceable())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -189,21 +189,21 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final long cost = appearanceStone.getCost();
if (cost > player.getAdena())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (stone.getCount() < 1L)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((appearanceStone.getType() == AppearanceType.NORMAL) && (inventory.destroyItem(getClass().getSimpleName(), extractItem, 1, player, this) == null))
{
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -276,7 +276,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
player.sendInventoryUpdate(iu);
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
+ player.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
if (targetItem.isEquipped())
{
player.broadcastUserInfo();
@@ -288,8 +288,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
slots.addComponentType(slot);
}
}
- client.sendPacket(slots);
+ player.sendPacket(slots);
}
- client.sendPacket(new ExAdenaInvenCount(player));
+ player.sendPacket(new ExAdenaInvenCount(player));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
index abea70c48a..bf64e21529 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
@@ -65,8 +65,8 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket
// attempting to destroy item
if (player.getInventory().destroyItemByItemId("ChangeAttribute", _consumeItemId, 1, player, item) == null)
{
- client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
- client.sendPacket(ExChangeAttributeFail.STATIC);
+ player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
+ player.sendPacket(ExChangeAttributeFail.STATIC);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH);
return;
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
index a5001f4346..e79211ec85 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
@@ -52,26 +52,26 @@ public class RequestCommissionBuyInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
if (!player.isInventoryUnder80(false) || (player.getWeightPenalty() >= 3))
{
- client.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
return;
}
final CommissionItem commissionItem = ItemCommissionManager.getInstance().getCommissionItem(_commissionId);
if (commissionItem != null)
{
- client.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
+ player.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
}
else
{
- client.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
}
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
index aa794d2d96..16dec35e6f 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
@@ -49,7 +49,7 @@ public class RequestCommissionBuyItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
index 4f7141c09d..8a3ff5c955 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
@@ -50,7 +50,7 @@ public class RequestCommissionDelete implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
index 1a7edbbaac..01005d24c1 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
@@ -50,18 +50,18 @@ public class RequestCommissionInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
final Item itemInstance = player.getInventory().getItemByObjectId(_itemObjectId);
if (itemInstance != null)
{
- client.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
+ player.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
}
else
{
- client.sendPacket(ExResponseCommissionInfo.EMPTY);
+ player.sendPacket(ExResponseCommissionInfo.EMPTY);
}
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
index 1ad79b9031..57fd69ec8d 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
@@ -62,7 +62,7 @@ public class RequestCommissionList implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
index 6b2f96e87d..7eb252c475 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
@@ -95,7 +95,7 @@ public class RequestCommissionRegister implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
index 1e826566da..b19aefac8d 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
@@ -45,7 +45,7 @@ public class RequestCommissionRegisteredItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
index 5c587137cb..a0b4c518d2 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
@@ -46,10 +46,10 @@ public class RequestCommissionRegistrableItemList implements IClientIncomingPack
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
- client.sendPacket(new ExResponseCommissionItemList(player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(player.getInventory().getAvailableItems(false, false, false)));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
index 670f9a29ed..398352c0f7 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = new CompoundRequest(player);
if (!player.addRequest(request))
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
@@ -77,7 +79,7 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
final Item itemOne = request.getItemOne();
if (itemOne == null)
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -87,11 +89,11 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItems.isEmpty())
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
- client.sendPacket(ExEnchantOneOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
index 315704e4e5..b8f98ff7ba 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
@@ -51,23 +51,25 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -77,14 +79,14 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -93,10 +95,10 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
- client.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
index 0dbe123787..72a0b34bfc 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemOne();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
request.setItemOne(0);
- client.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
index 5743927fa1..4a05f6c92b 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemTwo();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
request.setItemTwo(0);
- client.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
index c0eb970566..70e94532db 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
return;
}
@@ -78,7 +80,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -86,7 +88,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -96,7 +98,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -113,11 +115,11 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item item = player.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true);
if (success)
{
- client.sendPacket(new ExEnchantSucess(item.getId()));
+ player.sendPacket(new ExEnchantSucess(item.getId()));
}
else
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
index e4e46a5271..d5165c28ec 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
@@ -65,6 +65,7 @@ public class RequestCrystallizeEstimate 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);
@@ -73,28 +74,28 @@ public class RequestCrystallizeEstimate 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);
return;
}
final Item item = player.getInventory().getItemByObjectId(_objectId);
if ((item == null) || item.isShadowItem() || item.isTimeLimitedItem() || item.isHeroItem() || (!Config.ALT_ALLOW_AUGMENT_DESTROY && item.isAugmented()))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
PacketLogger.warning(player + ": tried to crystallize " + item.getItem());
return;
}
@@ -167,8 +168,8 @@ public class RequestCrystallizeEstimate 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;
}
@@ -177,11 +178,11 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket
if ((crystallizationRewards != null) && !crystallizationRewards.isEmpty())
{
player.setInCrystallize(true);
- client.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
+ player.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
}
else
{
- client.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
+ player.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
}
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java
index 6425eba48e..ce7c41304f 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java
@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.faction;
import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.faction.ExFactionInfo;
@@ -39,6 +40,12 @@ public class RequestUserFactionInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.getPlayer().sendPacket(new ExFactionInfo(client.getPlayer(), _openDialog));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ExFactionInfo(player, _openDialog));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
index 584b6e3e4e..a0b7c23c20 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
@@ -40,9 +40,11 @@ public class RequestFriendDetailInfo implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExFriendDetailInfo(player, _name));
+ return;
}
+
+ player.sendPacket(new ExFriendDetailInfo(player, _name));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
index 82fa3a651a..e9e5d90e84 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
@@ -48,6 +48,7 @@ public class RequestMenteeWaitingList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
+
+ player.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
index 7c22e266ca..20ec347a77 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
@@ -41,6 +41,7 @@ public class RequestMentorList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExMentorList(player));
+
+ player.sendPacket(new ExMentorList(player));
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
index 4023b0cff0..618f6dc7ed 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
@@ -37,9 +37,11 @@ public class RequestBRGamePoint implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExBRGamePoint(player));
+ return;
}
+
+ player.sendPacket(new ExBRGamePoint(player));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
index de0446cfd8..7ac78cfe4f 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
@@ -34,7 +34,7 @@ public class RequestBRRecentProductList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- // Player player = client.getPlayer();
+ // Player player = cplayer.getPlayer();
// TODO: Implement it.
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
index 6813c75ed2..f8d602624b 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
@@ -34,7 +34,6 @@ public class ExRestartClient implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.EX_RESTART_CLIENT.writeId(packet);
-
return true;
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
index 89678c1836..4378479707 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
- * A packet used to draw points and lines on client.
+ * A packet used to draw points and lines on cplayer.
* Note: Names in points and lines are bugged they will appear even when not looking at them.
* @author NosBit
*/
@@ -62,7 +62,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -76,7 +76,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -88,7 +88,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -100,7 +100,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
@@ -110,7 +110,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -124,7 +124,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -136,7 +136,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -148,7 +148,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
index ef3f4acc18..25ba232162 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
@@ -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;
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
index c6ea588540..acab47f316 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
@@ -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;
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
index cdfaa128cb..129d1a52d1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
@@ -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;
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
index ba988591d0..370aeba2c5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
@@ -51,6 +51,6 @@ public class Appearing implements IClientIncomingPacket
player.onTeleported();
}
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
index 0ea780c5b4..b47439803f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
@@ -55,7 +55,7 @@ public class BypassUserCmd implements IClientIncomingPacket
}
else
{
- handler.useUserCommand(_command, client.getPlayer());
+ handler.useUserCommand(_command, player);
}
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
index a3236b0d83..43c0172038 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
@@ -65,12 +65,12 @@ public class CannotMoveAnymore implements IClientIncomingPacket
// PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+
// " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ());
// StopMove smwl = new StopMove(player);
- // client.getPlayer().sendPacket(smwl);
- // client.getPlayer().broadcastPacket(smwl);
+ // cplayer.getPlayer().sendPacket(smwl);
+ // cplayer.getPlayer().broadcastPacket(smwl);
//
- // StopRotation sr = new StopRotation(client.getPlayer(),
+ // StopRotation sr = new StopRotation(cplayer.getPlayer(),
// _heading);
- // client.getPlayer().sendPacket(sr);
- // client.getPlayer().broadcastPacket(sr);
+ // cplayer.getPlayer().sendPacket(sr);
+ // cplayer.getPlayer().broadcastPacket(sr);
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index bfe7f5ff9d..de61ef0941 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -323,16 +323,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);
@@ -442,7 +442,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");
@@ -483,14 +483,14 @@ public class EnterWorld implements IClientIncomingPacket
notice.replace("%clan_name%", player.getClan().getName());
notice.replace("%notice_text%", player.getClan().getNotice().replaceAll("\r\n", "
"));
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));
}
}
@@ -502,13 +502,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())
@@ -571,7 +571,7 @@ public class EnterWorld implements IClientIncomingPacket
{
if (MailManager.getInstance().hasUnreadPost(player))
{
- client.sendPacket(ExNoticePostArrived.valueOf(false));
+ player.sendPacket(ExNoticePostArrived.valueOf(false));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 4bb789645a..218e629395 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -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;
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 8078d0c10e..6ac4cc7ca0 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -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:
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
index 65c69620a0..94911328a2 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
@@ -41,6 +41,7 @@ public class RequestAlchemySkillList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExAlchemySkillList(player));
+
+ player.sendPacket(new ExAlchemySkillList(player));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
index 49bb9c2285..fb6b18d662 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
index c6f8fe2045..b6f8d4fb9e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
index 5669f5691a..beb5024780 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
index 7ee18d42b3..3e864837f8 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
index 2baf948bc7..4dc52e2648 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
index b7a2c5c6c4..6795fe94e2 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
index 83ffc494d5..4b817c3e70 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index 106581d3f1..d02d20618a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
@@ -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,8 +253,8 @@ 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));
player.sendPacket(SystemMessageId.THE_TRADE_WAS_SUCCESSFUL);
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
index d77d8eba6a..f841f306a1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
@@ -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;
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
index 4534c39c18..b65ad7c589 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
@@ -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;
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
index f1ddb94865..5ae334f854 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
index 21710a1eb0..dd69523f80 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
@@ -96,6 +96,6 @@ public class RequestConfirmSiegeWaitingList implements IClientIncomingPacket
}
// Update the defender list
- client.sendPacket(new SiegeDefenderList(castle));
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
index dc81cb23dc..b2f53bed92 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
index 03d610fe78..1491cb1bfb 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
@@ -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();
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
index 36d36097c1..5fd67b8759 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
@@ -42,6 +42,6 @@ public class RequestCursedWeaponList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExCursedWeaponList());
+ player.sendPacket(new ExCursedWeaponList());
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
index 573a4f7950..193c436d7e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
index ce21646986..6d59e89936 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
index 5882d1ea46..88fd8b949d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index 71bb657bf9..0984f53c0b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -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();
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
index 224a640ef5..5227396561 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
@@ -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);
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
index ed981b63f7..f5607f7fa5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
@@ -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);
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index ea49a304c3..de4ae4af01 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -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_VALUE_FOR_THE_CORRESPONDING_ITEM_WILL_BE_EXACTLY_RETAINED);
- client.sendPacket(new EnchantResult(EnchantResult.SAFE_FAIL, item));
+ player.sendPacket(SystemMessageId.ENCHANT_FAILED_THE_ENCHANT_VALUE_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()))
@@ -320,11 +320,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)
@@ -356,7 +356,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)
@@ -399,7 +399,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))
@@ -409,11 +409,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)
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
index 4652f15ddc..22d6a0efa5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
@@ -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);
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
index 9565b3e5ca..f6b8d47c50 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
@@ -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);
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
index 68bb180db1..7b967d8931 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -82,8 +82,8 @@ 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));
+ // cplayer.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
index 35fe136cbd..54a540188c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
@@ -55,6 +55,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket
{
return;
}
+
player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
index 6ec3504089..79088e0c3a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
@@ -47,6 +47,6 @@ public class RequestExFriendListExtended implements IClientIncomingPacket
return;
}
- client.sendPacket(new FriendList(player));
+ player.sendPacket(new FriendList(player));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
index 2e0c2154ac..150caed567 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
@@ -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()));
}
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
index 8851aef463..00bb331778 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
@@ -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 + " !!");
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 16f28d5d04..3ee3f7a9aa 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
index 1b20e2e248..f35c069743 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
@@ -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);
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
index c55df32ab6..2b1000f445 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
index 3842d82eb9..f6b2724012 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
index f868d0e26f..056262b4ab 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
@@ -48,6 +48,6 @@ public class RequestExShowContactList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExShowContactList(player));
+ player.sendPacket(new ExShowContactList(player));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
index 2d9f0456f4..1589ff8175 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
index 0a4522bf64..a2667da070 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
index b2f32527da..1355a122ce 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
index 73dd408134..1233ad294b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
@@ -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);
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
index f1c10ee605..10070bbbeb 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
@@ -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;
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
index 2571e44eed..c0f903cf42 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
@@ -49,7 +49,7 @@ public class RequestGiveNickName implements IClientIncomingPacket
if ((player.getNobleLevel() > 0) && _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);
}
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
index 04b9115f3d..fe2f9940a9 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
index a7c019d65d..7253226656 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
index ff96a400c9..79db1768e6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
@@ -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;
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
index 2e95a321ee..1c19213904 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
index 25d004a7b7..2240af9a6e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
@@ -41,6 +41,7 @@ public class RequestHennaRemoveList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new HennaRemoveList(player));
+
+ player.sendPacket(new HennaRemoveList(player));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
index 1c1fc6d8c2..bc9710d465 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
@@ -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()));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
index d46ef778d4..f9e67ea1ed 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
@@ -43,6 +43,7 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExInzoneWaiting(player, _hide));
+
+ player.sendPacket(new ExInzoneWaiting(player, _hide));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
index 12e0b41dda..1597a7ab37 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
@@ -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);
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
index 99965602f9..cb5c08f036 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
@@ -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)
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
index 226f085fb0..9793d6e1d8 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
@@ -44,7 +44,7 @@ public class RequestKeyMapping implements IClientIncomingPacket
if (Config.STORE_UI_SETTINGS)
{
- client.sendPacket(new ExUISetting(player));
+ player.sendPacket(new ExUISetting(player));
}
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
index ada67e190c..2cdc066ead 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
@@ -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);
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
index bffa403c8a..96b1664122 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
@@ -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));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
index 7b4703d69c..9fcb5e9736 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index 14f42293bf..7973ca5674 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -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;
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
index 9372163aea..769c2af9e2 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
@@ -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
{
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
index 9149ce1284..8e7c3ee9fe 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
@@ -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));
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
index e1f9061af7..2d4de9a500 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
@@ -44,6 +44,7 @@ public class RequestPackageSendableItemList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PackageSendableList(player, _objectId));
+
+ player.sendPacket(new PackageSendableList(player, _objectId));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
index e8d53e1a19..e4ddcee7e8 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
@@ -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;
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
index 84a719f406..514306c3f5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
@@ -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_BY_VISITING_HTTPS_SUPPORT_LINEAGE2_COM);
+ player.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_BY_VISITING_HTTPS_SUPPORT_LINEAGE2_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);
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
index b7f1ab30a7..7d148f2d91 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
index 77725a6557..3e43762127 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
@@ -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;
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
index e3ec88ca13..34af0251ca 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
@@ -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())));
}
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
index 76d591b14c..a4f9ba1784 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
index 3459b04c80..4c077a4c9e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
@@ -64,6 +64,7 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PledgeReceiveMemberInfo(member));
+
+ player.sendPacket(new PledgeReceiveMemberInfo(member));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
index e380ce68c8..464ad76c9f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
@@ -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)
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
index 8fabbb1f4a..beee5121dd 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
@@ -52,6 +52,6 @@ public class RequestPledgeRecruitBoardDetail implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
+ player.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
index 1d0458db08..0d0d86f7db 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
index fe019fe6d6..dde18f32a4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
@@ -44,6 +44,6 @@ public class RequestPledgeWaitingList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeWaitingList(_clanId));
+ player.sendPacket(new ExPledgeWaitingList(_clanId));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
index add0aa2f01..618c787a17 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
@@ -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));
}
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
index d66024cc52..a6bebf3a42 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
@@ -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);
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
index 8668dfbb61..624591a6f3 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
index 44bbd9d34c..a038920c8b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
@@ -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;
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
index 94958bc4fe..2ded12e55d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
@@ -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());
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
index 2d616f2e94..bb2f0e8e6f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
index 8ab3d4962f..243e4a3674 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
@@ -87,7 +87,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
if (_items == null)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -128,13 +128,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;
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
index bee0568e03..365e1f598f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
@@ -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;
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
index b64136dc79..21ba9b39af 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
index 8badb24c5f..6ffcc69313 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
@@ -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();
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
index 461f09492a..06d51160dd 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
index a08127f456..3c38b12a5f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
@@ -45,7 +45,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;
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
index ae18cc60a5..374363bf78 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
@@ -51,6 +51,6 @@ public class RequestRecipeItemMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeItemMakeInfo(_id, player, recipe.getMaxOffering()));
+ player.sendPacket(new RecipeItemMakeInfo(_id, player, recipe.getMaxOffering()));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
index 53d06e1031..a150cfa85e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
@@ -102,15 +102,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;
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
index 52cce423a0..f79f0f2335 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
@@ -70,6 +70,6 @@ public class RequestRecipeShopMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeShopItemInfo(manufacturer, _recipeId, manufactureRecipeCost, recipe.getMaxOffering()));
+ player.sendPacket(new RecipeShopItemInfo(manufacturer, _recipeId, manufactureRecipeCost, recipe.getMaxOffering()));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
index dd10507407..0f4ae37846 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
@@ -78,7 +78,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)
@@ -91,6 +91,6 @@ public class RequestRecipeShopManageList implements IClientIncomingPacket
}
}
- client.sendPacket(new RecipeShopManageList(player, true));
+ player.sendPacket(new RecipeShopManageList(player, true));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
index e175401b7a..9cff73412c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
@@ -44,13 +44,13 @@ public class RequestRecipeShopManagePrev implements IClientIncomingPacket
if (player.isAlikeDead() || (player.getTarget() == null) || !player.getTarget().isPlayer())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (player.calculateDistance2D(player.getTarget()) > 250)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index 1bb51eff9d..87a0574a9f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -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))
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
index 4da834c30d..3d01f1e525 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
@@ -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);
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
index 1632df189f..9c0c240bd4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
index b3e709c5db..1a7c1ebc0f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
@@ -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)
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index 662058f4d8..dfda7319fc 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
@@ -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;
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
index 7b82b33d56..af5f6876b7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
index e5c53c86d0..1cf200da52 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
@@ -58,7 +58,7 @@ public class RequestSentPost 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;
}
@@ -73,6 +73,6 @@ public class RequestSentPost implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExReplySentPost(msg));
+ player.sendPacket(new ExReplySentPost(msg));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
index 99aec4ba86..05a414f453 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
@@ -47,6 +47,7 @@ public class RequestSentPostList implements IClientIncomingPacket
// player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
// return;
// }
- client.sendPacket(new ExShowSentPostList(player.getObjectId()));
+
+ player.sendPacket(new ExShowSentPostList(player.getObjectId()));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
index 72578e8d22..197ab07190 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
@@ -78,18 +78,23 @@ public class RequestSetCrop implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
index fe5ea44de4..a3e3ded0a3 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
@@ -77,18 +77,23 @@ public class RequestSetSeed implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index b30eb95f41..bf7d98030a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
@@ -50,13 +51,19 @@ public class RequestShortCutReg implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- if ((client.getPlayer() == null) || (_page > 19) || (_page < 0))
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ if ((_page > 19) || (_page < 0))
{
return;
}
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
- client.getPlayer().registerShortCut(sc);
- client.sendPacket(new ShortCutRegister(sc));
+ player.registerShortCut(sc);
+ player.sendPacket(new ShortCutRegister(sc));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
index 1053bb74c1..fc2725daa7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
@@ -44,6 +44,6 @@ public class RequestShowBeautyList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExResponseBeautyList(player, _type));
+ player.sendPacket(new ExResponseBeautyList(player, _type));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
index 9c73551f59..541b987e91 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
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;
/**
@@ -40,6 +41,12 @@ public class RequestShowBoard implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, client.getPlayer());
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, player);
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
index 162de17679..f74c3abf4d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
@@ -41,6 +41,7 @@ public class RequestShowMiniMap implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ShowMiniMap(0));
+
+ player.sendPacket(new ShowMiniMap(0));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
index 097e8f5d30..f055ad8a57 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeAttackerList;
@@ -40,9 +41,17 @@ public class RequestSiegeAttackerList implements IClientIncomingPacket
public void run(GameClient client)
{
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
- if (castle != null)
+ if (castle == null)
{
- client.sendPacket(new SiegeAttackerList(castle));
+ return;
}
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeAttackerList(castle));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
index 6df5163c58..a8d4c9f6d0 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList;
@@ -44,6 +45,13 @@ public class RequestSiegeDefenderList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new SiegeDefenderList(castle));
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
index 8ae03da07b..51c42f7b7c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
@@ -34,10 +34,12 @@ public class RequestSkillList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- final Player cha = client.getPlayer();
- if (cha != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- cha.sendSkillList();
+ return;
}
+
+ player.sendSkillList();
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
index b5a06923ef..f2f60163d9 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
@@ -60,52 +60,52 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
if ((clanDeclaringWar.getLevel() < 5) || (clanDeclaringWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaringWar.getWarCount() >= 30)
{
- client.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final Clan clanDeclaredWar = ClanTable.getInstance().getClanByName(_pledgeName);
if (clanDeclaredWar == null)
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar == clanDeclaringWar)
{
- client.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaringWar.getAllyId() == clanDeclaredWar.getAllyId()) && (clanDeclaringWar.getAllyId() != 0))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaredWar.getLevel() < 5) || (clanDeclaredWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis())
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -116,15 +116,15 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_T_DECLARE_A_WAR_BECAUSE_THE_21_DAY_PERIOD_HASN_T_PASSED_AFTER_A_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ALREADY_BEEN_AT_WAR_WITH_THE_S1_CLAN_5_DAYS_MUST_PASS_BEFORE_YOU_CAN_DECLARE_WAR_AGAIN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
index 47c39e2e70..e8c4b1a0e1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
@@ -60,7 +60,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if ((member != null) && member.isOnline() && member.getPlayer().isInCombat())
{
player.sendPacket(SystemMessageId.A_CEASE_FIRE_DURING_A_CLAN_WAR_CAN_NOT_BE_CALLED_WHILE_MEMBERS_OF_YOUR_CLAN_ARE_ENGAGED_IN_BATTLE);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -69,13 +69,13 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if (targetClan == null)
{
player.sendMessage("No such clan.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -85,14 +85,14 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_NOT_DECLARED_A_CLAN_WAR_AGAINST_THE_CLAN_S1);
sm.addString(targetClan.getName());
player.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{
player.sendPacket(SystemMessageId.YOU_CANNOT_DECLARE_DEFEAT_AS_IT_HAS_NOT_BEEN_7_DAYS_SINCE_STARTING_A_CLAN_WAR_WITH_CLAN_S1);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
index d7d4d2b449..c13d46b2bb 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
@@ -65,7 +65,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
// The English system message say weapon, but it's applied to any equipped item.
if (player.isAttackingNow() || player.isCastingNow())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
return;
}
@@ -89,13 +89,13 @@ public class RequestUnEquipItem implements IClientIncomingPacket
if (!player.getInventory().canManipulateWithItemId(item.getId()))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
if (item.isWeapon() && item.getWeaponItem().isForceEquip() && !player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
@@ -117,7 +117,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
}
sm.addItemName(unequippedItem);
- client.sendPacket(sm);
+ player.sendPacket(sm);
final InventoryUpdate iu = new InventoryUpdate();
iu.addItems(unequipped);
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
index 0b38bcb67c..9e95fb93e1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
@@ -51,28 +51,28 @@ public class RequestVoteNew implements IClientIncomingPacket
{
if (object == null)
{
- client.sendPacket(SystemMessageId.SELECT_TARGET);
+ player.sendPacket(SystemMessageId.SELECT_TARGET);
}
else if (object.isFakePlayer() && FakePlayerData.getInstance().isTalkable(object.getName()))
{
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addString(FakePlayerData.getInstance().getProperName(object.getName()));
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
player.setRecomLeft(player.getRecomLeft() - 1);
- client.sendPacket(new UserInfo(player));
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new UserInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
}
else
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
}
return;
}
@@ -85,19 +85,19 @@ public class RequestVoteNew implements IClientIncomingPacket
if (target == player)
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
return;
}
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
if (target.getRecomHave() >= 255)
{
- client.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
+ player.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
return;
}
@@ -106,16 +106,16 @@ public class RequestVoteNew implements IClientIncomingPacket
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addPcName(target);
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_BEEN_RECOMMENDED_BY_C1);
sm.addPcName(player);
target.sendPacket(sm);
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
target.broadcastUserInfo();
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
target.sendPacket(new ExVoteSystemInfo(target));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
index 05261ba813..0e3300d03c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
@@ -67,12 +67,12 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
}
else if ((player.getWeightPenalty() >= 3) || !player.isInventoryUnder90(false))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
return;
}
else if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
return;
}
@@ -101,11 +101,11 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
if (player.getPremiumItemList().isEmpty())
{
- client.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
+ player.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
}
else
{
- client.sendPacket(new ExGetPremiumItemList(player));
+ player.sendPacket(new ExGetPremiumItemList(player));
}
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
index c3f29fe9c9..d23918130b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
@@ -48,17 +48,17 @@ public class RequestWithdrawalPledge 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.isClanLeader())
{
- client.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
+ player.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
return;
}
if (player.isInCombat())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
return;
}
@@ -72,7 +72,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
// Remove the Player From the Member list
clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(player.getName()));
clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
- client.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
- client.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
+ player.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
+ player.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
index 7cdde1c7bb..db6358f368 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
@@ -150,14 +150,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
// Item Max Limit Check
if (!warehouse.validateCapacity(slots))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
+ player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
return;
}
// Check if enough adena and charge the fee
if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, manager, false))
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
return;
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
index a5462164d1..76e8ac2a68 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket
}
player.getBuyList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgBuy(player));
+ player.sendPacket(new PrivateStoreMsgBuy(player));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
index ac64c43c5c..d86bfc8f84 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket
}
player.getSellList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgSell(player));
+ player.sendPacket(new PrivateStoreMsgSell(player));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
index f3078c3e52..2726f99c08 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket
}
player.getSellList().setTitle(_msg);
- client.sendPacket(new ExPrivateStoreSetWholeMsg(player));
+ player.sendPacket(new ExPrivateStoreSetWholeMsg(player));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
index 8e7e6f9b2d..1022c9061d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
@@ -73,7 +73,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!player.getAccessLevel().allowTransaction())
{
player.sendMessage("Transactions are disabled for your current Access Level.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -84,8 +84,8 @@ public class TradeRequest implements IClientIncomingPacket
{
if (!effect.checkCondition(BotReportTable.TRADE_ACTION_BLOCK_ID))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -104,7 +104,7 @@ public class TradeRequest implements IClientIncomingPacket
// and the following system message is sent to acting player.
if (target.getObjectId() == player.getObjectId())
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
return;
}
@@ -141,7 +141,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!target.isPlayer())
{
- client.sendPacket(SystemMessageId.INVALID_TARGET);
+ player.sendPacket(SystemMessageId.INVALID_TARGET);
return;
}
@@ -161,8 +161,8 @@ public class TradeRequest implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_IS_CURRENTLY_BEING_INVESTIGATED);
sm.addString(partner.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -189,13 +189,13 @@ public class TradeRequest implements IClientIncomingPacket
if ((player.getPrivateStoreType() != PrivateStoreType.NONE) || (partner.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;
}
if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
+ player.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
return;
}
@@ -204,7 +204,7 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
@@ -218,13 +218,13 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
if (player.calculateDistance3D(partner) > 150)
{
- client.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
+ player.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
return;
}
@@ -232,6 +232,6 @@ public class TradeRequest implements IClientIncomingPacket
partner.sendPacket(new SendTradeRequest(player.getObjectId()));
sm = new SystemMessage(SystemMessageId.YOU_HAVE_REQUESTED_A_TRADE_WITH_C1);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
index ece66b1cd9..40f802fb2c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
@@ -116,7 +116,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (learn == null)
{
PacketLogger.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
break;
}
@@ -124,7 +124,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (skill == null)
{
PacketLogger.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
break;
}
@@ -157,7 +157,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1])
{
PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -167,7 +167,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel())
{
PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -176,7 +176,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points)
{
PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
index dd8e176010..f36b68549c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
@@ -60,12 +60,12 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
}
else if (player.getLevel() < 85)
{
- client.sendPacket(SystemMessageId.REACH_LEVEL_85_TO_USE_THE_ABILITY);
+ player.sendPacket(SystemMessageId.REACH_LEVEL_85_TO_USE_THE_ABILITY);
return;
}
else if (player.isInOlympiadMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_OR_RESET_ABILITY_POINTS_WHILE_PARTICIPATING_IN_THE_OLYMPIAD_OR_CEREMONY_OF_CHAOS);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_OR_RESET_ABILITY_POINTS_WHILE_PARTICIPATING_IN_THE_OLYMPIAD_OR_CEREMONY_OF_CHAOS);
return;
}
else if (player.isOnEvent())
@@ -85,7 +85,7 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
}
else if (player.getSp() < Config.ABILITY_POINTS_RESET_SP)
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_FOR_THIS);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_FOR_THIS);
return;
}
player.setSp(player.getSp() - Config.ABILITY_POINTS_RESET_SP);
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
index afbd8b0b76..3ccf45b47f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
@@ -44,6 +44,6 @@ public class RequestExCancelShape_Shifting_Item implements IClientIncomingPacket
}
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
index 055dc2dd1e..6d286b4894 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
@@ -60,7 +60,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -83,7 +83,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (!extractItem.getItem().isAppearanceable())
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -113,15 +113,15 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,20 +129,20 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -154,6 +154,6 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
}
request.setAppearanceExtractItem(extractItem);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
index f7aa0f3047..1c8eaa09c2 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
@@ -55,8 +55,8 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -65,35 +65,35 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -101,7 +101,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -112,6 +112,6 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
return;
}
- client.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
+ player.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 1de9056bda..2a6d3e9bb9 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -64,8 +64,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -74,36 +74,36 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -111,14 +111,14 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!appearanceStone.checkConditions(player, targetItem))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,56 +129,56 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
{
if (extractItem == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getOwnerId() != player.getObjectId())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!extractItem.getItem().isAppearanceable())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -189,21 +189,21 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final long cost = appearanceStone.getCost();
if (cost > player.getAdena())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (stone.getCount() < 1L)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((appearanceStone.getType() == AppearanceType.NORMAL) && (inventory.destroyItem(getClass().getSimpleName(), extractItem, 1, player, this) == null))
{
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -276,7 +276,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
player.sendInventoryUpdate(iu);
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
+ player.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
if (targetItem.isEquipped())
{
player.broadcastUserInfo();
@@ -288,8 +288,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
slots.addComponentType(slot);
}
}
- client.sendPacket(slots);
+ player.sendPacket(slots);
}
- client.sendPacket(new ExAdenaInvenCount(player));
+ player.sendPacket(new ExAdenaInvenCount(player));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
index abea70c48a..bf64e21529 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
@@ -65,8 +65,8 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket
// attempting to destroy item
if (player.getInventory().destroyItemByItemId("ChangeAttribute", _consumeItemId, 1, player, item) == null)
{
- client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
- client.sendPacket(ExChangeAttributeFail.STATIC);
+ player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
+ player.sendPacket(ExChangeAttributeFail.STATIC);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH);
return;
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
index a5001f4346..e79211ec85 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
@@ -52,26 +52,26 @@ public class RequestCommissionBuyInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
if (!player.isInventoryUnder80(false) || (player.getWeightPenalty() >= 3))
{
- client.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
return;
}
final CommissionItem commissionItem = ItemCommissionManager.getInstance().getCommissionItem(_commissionId);
if (commissionItem != null)
{
- client.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
+ player.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
}
else
{
- client.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
}
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
index aa794d2d96..16dec35e6f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
@@ -49,7 +49,7 @@ public class RequestCommissionBuyItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
index 4f7141c09d..8a3ff5c955 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
@@ -50,7 +50,7 @@ public class RequestCommissionDelete implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
index 1a7edbbaac..01005d24c1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
@@ -50,18 +50,18 @@ public class RequestCommissionInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
final Item itemInstance = player.getInventory().getItemByObjectId(_itemObjectId);
if (itemInstance != null)
{
- client.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
+ player.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
}
else
{
- client.sendPacket(ExResponseCommissionInfo.EMPTY);
+ player.sendPacket(ExResponseCommissionInfo.EMPTY);
}
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
index 1ad79b9031..57fd69ec8d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
@@ -62,7 +62,7 @@ public class RequestCommissionList implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
index 6b2f96e87d..7eb252c475 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
@@ -95,7 +95,7 @@ public class RequestCommissionRegister implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
index 1e826566da..b19aefac8d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
@@ -45,7 +45,7 @@ public class RequestCommissionRegisteredItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
index 5c587137cb..a0b4c518d2 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
@@ -46,10 +46,10 @@ public class RequestCommissionRegistrableItemList implements IClientIncomingPack
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
- client.sendPacket(new ExResponseCommissionItemList(player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(player.getInventory().getAvailableItems(false, false, false)));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
index 670f9a29ed..398352c0f7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = new CompoundRequest(player);
if (!player.addRequest(request))
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
@@ -77,7 +79,7 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
final Item itemOne = request.getItemOne();
if (itemOne == null)
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -87,11 +89,11 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItems.isEmpty())
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
- client.sendPacket(ExEnchantOneOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
index 315704e4e5..b8f98ff7ba 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
@@ -51,23 +51,25 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -77,14 +79,14 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -93,10 +95,10 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
- client.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
index 0dbe123787..72a0b34bfc 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemOne();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
request.setItemOne(0);
- client.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
index 5743927fa1..4a05f6c92b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemTwo();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
request.setItemTwo(0);
- client.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
index c0eb970566..70e94532db 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
return;
}
@@ -78,7 +80,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -86,7 +88,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -96,7 +98,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -113,11 +115,11 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item item = player.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true);
if (success)
{
- client.sendPacket(new ExEnchantSucess(item.getId()));
+ player.sendPacket(new ExEnchantSucess(item.getId()));
}
else
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
index e4e46a5271..d5165c28ec 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
@@ -65,6 +65,7 @@ public class RequestCrystallizeEstimate 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);
@@ -73,28 +74,28 @@ public class RequestCrystallizeEstimate 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);
return;
}
final Item item = player.getInventory().getItemByObjectId(_objectId);
if ((item == null) || item.isShadowItem() || item.isTimeLimitedItem() || item.isHeroItem() || (!Config.ALT_ALLOW_AUGMENT_DESTROY && item.isAugmented()))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
PacketLogger.warning(player + ": tried to crystallize " + item.getItem());
return;
}
@@ -167,8 +168,8 @@ public class RequestCrystallizeEstimate 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;
}
@@ -177,11 +178,11 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket
if ((crystallizationRewards != null) && !crystallizationRewards.isEmpty())
{
player.setInCrystallize(true);
- client.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
+ player.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
}
else
{
- client.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
+ player.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
}
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java
index 6425eba48e..ce7c41304f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java
@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.faction;
import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.faction.ExFactionInfo;
@@ -39,6 +40,12 @@ public class RequestUserFactionInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.getPlayer().sendPacket(new ExFactionInfo(client.getPlayer(), _openDialog));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ExFactionInfo(player, _openDialog));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
index 584b6e3e4e..a0b7c23c20 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
@@ -40,9 +40,11 @@ public class RequestFriendDetailInfo implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExFriendDetailInfo(player, _name));
+ return;
}
+
+ player.sendPacket(new ExFriendDetailInfo(player, _name));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
index 82fa3a651a..e9e5d90e84 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
@@ -48,6 +48,7 @@ public class RequestMenteeWaitingList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
+
+ player.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
index 7c22e266ca..20ec347a77 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
@@ -41,6 +41,7 @@ public class RequestMentorList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExMentorList(player));
+
+ player.sendPacket(new ExMentorList(player));
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
index 4023b0cff0..618f6dc7ed 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
@@ -37,9 +37,11 @@ public class RequestBRGamePoint implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExBRGamePoint(player));
+ return;
}
+
+ player.sendPacket(new ExBRGamePoint(player));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
index de0446cfd8..7ac78cfe4f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
@@ -34,7 +34,7 @@ public class RequestBRRecentProductList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- // Player player = client.getPlayer();
+ // Player player = cplayer.getPlayer();
// TODO: Implement it.
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
index 6813c75ed2..f8d602624b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
@@ -34,7 +34,6 @@ public class ExRestartClient implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.EX_RESTART_CLIENT.writeId(packet);
-
return true;
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
index 89678c1836..4378479707 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
- * A packet used to draw points and lines on client.
+ * A packet used to draw points and lines on cplayer.
* Note: Names in points and lines are bugged they will appear even when not looking at them.
* @author NosBit
*/
@@ -62,7 +62,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -76,7 +76,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -88,7 +88,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -100,7 +100,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
@@ -110,7 +110,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -124,7 +124,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -136,7 +136,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -148,7 +148,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
index ef3f4acc18..25ba232162 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
@@ -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;
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
index c6ea588540..acab47f316 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
@@ -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;
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
index cdfaa128cb..129d1a52d1 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
@@ -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;
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
index ba988591d0..370aeba2c5 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
@@ -51,6 +51,6 @@ public class Appearing implements IClientIncomingPacket
player.onTeleported();
}
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
index 0ea780c5b4..b47439803f 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
@@ -55,7 +55,7 @@ public class BypassUserCmd implements IClientIncomingPacket
}
else
{
- handler.useUserCommand(_command, client.getPlayer());
+ handler.useUserCommand(_command, player);
}
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
index a3236b0d83..43c0172038 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
@@ -65,12 +65,12 @@ public class CannotMoveAnymore implements IClientIncomingPacket
// PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+
// " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ());
// StopMove smwl = new StopMove(player);
- // client.getPlayer().sendPacket(smwl);
- // client.getPlayer().broadcastPacket(smwl);
+ // cplayer.getPlayer().sendPacket(smwl);
+ // cplayer.getPlayer().broadcastPacket(smwl);
//
- // StopRotation sr = new StopRotation(client.getPlayer(),
+ // StopRotation sr = new StopRotation(cplayer.getPlayer(),
// _heading);
- // client.getPlayer().sendPacket(sr);
- // client.getPlayer().broadcastPacket(sr);
+ // cplayer.getPlayer().sendPacket(sr);
+ // cplayer.getPlayer().broadcastPacket(sr);
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index ba43e72bfd..fbb8e630c9 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -322,18 +322,18 @@ 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(1, player));
- client.sendPacket(new ItemList(2, player));
+ player.sendPacket(new ItemList(1, player));
+ player.sendPacket(new ItemList(2, player));
// Send Quest Item List
- client.sendPacket(new ExQuestItemList(1, player));
- client.sendPacket(new ExQuestItemList(2, player));
+ player.sendPacket(new ExQuestItemList(1, player));
+ player.sendPacket(new ExQuestItemList(2, player));
// Send Shortcuts
- client.sendPacket(new ShortCutInit(player));
+ player.sendPacket(new ShortCutInit(player));
// Send Action list
player.sendPacket(ExBasicActionList.STATIC_PACKET);
@@ -443,7 +443,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");
@@ -484,14 +484,14 @@ public class EnterWorld implements IClientIncomingPacket
notice.replace("%clan_name%", player.getClan().getName());
notice.replace("%notice_text%", player.getClan().getNotice().replaceAll("\r\n", "
"));
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));
}
}
@@ -503,13 +503,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())
@@ -572,7 +572,7 @@ public class EnterWorld implements IClientIncomingPacket
{
if (MailManager.getInstance().hasUnreadPost(player))
{
- client.sendPacket(ExNoticePostArrived.valueOf(false));
+ player.sendPacket(ExNoticePostArrived.valueOf(false));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 4bb789645a..218e629395 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -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;
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 8078d0c10e..6ac4cc7ca0 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -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:
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
index 65c69620a0..94911328a2 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
@@ -41,6 +41,7 @@ public class RequestAlchemySkillList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExAlchemySkillList(player));
+
+ player.sendPacket(new ExAlchemySkillList(player));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
index 49bb9c2285..fb6b18d662 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
index c6f8fe2045..b6f8d4fb9e 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
index 5669f5691a..beb5024780 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
index 7ee18d42b3..3e864837f8 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
index 2baf948bc7..4dc52e2648 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
index b7a2c5c6c4..6795fe94e2 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
index 83ffc494d5..4b817c3e70 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index 106581d3f1..d02d20618a 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
@@ -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,8 +253,8 @@ 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));
player.sendPacket(SystemMessageId.THE_TRADE_WAS_SUCCESSFUL);
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
index d77d8eba6a..f841f306a1 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
@@ -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;
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
index 4534c39c18..b65ad7c589 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
@@ -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;
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
index f1ddb94865..5ae334f854 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
index 21710a1eb0..dd69523f80 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
@@ -96,6 +96,6 @@ public class RequestConfirmSiegeWaitingList implements IClientIncomingPacket
}
// Update the defender list
- client.sendPacket(new SiegeDefenderList(castle));
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
index dc81cb23dc..b2f53bed92 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
index be08d7f35d..d76760750a 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
@@ -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();
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
index 36d36097c1..5fd67b8759 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
@@ -42,6 +42,6 @@ public class RequestCursedWeaponList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExCursedWeaponList());
+ player.sendPacket(new ExCursedWeaponList());
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
index 573a4f7950..193c436d7e 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
index ce21646986..6d59e89936 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
index 5882d1ea46..88fd8b949d 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index cb90d581c8..d8f319bf1f 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -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.S1_S2_HAS_BEEN_UNEQUIPPED);
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();
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
index 224a640ef5..5227396561 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
@@ -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);
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
index ed981b63f7..f5607f7fa5 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
@@ -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);
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index 4d88d49118..1d3c5ea79d 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -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_VALUE_FOR_THE_CORRESPONDING_ITEM_WILL_BE_EXACTLY_RETAINED);
- client.sendPacket(new EnchantResult(EnchantResult.SAFE_FAIL, item));
+ player.sendPacket(SystemMessageId.ENCHANT_FAILED_THE_ENCHANT_VALUE_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.S1_S2_HAS_BEEN_UNEQUIPPED);
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()))
@@ -320,11 +320,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)
@@ -356,7 +356,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)
@@ -399,7 +399,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))
@@ -409,11 +409,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)
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
index 4652f15ddc..22d6a0efa5 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
@@ -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);
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
index efe35c4745..f027b3584a 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
@@ -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,7 +100,7 @@ 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;
}
@@ -108,13 +108,13 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket
if ((item.getItem().getId() == 48168) && (stone.getItem().getId() != 48169))
{
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;
}
@@ -154,7 +154,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;
}
@@ -182,7 +182,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;
}
@@ -259,7 +259,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;
@@ -280,8 +280,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);
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
index 68bb180db1..7b967d8931 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -82,8 +82,8 @@ 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));
+ // cplayer.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
index 35fe136cbd..54a540188c 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
@@ -55,6 +55,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket
{
return;
}
+
player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
index 6ec3504089..79088e0c3a 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
@@ -47,6 +47,6 @@ public class RequestExFriendListExtended implements IClientIncomingPacket
return;
}
- client.sendPacket(new FriendList(player));
+ player.sendPacket(new FriendList(player));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
index 2e0c2154ac..150caed567 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
@@ -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()));
}
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
index 8851aef463..00bb331778 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
@@ -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 + " !!");
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 16f28d5d04..3ee3f7a9aa 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
index 1b20e2e248..f35c069743 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
@@ -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);
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
index c55df32ab6..2b1000f445 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
index 0fdcc5fde4..777238a18e 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
@@ -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.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_REGISTER_A_CLAN_CREST);
+ player.sendPacket(SystemMessageId.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_REGISTER_A_CLAN_CREST);
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);
}
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
index f868d0e26f..056262b4ab 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
@@ -48,6 +48,6 @@ public class RequestExShowContactList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExShowContactList(player));
+ player.sendPacket(new ExShowContactList(player));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
index 2d9f0456f4..1589ff8175 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
index 0a4522bf64..a2667da070 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
index b2f32527da..1355a122ce 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
index 73dd408134..1233ad294b 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
@@ -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);
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
index f1c10ee605..10070bbbeb 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
@@ -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;
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
index b70d188e2b..9624152294 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
@@ -49,7 +49,7 @@ public class RequestGiveNickName implements IClientIncomingPacket
if ((player.getNobleLevel() > 0) && _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.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_GRANT_A_TITLE);
+ player.sendPacket(SystemMessageId.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_GRANT_A_TITLE);
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);
}
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
index 04b9115f3d..fe2f9940a9 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
index a7c019d65d..7253226656 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
index ff96a400c9..79db1768e6 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
@@ -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;
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
index 2e95a321ee..1c19213904 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
index 25d004a7b7..2240af9a6e 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
@@ -41,6 +41,7 @@ public class RequestHennaRemoveList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new HennaRemoveList(player));
+
+ player.sendPacket(new HennaRemoveList(player));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
index 1c1fc6d8c2..bc9710d465 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
@@ -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()));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
index d46ef778d4..f9e67ea1ed 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
@@ -43,6 +43,7 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExInzoneWaiting(player, _hide));
+
+ player.sendPacket(new ExInzoneWaiting(player, _hide));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
index 6551e7d0c4..42404bdd99 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
@@ -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();
+ return;
}
+
+ if (player.isInventoryDisabled())
+ {
+ return;
+ }
+
+ player.sendItemList();
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
index 99965602f9..cb5c08f036 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
@@ -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)
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
index 226f085fb0..9793d6e1d8 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
@@ -44,7 +44,7 @@ public class RequestKeyMapping implements IClientIncomingPacket
if (Config.STORE_UI_SETTINGS)
{
- client.sendPacket(new ExUISetting(player));
+ player.sendPacket(new ExUISetting(player));
}
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
index ada67e190c..2cdc066ead 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
@@ -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);
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
index bffa403c8a..96b1664122 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
@@ -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));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
index 7b4703d69c..9fcb5e9736 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index 14f42293bf..7973ca5674 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -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;
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
index 9372163aea..769c2af9e2 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
@@ -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
{
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
index 475c67f269..dd4dc458cd 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
@@ -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.S1_HAS_BEEN_DISMISSED);
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));
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
index e670b165cd..de3adf72c3 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
@@ -43,7 +43,7 @@ public class RequestPackageSendableItemList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PackageSendableList(1, player, _objectId));
- client.sendPacket(new PackageSendableList(2, player, _objectId));
+ player.sendPacket(new PackageSendableList(1, player, _objectId));
+ player.sendPacket(new PackageSendableList(2, player, _objectId));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
index e8d53e1a19..e4ddcee7e8 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
@@ -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;
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
index 77799538ec..1d8f3225ea 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
@@ -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_BY_VISITING_HTTPS_SUPPORT_4GAME_COM);
+ player.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_BY_VISITING_HTTPS_SUPPORT_4GAME_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);
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
index b7f1ab30a7..7d148f2d91 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
index 878033b737..9c13b637bc 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
@@ -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_MIN);
+ player.sendPacket(SystemMessageId.ENTRY_APPLICATION_CANCELLED_YOU_MAY_APPLY_TO_A_NEW_CLAN_AFTER_5_MIN);
}
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_MIN);
+ 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_MIN);
}
else
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_MAY_APPLY_FOR_ENTRY_AFTER_S1_MIN_DUE_TO_CANCELLING_YOUR_APPLICATION);
sm.addLong(ClanEntryManager.getInstance().getPlayerLockTime(player.getObjectId()));
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
break;
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
index e3ec88ca13..34af0251ca 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
@@ -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())));
}
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
index 76d591b14c..a4f9ba1784 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
index 3459b04c80..4c077a4c9e 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
@@ -64,6 +64,7 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PledgeReceiveMemberInfo(member));
+
+ player.sendPacket(new PledgeReceiveMemberInfo(member));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
index e380ce68c8..464ad76c9f 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
@@ -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)
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
index 8fabbb1f4a..beee5121dd 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
@@ -52,6 +52,6 @@ public class RequestPledgeRecruitBoardDetail implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
+ player.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
index 83d0f4b4cf..7e057de36c 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
@@ -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_MIN_DUE_TO_CANCELLING_YOUR_APPLICATION);
sm.addLong(ClanEntryManager.getInstance().getPlayerLockTime(player.getObjectId()));
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
index fe019fe6d6..dde18f32a4 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
@@ -44,6 +44,6 @@ public class RequestPledgeWaitingList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeWaitingList(_clanId));
+ player.sendPacket(new ExPledgeWaitingList(_clanId));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
index add0aa2f01..618c787a17 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
@@ -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));
}
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
index 4468b67642..500800df57 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
@@ -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);
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
index 086f76c512..2a75d35297 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
@@ -51,11 +51,11 @@ 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(1, player));
- client.sendPacket(new ExReplyPostItemList(2, player));
+ player.sendPacket(new ExReplyPostItemList(1, player));
+ player.sendPacket(new ExReplyPostItemList(2, player));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
index 44bbd9d34c..a038920c8b 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
@@ -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;
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
index 94958bc4fe..2ded12e55d 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
@@ -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());
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
index 2d616f2e94..bb2f0e8e6f 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
index 8ab3d4962f..243e4a3674 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
@@ -87,7 +87,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
if (_items == null)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -128,13 +128,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;
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
index bee0568e03..365e1f598f 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
@@ -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;
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
index b64136dc79..21ba9b39af 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
index 8badb24c5f..6ffcc69313 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
@@ -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();
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
index 461f09492a..06d51160dd 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
index a08127f456..3c38b12a5f 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
@@ -45,7 +45,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;
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
index ae18cc60a5..374363bf78 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
@@ -51,6 +51,6 @@ public class RequestRecipeItemMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeItemMakeInfo(_id, player, recipe.getMaxOffering()));
+ player.sendPacket(new RecipeItemMakeInfo(_id, player, recipe.getMaxOffering()));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
index 53d06e1031..a150cfa85e 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
@@ -102,15 +102,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;
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
index 52cce423a0..f79f0f2335 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
@@ -70,6 +70,6 @@ public class RequestRecipeShopMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeShopItemInfo(manufacturer, _recipeId, manufactureRecipeCost, recipe.getMaxOffering()));
+ player.sendPacket(new RecipeShopItemInfo(manufacturer, _recipeId, manufactureRecipeCost, recipe.getMaxOffering()));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
index dd10507407..0f4ae37846 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
@@ -78,7 +78,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)
@@ -91,6 +91,6 @@ public class RequestRecipeShopManageList implements IClientIncomingPacket
}
}
- client.sendPacket(new RecipeShopManageList(player, true));
+ player.sendPacket(new RecipeShopManageList(player, true));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
index e175401b7a..9cff73412c 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
@@ -44,13 +44,13 @@ public class RequestRecipeShopManagePrev implements IClientIncomingPacket
if (player.isAlikeDead() || (player.getTarget() == null) || !player.getTarget().isPlayer())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (player.calculateDistance2D(player.getTarget()) > 250)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index 1bb51eff9d..87a0574a9f 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -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))
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
index 4da834c30d..3d01f1e525 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
@@ -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);
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
index 1632df189f..9c0c240bd4 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
index b3e709c5db..1a7c1ebc0f 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
@@ -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)
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index 662058f4d8..dfda7319fc 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
@@ -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;
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
index 7b82b33d56..af5f6876b7 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
index e5c53c86d0..1cf200da52 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
@@ -58,7 +58,7 @@ public class RequestSentPost 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;
}
@@ -73,6 +73,6 @@ public class RequestSentPost implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExReplySentPost(msg));
+ player.sendPacket(new ExReplySentPost(msg));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
index 99aec4ba86..05a414f453 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
@@ -47,6 +47,7 @@ public class RequestSentPostList implements IClientIncomingPacket
// player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
// return;
// }
- client.sendPacket(new ExShowSentPostList(player.getObjectId()));
+
+ player.sendPacket(new ExShowSentPostList(player.getObjectId()));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
index 72578e8d22..197ab07190 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
@@ -78,18 +78,23 @@ public class RequestSetCrop implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
index fe5ea44de4..a3e3ded0a3 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
@@ -77,18 +77,23 @@ public class RequestSetSeed implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index b30eb95f41..bf7d98030a 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
@@ -50,13 +51,19 @@ public class RequestShortCutReg implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- if ((client.getPlayer() == null) || (_page > 19) || (_page < 0))
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ if ((_page > 19) || (_page < 0))
{
return;
}
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
- client.getPlayer().registerShortCut(sc);
- client.sendPacket(new ShortCutRegister(sc));
+ player.registerShortCut(sc);
+ player.sendPacket(new ShortCutRegister(sc));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
index 1053bb74c1..fc2725daa7 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
@@ -44,6 +44,6 @@ public class RequestShowBeautyList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExResponseBeautyList(player, _type));
+ player.sendPacket(new ExResponseBeautyList(player, _type));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
index 9c73551f59..541b987e91 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
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;
/**
@@ -40,6 +41,12 @@ public class RequestShowBoard implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, client.getPlayer());
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, player);
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
index 162de17679..f74c3abf4d 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
@@ -41,6 +41,7 @@ public class RequestShowMiniMap implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ShowMiniMap(0));
+
+ player.sendPacket(new ShowMiniMap(0));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
index 097e8f5d30..f055ad8a57 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeAttackerList;
@@ -40,9 +41,17 @@ public class RequestSiegeAttackerList implements IClientIncomingPacket
public void run(GameClient client)
{
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
- if (castle != null)
+ if (castle == null)
{
- client.sendPacket(new SiegeAttackerList(castle));
+ return;
}
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeAttackerList(castle));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
index 6df5163c58..a8d4c9f6d0 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList;
@@ -44,6 +45,13 @@ public class RequestSiegeDefenderList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new SiegeDefenderList(castle));
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
index 8ae03da07b..51c42f7b7c 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
@@ -34,10 +34,12 @@ public class RequestSkillList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- final Player cha = client.getPlayer();
- if (cha != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- cha.sendSkillList();
+ return;
}
+
+ player.sendSkillList();
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
index b5a06923ef..f2f60163d9 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
@@ -60,52 +60,52 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
if ((clanDeclaringWar.getLevel() < 5) || (clanDeclaringWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaringWar.getWarCount() >= 30)
{
- client.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final Clan clanDeclaredWar = ClanTable.getInstance().getClanByName(_pledgeName);
if (clanDeclaredWar == null)
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar == clanDeclaringWar)
{
- client.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaringWar.getAllyId() == clanDeclaredWar.getAllyId()) && (clanDeclaringWar.getAllyId() != 0))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaredWar.getLevel() < 5) || (clanDeclaredWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis())
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -116,15 +116,15 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_T_DECLARE_A_WAR_BECAUSE_THE_21_DAY_PERIOD_HASN_T_PASSED_AFTER_A_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ALREADY_BEEN_AT_WAR_WITH_THE_S1_CLAN_5_DAYS_MUST_PASS_BEFORE_YOU_CAN_DECLARE_WAR_AGAIN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
index 47c39e2e70..e8c4b1a0e1 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
@@ -60,7 +60,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if ((member != null) && member.isOnline() && member.getPlayer().isInCombat())
{
player.sendPacket(SystemMessageId.A_CEASE_FIRE_DURING_A_CLAN_WAR_CAN_NOT_BE_CALLED_WHILE_MEMBERS_OF_YOUR_CLAN_ARE_ENGAGED_IN_BATTLE);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -69,13 +69,13 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if (targetClan == null)
{
player.sendMessage("No such clan.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -85,14 +85,14 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_NOT_DECLARED_A_CLAN_WAR_AGAINST_THE_CLAN_S1);
sm.addString(targetClan.getName());
player.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{
player.sendPacket(SystemMessageId.YOU_CANNOT_DECLARE_DEFEAT_AS_IT_HAS_NOT_BEEN_7_DAYS_SINCE_STARTING_A_CLAN_WAR_WITH_CLAN_S1);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
index db5981de3d..32d110951d 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
@@ -65,7 +65,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
// The English system message say weapon, but it's applied to any equipped item.
if (player.isAttackingNow() || player.isCastingNow())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
return;
}
@@ -89,13 +89,13 @@ public class RequestUnEquipItem implements IClientIncomingPacket
if (!player.getInventory().canManipulateWithItemId(item.getId()))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
if (item.isWeapon() && item.getWeaponItem().isForceEquip() && !player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
@@ -117,7 +117,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
}
sm.addItemName(unequippedItem);
- client.sendPacket(sm);
+ player.sendPacket(sm);
final InventoryUpdate iu = new InventoryUpdate();
iu.addItems(unequipped);
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
index 0b38bcb67c..9e95fb93e1 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
@@ -51,28 +51,28 @@ public class RequestVoteNew implements IClientIncomingPacket
{
if (object == null)
{
- client.sendPacket(SystemMessageId.SELECT_TARGET);
+ player.sendPacket(SystemMessageId.SELECT_TARGET);
}
else if (object.isFakePlayer() && FakePlayerData.getInstance().isTalkable(object.getName()))
{
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addString(FakePlayerData.getInstance().getProperName(object.getName()));
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
player.setRecomLeft(player.getRecomLeft() - 1);
- client.sendPacket(new UserInfo(player));
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new UserInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
}
else
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
}
return;
}
@@ -85,19 +85,19 @@ public class RequestVoteNew implements IClientIncomingPacket
if (target == player)
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
return;
}
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
if (target.getRecomHave() >= 255)
{
- client.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
+ player.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
return;
}
@@ -106,16 +106,16 @@ public class RequestVoteNew implements IClientIncomingPacket
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addPcName(target);
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_BEEN_RECOMMENDED_BY_C1);
sm.addPcName(player);
target.sendPacket(sm);
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
target.broadcastUserInfo();
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
target.sendPacket(new ExVoteSystemInfo(target));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
index 05261ba813..0e3300d03c 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
@@ -67,12 +67,12 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
}
else if ((player.getWeightPenalty() >= 3) || !player.isInventoryUnder90(false))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
return;
}
else if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
return;
}
@@ -101,11 +101,11 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
if (player.getPremiumItemList().isEmpty())
{
- client.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
+ player.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
}
else
{
- client.sendPacket(new ExGetPremiumItemList(player));
+ player.sendPacket(new ExGetPremiumItemList(player));
}
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
index ddde316520..560580862d 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
@@ -48,17 +48,17 @@ public class RequestWithdrawalPledge 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.isClanLeader())
{
- client.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
+ player.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
return;
}
if (player.isInCombat())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
return;
}
@@ -72,7 +72,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
// Remove the Player From the Member list
clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(player.getName()));
clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
- client.sendPacket(SystemMessageId.YOU_HAVE_LEFT_THE_CLAN);
- client.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
+ player.sendPacket(SystemMessageId.YOU_HAVE_LEFT_THE_CLAN);
+ player.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
index 84b879e0f7..13ecd08a96 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
@@ -150,14 +150,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
// Item Max Limit Check
if (!warehouse.validateCapacity(slots))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
+ player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
return;
}
// Check if enough adena and charge the fee
if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, manager, false))
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
return;
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
index a5462164d1..76e8ac2a68 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket
}
player.getBuyList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgBuy(player));
+ player.sendPacket(new PrivateStoreMsgBuy(player));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
index ac64c43c5c..d86bfc8f84 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket
}
player.getSellList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgSell(player));
+ player.sendPacket(new PrivateStoreMsgSell(player));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
index f3078c3e52..2726f99c08 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket
}
player.getSellList().setTitle(_msg);
- client.sendPacket(new ExPrivateStoreSetWholeMsg(player));
+ player.sendPacket(new ExPrivateStoreSetWholeMsg(player));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
index 8e7e6f9b2d..1022c9061d 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
@@ -73,7 +73,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!player.getAccessLevel().allowTransaction())
{
player.sendMessage("Transactions are disabled for your current Access Level.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -84,8 +84,8 @@ public class TradeRequest implements IClientIncomingPacket
{
if (!effect.checkCondition(BotReportTable.TRADE_ACTION_BLOCK_ID))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -104,7 +104,7 @@ public class TradeRequest implements IClientIncomingPacket
// and the following system message is sent to acting player.
if (target.getObjectId() == player.getObjectId())
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
return;
}
@@ -141,7 +141,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!target.isPlayer())
{
- client.sendPacket(SystemMessageId.INVALID_TARGET);
+ player.sendPacket(SystemMessageId.INVALID_TARGET);
return;
}
@@ -161,8 +161,8 @@ public class TradeRequest implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_IS_CURRENTLY_BEING_INVESTIGATED);
sm.addString(partner.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -189,13 +189,13 @@ public class TradeRequest implements IClientIncomingPacket
if ((player.getPrivateStoreType() != PrivateStoreType.NONE) || (partner.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;
}
if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
+ player.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
return;
}
@@ -204,7 +204,7 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
@@ -218,13 +218,13 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
if (player.calculateDistance3D(partner) > 150)
{
- client.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
+ player.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
return;
}
@@ -232,6 +232,6 @@ public class TradeRequest implements IClientIncomingPacket
partner.sendPacket(new SendTradeRequest(player.getObjectId()));
sm = new SystemMessage(SystemMessageId.YOU_HAVE_REQUESTED_A_TRADE_WITH_C1);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
index ece66b1cd9..40f802fb2c 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
@@ -116,7 +116,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (learn == null)
{
PacketLogger.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
break;
}
@@ -124,7 +124,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (skill == null)
{
PacketLogger.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
break;
}
@@ -157,7 +157,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1])
{
PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -167,7 +167,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel())
{
PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -176,7 +176,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points)
{
PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
index dd8e176010..f36b68549c 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
@@ -60,12 +60,12 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
}
else if (player.getLevel() < 85)
{
- client.sendPacket(SystemMessageId.REACH_LEVEL_85_TO_USE_THE_ABILITY);
+ player.sendPacket(SystemMessageId.REACH_LEVEL_85_TO_USE_THE_ABILITY);
return;
}
else if (player.isInOlympiadMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_OR_RESET_ABILITY_POINTS_WHILE_PARTICIPATING_IN_THE_OLYMPIAD_OR_CEREMONY_OF_CHAOS);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_OR_RESET_ABILITY_POINTS_WHILE_PARTICIPATING_IN_THE_OLYMPIAD_OR_CEREMONY_OF_CHAOS);
return;
}
else if (player.isOnEvent())
@@ -85,7 +85,7 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
}
else if (player.getSp() < Config.ABILITY_POINTS_RESET_SP)
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_FOR_THIS);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_FOR_THIS);
return;
}
player.setSp(player.getSp() - Config.ABILITY_POINTS_RESET_SP);
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
index afbd8b0b76..3ccf45b47f 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
@@ -44,6 +44,6 @@ public class RequestExCancelShape_Shifting_Item implements IClientIncomingPacket
}
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
index 055dc2dd1e..6d286b4894 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
@@ -60,7 +60,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -83,7 +83,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (!extractItem.getItem().isAppearanceable())
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -113,15 +113,15 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,20 +129,20 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -154,6 +154,6 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
}
request.setAppearanceExtractItem(extractItem);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
index f7aa0f3047..1c8eaa09c2 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
@@ -55,8 +55,8 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -65,35 +65,35 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -101,7 +101,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -112,6 +112,6 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
return;
}
- client.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
+ player.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 1de9056bda..2a6d3e9bb9 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -64,8 +64,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -74,36 +74,36 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -111,14 +111,14 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!appearanceStone.checkConditions(player, targetItem))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,56 +129,56 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
{
if (extractItem == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getOwnerId() != player.getObjectId())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!extractItem.getItem().isAppearanceable())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -189,21 +189,21 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final long cost = appearanceStone.getCost();
if (cost > player.getAdena())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (stone.getCount() < 1L)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((appearanceStone.getType() == AppearanceType.NORMAL) && (inventory.destroyItem(getClass().getSimpleName(), extractItem, 1, player, this) == null))
{
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -276,7 +276,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
player.sendInventoryUpdate(iu);
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
+ player.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
if (targetItem.isEquipped())
{
player.broadcastUserInfo();
@@ -288,8 +288,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
slots.addComponentType(slot);
}
}
- client.sendPacket(slots);
+ player.sendPacket(slots);
}
- client.sendPacket(new ExAdenaInvenCount(player));
+ player.sendPacket(new ExAdenaInvenCount(player));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
index abea70c48a..bf64e21529 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
@@ -65,8 +65,8 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket
// attempting to destroy item
if (player.getInventory().destroyItemByItemId("ChangeAttribute", _consumeItemId, 1, player, item) == null)
{
- client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
- client.sendPacket(ExChangeAttributeFail.STATIC);
+ player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
+ player.sendPacket(ExChangeAttributeFail.STATIC);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH);
return;
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
index a5001f4346..e79211ec85 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
@@ -52,26 +52,26 @@ public class RequestCommissionBuyInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
if (!player.isInventoryUnder80(false) || (player.getWeightPenalty() >= 3))
{
- client.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
return;
}
final CommissionItem commissionItem = ItemCommissionManager.getInstance().getCommissionItem(_commissionId);
if (commissionItem != null)
{
- client.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
+ player.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
}
else
{
- client.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
}
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
index aa794d2d96..16dec35e6f 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
@@ -49,7 +49,7 @@ public class RequestCommissionBuyItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
index 4f7141c09d..8a3ff5c955 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
@@ -50,7 +50,7 @@ public class RequestCommissionDelete implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
index 1a7edbbaac..01005d24c1 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
@@ -50,18 +50,18 @@ public class RequestCommissionInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
final Item itemInstance = player.getInventory().getItemByObjectId(_itemObjectId);
if (itemInstance != null)
{
- client.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
+ player.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
}
else
{
- client.sendPacket(ExResponseCommissionInfo.EMPTY);
+ player.sendPacket(ExResponseCommissionInfo.EMPTY);
}
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
index 1ad79b9031..57fd69ec8d 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
@@ -62,7 +62,7 @@ public class RequestCommissionList implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
index 6b2f96e87d..7eb252c475 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
@@ -95,7 +95,7 @@ public class RequestCommissionRegister implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
index 1e826566da..b19aefac8d 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
@@ -45,7 +45,7 @@ public class RequestCommissionRegisteredItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
index 532c2496c2..75a5a816f0 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
@@ -46,11 +46,11 @@ public class RequestCommissionRegistrableItemList implements IClientIncomingPack
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
- client.sendPacket(new ExResponseCommissionItemList(1, player.getInventory().getAvailableItems(false, false, false)));
- client.sendPacket(new ExResponseCommissionItemList(2, player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(1, player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(2, player.getInventory().getAvailableItems(false, false, false)));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
index 670f9a29ed..398352c0f7 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = new CompoundRequest(player);
if (!player.addRequest(request))
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
@@ -77,7 +79,7 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
final Item itemOne = request.getItemOne();
if (itemOne == null)
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -87,11 +89,11 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItems.isEmpty())
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
- client.sendPacket(ExEnchantOneOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
index 315704e4e5..b8f98ff7ba 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
@@ -51,23 +51,25 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -77,14 +79,14 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -93,10 +95,10 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
- client.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
index 0dbe123787..72a0b34bfc 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemOne();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
request.setItemOne(0);
- client.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
index 5743927fa1..4a05f6c92b 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemTwo();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
request.setItemTwo(0);
- client.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
index c0eb970566..70e94532db 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
return;
}
@@ -78,7 +80,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -86,7 +88,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -96,7 +98,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -113,11 +115,11 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item item = player.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true);
if (success)
{
- client.sendPacket(new ExEnchantSucess(item.getId()));
+ player.sendPacket(new ExEnchantSucess(item.getId()));
}
else
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
index e4e46a5271..d5165c28ec 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
@@ -65,6 +65,7 @@ public class RequestCrystallizeEstimate 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);
@@ -73,28 +74,28 @@ public class RequestCrystallizeEstimate 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);
return;
}
final Item item = player.getInventory().getItemByObjectId(_objectId);
if ((item == null) || item.isShadowItem() || item.isTimeLimitedItem() || item.isHeroItem() || (!Config.ALT_ALLOW_AUGMENT_DESTROY && item.isAugmented()))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
PacketLogger.warning(player + ": tried to crystallize " + item.getItem());
return;
}
@@ -167,8 +168,8 @@ public class RequestCrystallizeEstimate 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;
}
@@ -177,11 +178,11 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket
if ((crystallizationRewards != null) && !crystallizationRewards.isEmpty())
{
player.setInCrystallize(true);
- client.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
+ player.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
}
else
{
- client.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
+ player.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
}
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java
index 6425eba48e..ce7c41304f 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java
@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.faction;
import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.faction.ExFactionInfo;
@@ -39,6 +40,12 @@ public class RequestUserFactionInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.getPlayer().sendPacket(new ExFactionInfo(client.getPlayer(), _openDialog));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ExFactionInfo(player, _openDialog));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
index 584b6e3e4e..a0b7c23c20 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
@@ -40,9 +40,11 @@ public class RequestFriendDetailInfo implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExFriendDetailInfo(player, _name));
+ return;
}
+
+ player.sendPacket(new ExFriendDetailInfo(player, _name));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
index 82fa3a651a..e9e5d90e84 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
@@ -48,6 +48,7 @@ public class RequestMenteeWaitingList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
+
+ player.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
index 7c22e266ca..20ec347a77 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
@@ -41,6 +41,7 @@ public class RequestMentorList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExMentorList(player));
+
+ player.sendPacket(new ExMentorList(player));
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
index 4023b0cff0..618f6dc7ed 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
@@ -37,9 +37,11 @@ public class RequestBRGamePoint implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExBRGamePoint(player));
+ return;
}
+
+ player.sendPacket(new ExBRGamePoint(player));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
index de0446cfd8..7ac78cfe4f 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
@@ -34,7 +34,7 @@ public class RequestBRRecentProductList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- // Player player = client.getPlayer();
+ // Player player = cplayer.getPlayer();
// TODO: Implement it.
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
index 6813c75ed2..f8d602624b 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
@@ -34,7 +34,6 @@ public class ExRestartClient implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.EX_RESTART_CLIENT.writeId(packet);
-
return true;
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
index 89678c1836..4378479707 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
- * A packet used to draw points and lines on client.
+ * A packet used to draw points and lines on cplayer.
* Note: Names in points and lines are bugged they will appear even when not looking at them.
* @author NosBit
*/
@@ -62,7 +62,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -76,7 +76,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -88,7 +88,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -100,7 +100,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
@@ -110,7 +110,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -124,7 +124,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -136,7 +136,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -148,7 +148,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
index ef3f4acc18..25ba232162 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
@@ -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;
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
index c6ea588540..acab47f316 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
@@ -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;
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
index cdfaa128cb..129d1a52d1 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
@@ -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;
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
index ba988591d0..370aeba2c5 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
@@ -51,6 +51,6 @@ public class Appearing implements IClientIncomingPacket
player.onTeleported();
}
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
index 0ea780c5b4..b47439803f 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
@@ -55,7 +55,7 @@ public class BypassUserCmd implements IClientIncomingPacket
}
else
{
- handler.useUserCommand(_command, client.getPlayer());
+ handler.useUserCommand(_command, player);
}
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
index a3236b0d83..43c0172038 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
@@ -65,12 +65,12 @@ public class CannotMoveAnymore implements IClientIncomingPacket
// PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+
// " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ());
// StopMove smwl = new StopMove(player);
- // client.getPlayer().sendPacket(smwl);
- // client.getPlayer().broadcastPacket(smwl);
+ // cplayer.getPlayer().sendPacket(smwl);
+ // cplayer.getPlayer().broadcastPacket(smwl);
//
- // StopRotation sr = new StopRotation(client.getPlayer(),
+ // StopRotation sr = new StopRotation(cplayer.getPlayer(),
// _heading);
- // client.getPlayer().sendPacket(sr);
- // client.getPlayer().broadcastPacket(sr);
+ // cplayer.getPlayer().sendPacket(sr);
+ // cplayer.getPlayer().broadcastPacket(sr);
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index d28d3e54c1..7b68dd4529 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -322,18 +322,18 @@ 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(1, player));
- client.sendPacket(new ItemList(2, player));
+ player.sendPacket(new ItemList(1, player));
+ player.sendPacket(new ItemList(2, player));
// Send Quest Item List
- client.sendPacket(new ExQuestItemList(1, player));
- client.sendPacket(new ExQuestItemList(2, player));
+ player.sendPacket(new ExQuestItemList(1, player));
+ player.sendPacket(new ExQuestItemList(2, player));
// Send Shortcuts
- client.sendPacket(new ShortCutInit(player));
+ player.sendPacket(new ShortCutInit(player));
// Send Action list
player.sendPacket(ExBasicActionList.STATIC_PACKET);
@@ -443,7 +443,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");
@@ -484,14 +484,14 @@ public class EnterWorld implements IClientIncomingPacket
notice.replace("%clan_name%", player.getClan().getName());
notice.replace("%notice_text%", player.getClan().getNotice().replaceAll("\r\n", "
"));
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));
}
}
@@ -503,13 +503,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())
@@ -572,7 +572,7 @@ public class EnterWorld implements IClientIncomingPacket
{
if (MailManager.getInstance().hasUnreadPost(player))
{
- client.sendPacket(ExNoticePostArrived.valueOf(false));
+ player.sendPacket(ExNoticePostArrived.valueOf(false));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 4bb789645a..218e629395 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -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;
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 8078d0c10e..6ac4cc7ca0 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -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:
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
index 65c69620a0..94911328a2 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
@@ -41,6 +41,7 @@ public class RequestAlchemySkillList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExAlchemySkillList(player));
+
+ player.sendPacket(new ExAlchemySkillList(player));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
index 49bb9c2285..fb6b18d662 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
index c6f8fe2045..b6f8d4fb9e 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
index 5669f5691a..beb5024780 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
index 7ee18d42b3..3e864837f8 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
index 2baf948bc7..4dc52e2648 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
index b7a2c5c6c4..6795fe94e2 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
index 83ffc494d5..4b817c3e70 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index 106581d3f1..d02d20618a 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
@@ -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,8 +253,8 @@ 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));
player.sendPacket(SystemMessageId.THE_TRADE_WAS_SUCCESSFUL);
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
index d77d8eba6a..f841f306a1 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
@@ -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;
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
index 4534c39c18..b65ad7c589 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
@@ -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;
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
index f1ddb94865..5ae334f854 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
index 21710a1eb0..dd69523f80 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
@@ -96,6 +96,6 @@ public class RequestConfirmSiegeWaitingList implements IClientIncomingPacket
}
// Update the defender list
- client.sendPacket(new SiegeDefenderList(castle));
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
index dc81cb23dc..b2f53bed92 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
index be08d7f35d..d76760750a 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
@@ -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();
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
index 36d36097c1..5fd67b8759 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
@@ -42,6 +42,6 @@ public class RequestCursedWeaponList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExCursedWeaponList());
+ player.sendPacket(new ExCursedWeaponList());
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
index 573a4f7950..193c436d7e 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
index ce21646986..6d59e89936 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
index 5882d1ea46..88fd8b949d 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index cb90d581c8..d8f319bf1f 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -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.S1_S2_HAS_BEEN_UNEQUIPPED);
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();
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
index 224a640ef5..5227396561 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
@@ -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);
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
index ed981b63f7..f5607f7fa5 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
@@ -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);
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index 4d88d49118..1d3c5ea79d 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -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_VALUE_FOR_THE_CORRESPONDING_ITEM_WILL_BE_EXACTLY_RETAINED);
- client.sendPacket(new EnchantResult(EnchantResult.SAFE_FAIL, item));
+ player.sendPacket(SystemMessageId.ENCHANT_FAILED_THE_ENCHANT_VALUE_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.S1_S2_HAS_BEEN_UNEQUIPPED);
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()))
@@ -320,11 +320,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)
@@ -356,7 +356,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)
@@ -399,7 +399,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))
@@ -409,11 +409,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)
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
index 4652f15ddc..22d6a0efa5 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
@@ -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);
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
index efe35c4745..f027b3584a 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
@@ -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,7 +100,7 @@ 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;
}
@@ -108,13 +108,13 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket
if ((item.getItem().getId() == 48168) && (stone.getItem().getId() != 48169))
{
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;
}
@@ -154,7 +154,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;
}
@@ -182,7 +182,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;
}
@@ -259,7 +259,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;
@@ -280,8 +280,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);
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
index 68bb180db1..7b967d8931 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -82,8 +82,8 @@ 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));
+ // cplayer.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
index 35fe136cbd..54a540188c 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
@@ -55,6 +55,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket
{
return;
}
+
player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
index 6ec3504089..79088e0c3a 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
@@ -47,6 +47,6 @@ public class RequestExFriendListExtended implements IClientIncomingPacket
return;
}
- client.sendPacket(new FriendList(player));
+ player.sendPacket(new FriendList(player));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
index 2e0c2154ac..150caed567 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
@@ -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()));
}
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
index 8851aef463..00bb331778 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
@@ -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 + " !!");
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 16f28d5d04..3ee3f7a9aa 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
index 1b20e2e248..f35c069743 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
@@ -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);
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
index c55df32ab6..2b1000f445 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
index 0fdcc5fde4..777238a18e 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
@@ -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.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_REGISTER_A_CLAN_CREST);
+ player.sendPacket(SystemMessageId.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_REGISTER_A_CLAN_CREST);
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);
}
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
index f868d0e26f..056262b4ab 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
@@ -48,6 +48,6 @@ public class RequestExShowContactList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExShowContactList(player));
+ player.sendPacket(new ExShowContactList(player));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
index 2d9f0456f4..1589ff8175 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
index 0a4522bf64..a2667da070 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
index b2f32527da..1355a122ce 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
index 73dd408134..1233ad294b 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
@@ -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);
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
index f1c10ee605..10070bbbeb 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
@@ -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;
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
index b70d188e2b..9624152294 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
@@ -49,7 +49,7 @@ public class RequestGiveNickName implements IClientIncomingPacket
if ((player.getNobleLevel() > 0) && _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.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_GRANT_A_TITLE);
+ player.sendPacket(SystemMessageId.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_GRANT_A_TITLE);
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);
}
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
index 04b9115f3d..fe2f9940a9 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
index a7c019d65d..7253226656 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
index ff96a400c9..79db1768e6 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
@@ -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;
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
index 2e95a321ee..1c19213904 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
index 25d004a7b7..2240af9a6e 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
@@ -41,6 +41,7 @@ public class RequestHennaRemoveList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new HennaRemoveList(player));
+
+ player.sendPacket(new HennaRemoveList(player));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
index 1c1fc6d8c2..bc9710d465 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
@@ -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()));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
index d46ef778d4..f9e67ea1ed 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
@@ -43,6 +43,7 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExInzoneWaiting(player, _hide));
+
+ player.sendPacket(new ExInzoneWaiting(player, _hide));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
index 6551e7d0c4..42404bdd99 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
@@ -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();
+ return;
}
+
+ if (player.isInventoryDisabled())
+ {
+ return;
+ }
+
+ player.sendItemList();
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
index 99965602f9..cb5c08f036 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
@@ -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)
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
index 226f085fb0..9793d6e1d8 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
@@ -44,7 +44,7 @@ public class RequestKeyMapping implements IClientIncomingPacket
if (Config.STORE_UI_SETTINGS)
{
- client.sendPacket(new ExUISetting(player));
+ player.sendPacket(new ExUISetting(player));
}
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
index ada67e190c..2cdc066ead 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
@@ -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);
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
index bffa403c8a..96b1664122 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
@@ -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));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
index 7b4703d69c..9fcb5e9736 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index 36256ab955..cbcbb3e785 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -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_ON_A_BOAT_AIRSHIP_OR_ELEVATOR);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_POLYMORPH_WHILE_RIDING_ON_A_BOAT_AIRSHIP_OR_ELEVATOR);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
index 9372163aea..769c2af9e2 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
@@ -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
{
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
index 58405174cd..f8df3d17a5 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
@@ -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.S1_HAS_BEEN_DISMISSED);
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));
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
index e670b165cd..de3adf72c3 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
@@ -43,7 +43,7 @@ public class RequestPackageSendableItemList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PackageSendableList(1, player, _objectId));
- client.sendPacket(new PackageSendableList(2, player, _objectId));
+ player.sendPacket(new PackageSendableList(1, player, _objectId));
+ player.sendPacket(new PackageSendableList(2, player, _objectId));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
index e8d53e1a19..e4ddcee7e8 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
@@ -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;
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
index 77799538ec..1d8f3225ea 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
@@ -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_BY_VISITING_HTTPS_SUPPORT_4GAME_COM);
+ player.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_BY_VISITING_HTTPS_SUPPORT_4GAME_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);
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
index b7f1ab30a7..7d148f2d91 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
index 77725a6557..3e43762127 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
@@ -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;
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
index e3ec88ca13..34af0251ca 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
@@ -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())));
}
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
index 76d591b14c..a4f9ba1784 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
index 3459b04c80..4c077a4c9e 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
@@ -64,6 +64,7 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PledgeReceiveMemberInfo(member));
+
+ player.sendPacket(new PledgeReceiveMemberInfo(member));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
index e380ce68c8..464ad76c9f 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
@@ -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)
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
index 8fabbb1f4a..beee5121dd 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
@@ -52,6 +52,6 @@ public class RequestPledgeRecruitBoardDetail implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
+ player.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
index 1d0458db08..0d0d86f7db 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
index fe019fe6d6..dde18f32a4 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
@@ -44,6 +44,6 @@ public class RequestPledgeWaitingList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeWaitingList(_clanId));
+ player.sendPacket(new ExPledgeWaitingList(_clanId));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
index add0aa2f01..618c787a17 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
@@ -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));
}
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
index 4468b67642..500800df57 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
@@ -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);
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
index 086f76c512..2a75d35297 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
@@ -51,11 +51,11 @@ 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(1, player));
- client.sendPacket(new ExReplyPostItemList(2, player));
+ player.sendPacket(new ExReplyPostItemList(1, player));
+ player.sendPacket(new ExReplyPostItemList(2, player));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
index 44bbd9d34c..a038920c8b 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
@@ -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;
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
index 94958bc4fe..2ded12e55d 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
@@ -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());
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
index 2d616f2e94..bb2f0e8e6f 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
index 8ab3d4962f..243e4a3674 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
@@ -87,7 +87,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
if (_items == null)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -128,13 +128,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;
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
index bee0568e03..365e1f598f 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
@@ -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;
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
index b64136dc79..21ba9b39af 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
index 8badb24c5f..6ffcc69313 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
@@ -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();
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
index 461f09492a..06d51160dd 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
index a08127f456..3c38b12a5f 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
@@ -45,7 +45,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;
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
index ae18cc60a5..374363bf78 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
@@ -51,6 +51,6 @@ public class RequestRecipeItemMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeItemMakeInfo(_id, player, recipe.getMaxOffering()));
+ player.sendPacket(new RecipeItemMakeInfo(_id, player, recipe.getMaxOffering()));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
index 53d06e1031..a150cfa85e 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
@@ -102,15 +102,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;
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
index 52cce423a0..f79f0f2335 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
@@ -70,6 +70,6 @@ public class RequestRecipeShopMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeShopItemInfo(manufacturer, _recipeId, manufactureRecipeCost, recipe.getMaxOffering()));
+ player.sendPacket(new RecipeShopItemInfo(manufacturer, _recipeId, manufactureRecipeCost, recipe.getMaxOffering()));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
index dd10507407..0f4ae37846 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
@@ -78,7 +78,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)
@@ -91,6 +91,6 @@ public class RequestRecipeShopManageList implements IClientIncomingPacket
}
}
- client.sendPacket(new RecipeShopManageList(player, true));
+ player.sendPacket(new RecipeShopManageList(player, true));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
index e175401b7a..9cff73412c 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
@@ -44,13 +44,13 @@ public class RequestRecipeShopManagePrev implements IClientIncomingPacket
if (player.isAlikeDead() || (player.getTarget() == null) || !player.getTarget().isPlayer())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (player.calculateDistance2D(player.getTarget()) > 250)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index 1bb51eff9d..87a0574a9f 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -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))
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
index 4da834c30d..3d01f1e525 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
@@ -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);
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
index 1632df189f..9c0c240bd4 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
index b3e709c5db..1a7c1ebc0f 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
@@ -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)
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index 662058f4d8..dfda7319fc 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
@@ -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;
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
index 7b82b33d56..af5f6876b7 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
index e5c53c86d0..1cf200da52 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
@@ -58,7 +58,7 @@ public class RequestSentPost 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;
}
@@ -73,6 +73,6 @@ public class RequestSentPost implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExReplySentPost(msg));
+ player.sendPacket(new ExReplySentPost(msg));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
index 99aec4ba86..05a414f453 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
@@ -47,6 +47,7 @@ public class RequestSentPostList implements IClientIncomingPacket
// player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
// return;
// }
- client.sendPacket(new ExShowSentPostList(player.getObjectId()));
+
+ player.sendPacket(new ExShowSentPostList(player.getObjectId()));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
index 72578e8d22..197ab07190 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
@@ -78,18 +78,23 @@ public class RequestSetCrop implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
index fe5ea44de4..a3e3ded0a3 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
@@ -77,18 +77,23 @@ public class RequestSetSeed implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index b30eb95f41..bf7d98030a 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
@@ -50,13 +51,19 @@ public class RequestShortCutReg implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- if ((client.getPlayer() == null) || (_page > 19) || (_page < 0))
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ if ((_page > 19) || (_page < 0))
{
return;
}
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
- client.getPlayer().registerShortCut(sc);
- client.sendPacket(new ShortCutRegister(sc));
+ player.registerShortCut(sc);
+ player.sendPacket(new ShortCutRegister(sc));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
index 1053bb74c1..fc2725daa7 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
@@ -44,6 +44,6 @@ public class RequestShowBeautyList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExResponseBeautyList(player, _type));
+ player.sendPacket(new ExResponseBeautyList(player, _type));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
index 9c73551f59..541b987e91 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
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;
/**
@@ -40,6 +41,12 @@ public class RequestShowBoard implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, client.getPlayer());
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, player);
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
index 162de17679..f74c3abf4d 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
@@ -41,6 +41,7 @@ public class RequestShowMiniMap implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ShowMiniMap(0));
+
+ player.sendPacket(new ShowMiniMap(0));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
index 097e8f5d30..f055ad8a57 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeAttackerList;
@@ -40,9 +41,17 @@ public class RequestSiegeAttackerList implements IClientIncomingPacket
public void run(GameClient client)
{
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
- if (castle != null)
+ if (castle == null)
{
- client.sendPacket(new SiegeAttackerList(castle));
+ return;
}
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeAttackerList(castle));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
index 6df5163c58..a8d4c9f6d0 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList;
@@ -44,6 +45,13 @@ public class RequestSiegeDefenderList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new SiegeDefenderList(castle));
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
index 8ae03da07b..51c42f7b7c 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
@@ -34,10 +34,12 @@ public class RequestSkillList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- final Player cha = client.getPlayer();
- if (cha != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- cha.sendSkillList();
+ return;
}
+
+ player.sendSkillList();
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
index b5a06923ef..f2f60163d9 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
@@ -60,52 +60,52 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
if ((clanDeclaringWar.getLevel() < 5) || (clanDeclaringWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaringWar.getWarCount() >= 30)
{
- client.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final Clan clanDeclaredWar = ClanTable.getInstance().getClanByName(_pledgeName);
if (clanDeclaredWar == null)
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar == clanDeclaringWar)
{
- client.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaringWar.getAllyId() == clanDeclaredWar.getAllyId()) && (clanDeclaringWar.getAllyId() != 0))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaredWar.getLevel() < 5) || (clanDeclaredWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis())
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -116,15 +116,15 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_T_DECLARE_A_WAR_BECAUSE_THE_21_DAY_PERIOD_HASN_T_PASSED_AFTER_A_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ALREADY_BEEN_AT_WAR_WITH_THE_S1_CLAN_5_DAYS_MUST_PASS_BEFORE_YOU_CAN_DECLARE_WAR_AGAIN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
index 47c39e2e70..e8c4b1a0e1 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
@@ -60,7 +60,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if ((member != null) && member.isOnline() && member.getPlayer().isInCombat())
{
player.sendPacket(SystemMessageId.A_CEASE_FIRE_DURING_A_CLAN_WAR_CAN_NOT_BE_CALLED_WHILE_MEMBERS_OF_YOUR_CLAN_ARE_ENGAGED_IN_BATTLE);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -69,13 +69,13 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if (targetClan == null)
{
player.sendMessage("No such clan.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -85,14 +85,14 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_NOT_DECLARED_A_CLAN_WAR_AGAINST_THE_CLAN_S1);
sm.addString(targetClan.getName());
player.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{
player.sendPacket(SystemMessageId.YOU_CANNOT_DECLARE_DEFEAT_AS_IT_HAS_NOT_BEEN_7_DAYS_SINCE_STARTING_A_CLAN_WAR_WITH_CLAN_S1);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
index db5981de3d..32d110951d 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
@@ -65,7 +65,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
// The English system message say weapon, but it's applied to any equipped item.
if (player.isAttackingNow() || player.isCastingNow())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
return;
}
@@ -89,13 +89,13 @@ public class RequestUnEquipItem implements IClientIncomingPacket
if (!player.getInventory().canManipulateWithItemId(item.getId()))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
if (item.isWeapon() && item.getWeaponItem().isForceEquip() && !player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
@@ -117,7 +117,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
}
sm.addItemName(unequippedItem);
- client.sendPacket(sm);
+ player.sendPacket(sm);
final InventoryUpdate iu = new InventoryUpdate();
iu.addItems(unequipped);
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
index 0b38bcb67c..9e95fb93e1 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
@@ -51,28 +51,28 @@ public class RequestVoteNew implements IClientIncomingPacket
{
if (object == null)
{
- client.sendPacket(SystemMessageId.SELECT_TARGET);
+ player.sendPacket(SystemMessageId.SELECT_TARGET);
}
else if (object.isFakePlayer() && FakePlayerData.getInstance().isTalkable(object.getName()))
{
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addString(FakePlayerData.getInstance().getProperName(object.getName()));
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
player.setRecomLeft(player.getRecomLeft() - 1);
- client.sendPacket(new UserInfo(player));
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new UserInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
}
else
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
}
return;
}
@@ -85,19 +85,19 @@ public class RequestVoteNew implements IClientIncomingPacket
if (target == player)
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
return;
}
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
if (target.getRecomHave() >= 255)
{
- client.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
+ player.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
return;
}
@@ -106,16 +106,16 @@ public class RequestVoteNew implements IClientIncomingPacket
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addPcName(target);
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_BEEN_RECOMMENDED_BY_C1);
sm.addPcName(player);
target.sendPacket(sm);
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
target.broadcastUserInfo();
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
target.sendPacket(new ExVoteSystemInfo(target));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
index 05261ba813..0e3300d03c 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
@@ -67,12 +67,12 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
}
else if ((player.getWeightPenalty() >= 3) || !player.isInventoryUnder90(false))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
return;
}
else if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
return;
}
@@ -101,11 +101,11 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
if (player.getPremiumItemList().isEmpty())
{
- client.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
+ player.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
}
else
{
- client.sendPacket(new ExGetPremiumItemList(player));
+ player.sendPacket(new ExGetPremiumItemList(player));
}
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
index ddde316520..560580862d 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
@@ -48,17 +48,17 @@ public class RequestWithdrawalPledge 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.isClanLeader())
{
- client.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
+ player.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
return;
}
if (player.isInCombat())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
return;
}
@@ -72,7 +72,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
// Remove the Player From the Member list
clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(player.getName()));
clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
- client.sendPacket(SystemMessageId.YOU_HAVE_LEFT_THE_CLAN);
- client.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
+ player.sendPacket(SystemMessageId.YOU_HAVE_LEFT_THE_CLAN);
+ player.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
index 84b879e0f7..13ecd08a96 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
@@ -150,14 +150,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
// Item Max Limit Check
if (!warehouse.validateCapacity(slots))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
+ player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
return;
}
// Check if enough adena and charge the fee
if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, manager, false))
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
return;
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
index a5462164d1..76e8ac2a68 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket
}
player.getBuyList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgBuy(player));
+ player.sendPacket(new PrivateStoreMsgBuy(player));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
index ac64c43c5c..d86bfc8f84 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket
}
player.getSellList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgSell(player));
+ player.sendPacket(new PrivateStoreMsgSell(player));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
index f3078c3e52..2726f99c08 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket
}
player.getSellList().setTitle(_msg);
- client.sendPacket(new ExPrivateStoreSetWholeMsg(player));
+ player.sendPacket(new ExPrivateStoreSetWholeMsg(player));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
index 8e7e6f9b2d..1022c9061d 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
@@ -73,7 +73,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!player.getAccessLevel().allowTransaction())
{
player.sendMessage("Transactions are disabled for your current Access Level.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -84,8 +84,8 @@ public class TradeRequest implements IClientIncomingPacket
{
if (!effect.checkCondition(BotReportTable.TRADE_ACTION_BLOCK_ID))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -104,7 +104,7 @@ public class TradeRequest implements IClientIncomingPacket
// and the following system message is sent to acting player.
if (target.getObjectId() == player.getObjectId())
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
return;
}
@@ -141,7 +141,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!target.isPlayer())
{
- client.sendPacket(SystemMessageId.INVALID_TARGET);
+ player.sendPacket(SystemMessageId.INVALID_TARGET);
return;
}
@@ -161,8 +161,8 @@ public class TradeRequest implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_IS_CURRENTLY_BEING_INVESTIGATED);
sm.addString(partner.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -189,13 +189,13 @@ public class TradeRequest implements IClientIncomingPacket
if ((player.getPrivateStoreType() != PrivateStoreType.NONE) || (partner.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;
}
if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
+ player.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
return;
}
@@ -204,7 +204,7 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
@@ -218,13 +218,13 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
if (player.calculateDistance3D(partner) > 150)
{
- client.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
+ player.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
return;
}
@@ -232,6 +232,6 @@ public class TradeRequest implements IClientIncomingPacket
partner.sendPacket(new SendTradeRequest(player.getObjectId()));
sm = new SystemMessage(SystemMessageId.YOU_HAVE_REQUESTED_A_TRADE_WITH_C1);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
index ece66b1cd9..40f802fb2c 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
@@ -116,7 +116,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (learn == null)
{
PacketLogger.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
break;
}
@@ -124,7 +124,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (skill == null)
{
PacketLogger.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
break;
}
@@ -157,7 +157,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1])
{
PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -167,7 +167,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel())
{
PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -176,7 +176,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points)
{
PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
index dd8e176010..f36b68549c 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
@@ -60,12 +60,12 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
}
else if (player.getLevel() < 85)
{
- client.sendPacket(SystemMessageId.REACH_LEVEL_85_TO_USE_THE_ABILITY);
+ player.sendPacket(SystemMessageId.REACH_LEVEL_85_TO_USE_THE_ABILITY);
return;
}
else if (player.isInOlympiadMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_OR_RESET_ABILITY_POINTS_WHILE_PARTICIPATING_IN_THE_OLYMPIAD_OR_CEREMONY_OF_CHAOS);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_OR_RESET_ABILITY_POINTS_WHILE_PARTICIPATING_IN_THE_OLYMPIAD_OR_CEREMONY_OF_CHAOS);
return;
}
else if (player.isOnEvent())
@@ -85,7 +85,7 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
}
else if (player.getSp() < Config.ABILITY_POINTS_RESET_SP)
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_FOR_THIS);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_FOR_THIS);
return;
}
player.setSp(player.getSp() - Config.ABILITY_POINTS_RESET_SP);
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
index afbd8b0b76..3ccf45b47f 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
@@ -44,6 +44,6 @@ public class RequestExCancelShape_Shifting_Item implements IClientIncomingPacket
}
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
index 055dc2dd1e..6d286b4894 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
@@ -60,7 +60,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -83,7 +83,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (!extractItem.getItem().isAppearanceable())
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -113,15 +113,15 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,20 +129,20 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -154,6 +154,6 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
}
request.setAppearanceExtractItem(extractItem);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
index f7aa0f3047..1c8eaa09c2 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
@@ -55,8 +55,8 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -65,35 +65,35 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -101,7 +101,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -112,6 +112,6 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
return;
}
- client.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
+ player.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 1de9056bda..2a6d3e9bb9 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -64,8 +64,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -74,36 +74,36 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -111,14 +111,14 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!appearanceStone.checkConditions(player, targetItem))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,56 +129,56 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
{
if (extractItem == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getOwnerId() != player.getObjectId())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!extractItem.getItem().isAppearanceable())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -189,21 +189,21 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final long cost = appearanceStone.getCost();
if (cost > player.getAdena())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (stone.getCount() < 1L)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((appearanceStone.getType() == AppearanceType.NORMAL) && (inventory.destroyItem(getClass().getSimpleName(), extractItem, 1, player, this) == null))
{
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -276,7 +276,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
player.sendInventoryUpdate(iu);
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
+ player.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
if (targetItem.isEquipped())
{
player.broadcastUserInfo();
@@ -288,8 +288,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
slots.addComponentType(slot);
}
}
- client.sendPacket(slots);
+ player.sendPacket(slots);
}
- client.sendPacket(new ExAdenaInvenCount(player));
+ player.sendPacket(new ExAdenaInvenCount(player));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
index abea70c48a..bf64e21529 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
@@ -65,8 +65,8 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket
// attempting to destroy item
if (player.getInventory().destroyItemByItemId("ChangeAttribute", _consumeItemId, 1, player, item) == null)
{
- client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
- client.sendPacket(ExChangeAttributeFail.STATIC);
+ player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
+ player.sendPacket(ExChangeAttributeFail.STATIC);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH);
return;
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
index 7f91558675..0de9d8bc72 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
@@ -52,26 +52,26 @@ public class RequestCommissionBuyInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
if (!player.isInventoryUnder80(false) || (player.getWeightPenalty() >= 3))
{
- client.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_AMOUNT_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_AMOUNT_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
return;
}
final CommissionItem commissionItem = ItemCommissionManager.getInstance().getCommissionItem(_commissionId);
if (commissionItem != null)
{
- client.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
+ player.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
}
else
{
- client.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
}
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
index aa794d2d96..16dec35e6f 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
@@ -49,7 +49,7 @@ public class RequestCommissionBuyItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
index 4f7141c09d..8a3ff5c955 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
@@ -50,7 +50,7 @@ public class RequestCommissionDelete implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
index 1a7edbbaac..01005d24c1 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
@@ -50,18 +50,18 @@ public class RequestCommissionInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
final Item itemInstance = player.getInventory().getItemByObjectId(_itemObjectId);
if (itemInstance != null)
{
- client.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
+ player.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
}
else
{
- client.sendPacket(ExResponseCommissionInfo.EMPTY);
+ player.sendPacket(ExResponseCommissionInfo.EMPTY);
}
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
index 1ad79b9031..57fd69ec8d 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
@@ -62,7 +62,7 @@ public class RequestCommissionList implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
index 6b2f96e87d..7eb252c475 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
@@ -95,7 +95,7 @@ public class RequestCommissionRegister implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
index 1e826566da..b19aefac8d 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
@@ -45,7 +45,7 @@ public class RequestCommissionRegisteredItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
index 532c2496c2..75a5a816f0 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
@@ -46,11 +46,11 @@ public class RequestCommissionRegistrableItemList implements IClientIncomingPack
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
- client.sendPacket(new ExResponseCommissionItemList(1, player.getInventory().getAvailableItems(false, false, false)));
- client.sendPacket(new ExResponseCommissionItemList(2, player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(1, player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(2, player.getInventory().getAvailableItems(false, false, false)));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
index 670f9a29ed..398352c0f7 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = new CompoundRequest(player);
if (!player.addRequest(request))
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
@@ -77,7 +79,7 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
final Item itemOne = request.getItemOne();
if (itemOne == null)
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -87,11 +89,11 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItems.isEmpty())
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
- client.sendPacket(ExEnchantOneOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
index 315704e4e5..b8f98ff7ba 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
@@ -51,23 +51,25 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -77,14 +79,14 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -93,10 +95,10 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
- client.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
index 0dbe123787..72a0b34bfc 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemOne();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
request.setItemOne(0);
- client.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
index 5743927fa1..4a05f6c92b 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemTwo();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
request.setItemTwo(0);
- client.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
index c0eb970566..70e94532db 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
return;
}
@@ -78,7 +80,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -86,7 +88,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -96,7 +98,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -113,11 +115,11 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item item = player.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true);
if (success)
{
- client.sendPacket(new ExEnchantSucess(item.getId()));
+ player.sendPacket(new ExEnchantSucess(item.getId()));
}
else
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
index e4e46a5271..d5165c28ec 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
@@ -65,6 +65,7 @@ public class RequestCrystallizeEstimate 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);
@@ -73,28 +74,28 @@ public class RequestCrystallizeEstimate 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);
return;
}
final Item item = player.getInventory().getItemByObjectId(_objectId);
if ((item == null) || item.isShadowItem() || item.isTimeLimitedItem() || item.isHeroItem() || (!Config.ALT_ALLOW_AUGMENT_DESTROY && item.isAugmented()))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
PacketLogger.warning(player + ": tried to crystallize " + item.getItem());
return;
}
@@ -167,8 +168,8 @@ public class RequestCrystallizeEstimate 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;
}
@@ -177,11 +178,11 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket
if ((crystallizationRewards != null) && !crystallizationRewards.isEmpty())
{
player.setInCrystallize(true);
- client.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
+ player.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
}
else
{
- client.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
+ player.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
}
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java
index 6425eba48e..ce7c41304f 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java
@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.faction;
import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.faction.ExFactionInfo;
@@ -39,6 +40,12 @@ public class RequestUserFactionInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.getPlayer().sendPacket(new ExFactionInfo(client.getPlayer(), _openDialog));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ExFactionInfo(player, _openDialog));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
index 584b6e3e4e..a0b7c23c20 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
@@ -40,9 +40,11 @@ public class RequestFriendDetailInfo implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExFriendDetailInfo(player, _name));
+ return;
}
+
+ player.sendPacket(new ExFriendDetailInfo(player, _name));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
index 82fa3a651a..e9e5d90e84 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
@@ -48,6 +48,7 @@ public class RequestMenteeWaitingList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
+
+ player.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
index 7c22e266ca..20ec347a77 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
@@ -41,6 +41,7 @@ public class RequestMentorList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExMentorList(player));
+
+ player.sendPacket(new ExMentorList(player));
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
index 4023b0cff0..618f6dc7ed 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
@@ -37,9 +37,11 @@ public class RequestBRGamePoint implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExBRGamePoint(player));
+ return;
}
+
+ player.sendPacket(new ExBRGamePoint(player));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
index de0446cfd8..7ac78cfe4f 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
@@ -34,7 +34,7 @@ public class RequestBRRecentProductList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- // Player player = client.getPlayer();
+ // Player player = cplayer.getPlayer();
// TODO: Implement it.
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
index 6813c75ed2..f8d602624b 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
@@ -34,7 +34,6 @@ public class ExRestartClient implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.EX_RESTART_CLIENT.writeId(packet);
-
return true;
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
index 89678c1836..4378479707 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
- * A packet used to draw points and lines on client.
+ * A packet used to draw points and lines on cplayer.
* Note: Names in points and lines are bugged they will appear even when not looking at them.
* @author NosBit
*/
@@ -62,7 +62,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -76,7 +76,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -88,7 +88,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -100,7 +100,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
@@ -110,7 +110,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -124,7 +124,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -136,7 +136,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -148,7 +148,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
index ef3f4acc18..25ba232162 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
@@ -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;
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
index c6ea588540..acab47f316 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
@@ -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;
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
index cdfaa128cb..129d1a52d1 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
@@ -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;
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
index ba988591d0..370aeba2c5 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
@@ -51,6 +51,6 @@ public class Appearing implements IClientIncomingPacket
player.onTeleported();
}
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
index 0ea780c5b4..b47439803f 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
@@ -55,7 +55,7 @@ public class BypassUserCmd implements IClientIncomingPacket
}
else
{
- handler.useUserCommand(_command, client.getPlayer());
+ handler.useUserCommand(_command, player);
}
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
index a3236b0d83..43c0172038 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
@@ -65,12 +65,12 @@ public class CannotMoveAnymore implements IClientIncomingPacket
// PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+
// " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ());
// StopMove smwl = new StopMove(player);
- // client.getPlayer().sendPacket(smwl);
- // client.getPlayer().broadcastPacket(smwl);
+ // cplayer.getPlayer().sendPacket(smwl);
+ // cplayer.getPlayer().broadcastPacket(smwl);
//
- // StopRotation sr = new StopRotation(client.getPlayer(),
+ // StopRotation sr = new StopRotation(cplayer.getPlayer(),
// _heading);
- // client.getPlayer().sendPacket(sr);
- // client.getPlayer().broadcastPacket(sr);
+ // cplayer.getPlayer().sendPacket(sr);
+ // cplayer.getPlayer().broadcastPacket(sr);
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index d28d3e54c1..7b68dd4529 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -322,18 +322,18 @@ 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(1, player));
- client.sendPacket(new ItemList(2, player));
+ player.sendPacket(new ItemList(1, player));
+ player.sendPacket(new ItemList(2, player));
// Send Quest Item List
- client.sendPacket(new ExQuestItemList(1, player));
- client.sendPacket(new ExQuestItemList(2, player));
+ player.sendPacket(new ExQuestItemList(1, player));
+ player.sendPacket(new ExQuestItemList(2, player));
// Send Shortcuts
- client.sendPacket(new ShortCutInit(player));
+ player.sendPacket(new ShortCutInit(player));
// Send Action list
player.sendPacket(ExBasicActionList.STATIC_PACKET);
@@ -443,7 +443,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");
@@ -484,14 +484,14 @@ public class EnterWorld implements IClientIncomingPacket
notice.replace("%clan_name%", player.getClan().getName());
notice.replace("%notice_text%", player.getClan().getNotice().replaceAll("\r\n", "
"));
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));
}
}
@@ -503,13 +503,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())
@@ -572,7 +572,7 @@ public class EnterWorld implements IClientIncomingPacket
{
if (MailManager.getInstance().hasUnreadPost(player))
{
- client.sendPacket(ExNoticePostArrived.valueOf(false));
+ player.sendPacket(ExNoticePostArrived.valueOf(false));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 4bb789645a..218e629395 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -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;
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 8078d0c10e..6ac4cc7ca0 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -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:
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
index 65c69620a0..94911328a2 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
@@ -41,6 +41,7 @@ public class RequestAlchemySkillList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExAlchemySkillList(player));
+
+ player.sendPacket(new ExAlchemySkillList(player));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
index 49bb9c2285..fb6b18d662 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
index c6f8fe2045..b6f8d4fb9e 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
index 5669f5691a..beb5024780 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
index 7ee18d42b3..3e864837f8 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
index 2baf948bc7..4dc52e2648 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
index b7a2c5c6c4..6795fe94e2 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
index 83ffc494d5..4b817c3e70 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index 106581d3f1..d02d20618a 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
@@ -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,8 +253,8 @@ 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));
player.sendPacket(SystemMessageId.THE_TRADE_WAS_SUCCESSFUL);
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
index d77d8eba6a..f841f306a1 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
@@ -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;
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
index 4534c39c18..b65ad7c589 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
@@ -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;
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
index f1ddb94865..5ae334f854 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
index 21710a1eb0..dd69523f80 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
@@ -96,6 +96,6 @@ public class RequestConfirmSiegeWaitingList implements IClientIncomingPacket
}
// Update the defender list
- client.sendPacket(new SiegeDefenderList(castle));
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
index dc81cb23dc..b2f53bed92 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
index be08d7f35d..d76760750a 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
@@ -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();
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
index 36d36097c1..5fd67b8759 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
@@ -42,6 +42,6 @@ public class RequestCursedWeaponList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExCursedWeaponList());
+ player.sendPacket(new ExCursedWeaponList());
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
index 573a4f7950..193c436d7e 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
index ce21646986..6d59e89936 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
index 5882d1ea46..88fd8b949d 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index cb90d581c8..d8f319bf1f 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -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.S1_S2_HAS_BEEN_UNEQUIPPED);
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();
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
index 224a640ef5..5227396561 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
@@ -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);
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
index ed981b63f7..f5607f7fa5 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
@@ -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);
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index 80f9e04c6e..8cd6508e6f 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -86,7 +86,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;
}
@@ -122,9 +122,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;
}
@@ -133,27 +133,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;
}
@@ -163,9 +163,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;
}
@@ -174,9 +174,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:
@@ -195,7 +195,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)
@@ -260,8 +260,8 @@ public class RequestEnchantItem implements IClientIncomingPacket
if (scrollTemplate.isSafe())
{
// safe enchant - remain old value
- client.sendPacket(SystemMessageId.ENCHANT_FAILED_THE_ENCHANT_VALUE_FOR_THE_CORRESPONDING_ITEM_WILL_BE_EXACTLY_RETAINED);
- client.sendPacket(new EnchantResult(EnchantResult.SAFE_FAIL, item));
+ player.sendPacket(SystemMessageId.ENCHANT_FAILED_THE_ENCHANT_VALUE_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)
@@ -295,13 +295,13 @@ public class RequestEnchantItem implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED);
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()))
@@ -322,11 +322,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)
@@ -358,7 +358,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)
@@ -401,7 +401,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))
@@ -411,11 +411,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)
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
index 4652f15ddc..22d6a0efa5 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
@@ -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);
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
index 161b8d0cab..b7e61d2f18 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
@@ -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,7 +100,7 @@ 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;
}
@@ -108,13 +108,13 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket
if ((item.getItem().getId() == 48168) && (stone.getItem().getId() != 48169))
{
player.removeRequest(request.getClass());
- client.sendPacket(SystemMessageId.ATTRIBUTE_ITEM_USAGE_HAS_BEEN_CANCELLED);
+ player.sendPacket(SystemMessageId.ATTRIBUTE_ITEM_USAGE_HAS_BEEN_CANCELLED);
return;
}
if (!ElementalAttributeData.getInstance().isElementableWithStone(item, stone.getItem().getId()))
{
- 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;
}
@@ -154,7 +154,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;
}
@@ -182,7 +182,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;
}
@@ -259,7 +259,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;
@@ -280,8 +280,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);
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
index 68bb180db1..7b967d8931 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -82,8 +82,8 @@ 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));
+ // cplayer.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
index 35fe136cbd..54a540188c 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
@@ -55,6 +55,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket
{
return;
}
+
player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
index 6ec3504089..79088e0c3a 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
@@ -47,6 +47,6 @@ public class RequestExFriendListExtended implements IClientIncomingPacket
return;
}
- client.sendPacket(new FriendList(player));
+ player.sendPacket(new FriendList(player));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
index 2e0c2154ac..150caed567 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
@@ -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()));
}
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
index 8851aef463..00bb331778 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
@@ -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 + " !!");
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 16f28d5d04..3ee3f7a9aa 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
index cf7d7e0219..1b85248a24 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
@@ -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);
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
index c55df32ab6..2b1000f445 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
index 0fdcc5fde4..777238a18e 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
@@ -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.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_REGISTER_A_CLAN_CREST);
+ player.sendPacket(SystemMessageId.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_REGISTER_A_CLAN_CREST);
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);
}
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
index f868d0e26f..056262b4ab 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
@@ -48,6 +48,6 @@ public class RequestExShowContactList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExShowContactList(player));
+ player.sendPacket(new ExShowContactList(player));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
index 2d9f0456f4..1589ff8175 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
index 0a4522bf64..a2667da070 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
index b2f32527da..1355a122ce 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
index 73dd408134..1233ad294b 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
@@ -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);
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
index f1c10ee605..10070bbbeb 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
@@ -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;
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
index b70d188e2b..9624152294 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
@@ -49,7 +49,7 @@ public class RequestGiveNickName implements IClientIncomingPacket
if ((player.getNobleLevel() > 0) && _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.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_GRANT_A_TITLE);
+ player.sendPacket(SystemMessageId.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_GRANT_A_TITLE);
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);
}
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
index 04b9115f3d..fe2f9940a9 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
index a7c019d65d..7253226656 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
index ff96a400c9..79db1768e6 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
@@ -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;
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
index 2e95a321ee..1c19213904 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
index 25d004a7b7..2240af9a6e 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
@@ -41,6 +41,7 @@ public class RequestHennaRemoveList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new HennaRemoveList(player));
+
+ player.sendPacket(new HennaRemoveList(player));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
index 1c1fc6d8c2..bc9710d465 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
@@ -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()));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
index d46ef778d4..f9e67ea1ed 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
@@ -43,6 +43,7 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExInzoneWaiting(player, _hide));
+
+ player.sendPacket(new ExInzoneWaiting(player, _hide));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
index 6551e7d0c4..42404bdd99 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
@@ -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();
+ return;
}
+
+ if (player.isInventoryDisabled())
+ {
+ return;
+ }
+
+ player.sendItemList();
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
index 99965602f9..cb5c08f036 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
@@ -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)
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
index 226f085fb0..9793d6e1d8 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
@@ -44,7 +44,7 @@ public class RequestKeyMapping implements IClientIncomingPacket
if (Config.STORE_UI_SETTINGS)
{
- client.sendPacket(new ExUISetting(player));
+ player.sendPacket(new ExUISetting(player));
}
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
index ada67e190c..2cdc066ead 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
@@ -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);
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
index bffa403c8a..96b1664122 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
@@ -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));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
index 7b4703d69c..9fcb5e9736 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index 36256ab955..cbcbb3e785 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -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_ON_A_BOAT_AIRSHIP_OR_ELEVATOR);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_POLYMORPH_WHILE_RIDING_ON_A_BOAT_AIRSHIP_OR_ELEVATOR);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
index 9372163aea..769c2af9e2 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
@@ -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
{
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
index 58405174cd..f8df3d17a5 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
@@ -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.S1_HAS_BEEN_DISMISSED);
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));
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
index e670b165cd..de3adf72c3 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
@@ -43,7 +43,7 @@ public class RequestPackageSendableItemList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PackageSendableList(1, player, _objectId));
- client.sendPacket(new PackageSendableList(2, player, _objectId));
+ player.sendPacket(new PackageSendableList(1, player, _objectId));
+ player.sendPacket(new PackageSendableList(2, player, _objectId));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
index e8d53e1a19..e4ddcee7e8 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
@@ -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;
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
index 77799538ec..1d8f3225ea 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
@@ -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_BY_VISITING_HTTPS_SUPPORT_4GAME_COM);
+ player.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_BY_VISITING_HTTPS_SUPPORT_4GAME_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);
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
index b7f1ab30a7..7d148f2d91 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
index 77725a6557..3e43762127 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
@@ -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;
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
index e3ec88ca13..34af0251ca 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
@@ -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())));
}
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
index 76d591b14c..a4f9ba1784 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
index 3459b04c80..4c077a4c9e 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
@@ -64,6 +64,7 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PledgeReceiveMemberInfo(member));
+
+ player.sendPacket(new PledgeReceiveMemberInfo(member));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
index e380ce68c8..464ad76c9f 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
@@ -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)
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
index 8fabbb1f4a..beee5121dd 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
@@ -52,6 +52,6 @@ public class RequestPledgeRecruitBoardDetail implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
+ player.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
index 1d0458db08..0d0d86f7db 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
index fe019fe6d6..dde18f32a4 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
@@ -44,6 +44,6 @@ public class RequestPledgeWaitingList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeWaitingList(_clanId));
+ player.sendPacket(new ExPledgeWaitingList(_clanId));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
index add0aa2f01..618c787a17 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
@@ -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));
}
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
index 4468b67642..500800df57 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
@@ -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);
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
index 086f76c512..2a75d35297 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
@@ -51,11 +51,11 @@ 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(1, player));
- client.sendPacket(new ExReplyPostItemList(2, player));
+ player.sendPacket(new ExReplyPostItemList(1, player));
+ player.sendPacket(new ExReplyPostItemList(2, player));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
index 44bbd9d34c..a038920c8b 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
@@ -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;
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
index 94958bc4fe..2ded12e55d 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
@@ -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());
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
index 2d616f2e94..bb2f0e8e6f 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
index 8ab3d4962f..243e4a3674 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
@@ -87,7 +87,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
if (_items == null)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -128,13 +128,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;
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
index bee0568e03..365e1f598f 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
@@ -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;
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
index b64136dc79..21ba9b39af 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
index 8badb24c5f..6ffcc69313 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
@@ -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();
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
index 461f09492a..06d51160dd 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
index a08127f456..3c38b12a5f 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
@@ -45,7 +45,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;
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
index ae18cc60a5..374363bf78 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
@@ -51,6 +51,6 @@ public class RequestRecipeItemMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeItemMakeInfo(_id, player, recipe.getMaxOffering()));
+ player.sendPacket(new RecipeItemMakeInfo(_id, player, recipe.getMaxOffering()));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
index 53d06e1031..a150cfa85e 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
@@ -102,15 +102,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;
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
index 52cce423a0..f79f0f2335 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
@@ -70,6 +70,6 @@ public class RequestRecipeShopMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeShopItemInfo(manufacturer, _recipeId, manufactureRecipeCost, recipe.getMaxOffering()));
+ player.sendPacket(new RecipeShopItemInfo(manufacturer, _recipeId, manufactureRecipeCost, recipe.getMaxOffering()));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
index dd10507407..0f4ae37846 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
@@ -78,7 +78,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)
@@ -91,6 +91,6 @@ public class RequestRecipeShopManageList implements IClientIncomingPacket
}
}
- client.sendPacket(new RecipeShopManageList(player, true));
+ player.sendPacket(new RecipeShopManageList(player, true));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
index e175401b7a..9cff73412c 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
@@ -44,13 +44,13 @@ public class RequestRecipeShopManagePrev implements IClientIncomingPacket
if (player.isAlikeDead() || (player.getTarget() == null) || !player.getTarget().isPlayer())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (player.calculateDistance2D(player.getTarget()) > 250)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index 1bb51eff9d..87a0574a9f 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -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))
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
index 4da834c30d..3d01f1e525 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
@@ -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);
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
index 1632df189f..9c0c240bd4 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
index b3e709c5db..1a7c1ebc0f 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
@@ -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)
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index 662058f4d8..dfda7319fc 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
@@ -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;
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
index 7b82b33d56..af5f6876b7 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
index e5c53c86d0..1cf200da52 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
@@ -58,7 +58,7 @@ public class RequestSentPost 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;
}
@@ -73,6 +73,6 @@ public class RequestSentPost implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExReplySentPost(msg));
+ player.sendPacket(new ExReplySentPost(msg));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
index 99aec4ba86..05a414f453 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
@@ -47,6 +47,7 @@ public class RequestSentPostList implements IClientIncomingPacket
// player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
// return;
// }
- client.sendPacket(new ExShowSentPostList(player.getObjectId()));
+
+ player.sendPacket(new ExShowSentPostList(player.getObjectId()));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
index 72578e8d22..197ab07190 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
@@ -78,18 +78,23 @@ public class RequestSetCrop implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
index fe5ea44de4..a3e3ded0a3 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
@@ -77,18 +77,23 @@ public class RequestSetSeed implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index b30eb95f41..bf7d98030a 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
@@ -50,13 +51,19 @@ public class RequestShortCutReg implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- if ((client.getPlayer() == null) || (_page > 19) || (_page < 0))
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ if ((_page > 19) || (_page < 0))
{
return;
}
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
- client.getPlayer().registerShortCut(sc);
- client.sendPacket(new ShortCutRegister(sc));
+ player.registerShortCut(sc);
+ player.sendPacket(new ShortCutRegister(sc));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
index 1053bb74c1..fc2725daa7 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
@@ -44,6 +44,6 @@ public class RequestShowBeautyList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExResponseBeautyList(player, _type));
+ player.sendPacket(new ExResponseBeautyList(player, _type));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
index 9c73551f59..541b987e91 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
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;
/**
@@ -40,6 +41,12 @@ public class RequestShowBoard implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, client.getPlayer());
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, player);
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
index 162de17679..f74c3abf4d 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
@@ -41,6 +41,7 @@ public class RequestShowMiniMap implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ShowMiniMap(0));
+
+ player.sendPacket(new ShowMiniMap(0));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
index 097e8f5d30..f055ad8a57 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeAttackerList;
@@ -40,9 +41,17 @@ public class RequestSiegeAttackerList implements IClientIncomingPacket
public void run(GameClient client)
{
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
- if (castle != null)
+ if (castle == null)
{
- client.sendPacket(new SiegeAttackerList(castle));
+ return;
}
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeAttackerList(castle));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
index 6df5163c58..a8d4c9f6d0 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList;
@@ -44,6 +45,13 @@ public class RequestSiegeDefenderList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new SiegeDefenderList(castle));
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
index 8ae03da07b..51c42f7b7c 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
@@ -34,10 +34,12 @@ public class RequestSkillList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- final Player cha = client.getPlayer();
- if (cha != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- cha.sendSkillList();
+ return;
}
+
+ player.sendSkillList();
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
index b5a06923ef..f2f60163d9 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
@@ -60,52 +60,52 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
if ((clanDeclaringWar.getLevel() < 5) || (clanDeclaringWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaringWar.getWarCount() >= 30)
{
- client.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final Clan clanDeclaredWar = ClanTable.getInstance().getClanByName(_pledgeName);
if (clanDeclaredWar == null)
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar == clanDeclaringWar)
{
- client.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaringWar.getAllyId() == clanDeclaredWar.getAllyId()) && (clanDeclaringWar.getAllyId() != 0))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaredWar.getLevel() < 5) || (clanDeclaredWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_5_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis())
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -116,15 +116,15 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_T_DECLARE_A_WAR_BECAUSE_THE_21_DAY_PERIOD_HASN_T_PASSED_AFTER_A_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ALREADY_BEEN_AT_WAR_WITH_THE_S1_CLAN_5_DAYS_MUST_PASS_BEFORE_YOU_CAN_DECLARE_WAR_AGAIN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
index 47c39e2e70..e8c4b1a0e1 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
@@ -60,7 +60,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if ((member != null) && member.isOnline() && member.getPlayer().isInCombat())
{
player.sendPacket(SystemMessageId.A_CEASE_FIRE_DURING_A_CLAN_WAR_CAN_NOT_BE_CALLED_WHILE_MEMBERS_OF_YOUR_CLAN_ARE_ENGAGED_IN_BATTLE);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -69,13 +69,13 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if (targetClan == null)
{
player.sendMessage("No such clan.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -85,14 +85,14 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_NOT_DECLARED_A_CLAN_WAR_AGAINST_THE_CLAN_S1);
sm.addString(targetClan.getName());
player.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{
player.sendPacket(SystemMessageId.YOU_CANNOT_DECLARE_DEFEAT_AS_IT_HAS_NOT_BEEN_7_DAYS_SINCE_STARTING_A_CLAN_WAR_WITH_CLAN_S1);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
index db5981de3d..32d110951d 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
@@ -65,7 +65,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
// The English system message say weapon, but it's applied to any equipped item.
if (player.isAttackingNow() || player.isCastingNow())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
return;
}
@@ -89,13 +89,13 @@ public class RequestUnEquipItem implements IClientIncomingPacket
if (!player.getInventory().canManipulateWithItemId(item.getId()))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
if (item.isWeapon() && item.getWeaponItem().isForceEquip() && !player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
@@ -117,7 +117,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
}
sm.addItemName(unequippedItem);
- client.sendPacket(sm);
+ player.sendPacket(sm);
final InventoryUpdate iu = new InventoryUpdate();
iu.addItems(unequipped);
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
index 0b38bcb67c..9e95fb93e1 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
@@ -51,28 +51,28 @@ public class RequestVoteNew implements IClientIncomingPacket
{
if (object == null)
{
- client.sendPacket(SystemMessageId.SELECT_TARGET);
+ player.sendPacket(SystemMessageId.SELECT_TARGET);
}
else if (object.isFakePlayer() && FakePlayerData.getInstance().isTalkable(object.getName()))
{
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addString(FakePlayerData.getInstance().getProperName(object.getName()));
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
player.setRecomLeft(player.getRecomLeft() - 1);
- client.sendPacket(new UserInfo(player));
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new UserInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
}
else
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
}
return;
}
@@ -85,19 +85,19 @@ public class RequestVoteNew implements IClientIncomingPacket
if (target == player)
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
return;
}
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
if (target.getRecomHave() >= 255)
{
- client.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
+ player.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
return;
}
@@ -106,16 +106,16 @@ public class RequestVoteNew implements IClientIncomingPacket
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addPcName(target);
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_BEEN_RECOMMENDED_BY_C1);
sm.addPcName(player);
target.sendPacket(sm);
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
target.broadcastUserInfo();
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
target.sendPacket(new ExVoteSystemInfo(target));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
index 05261ba813..0e3300d03c 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
@@ -67,12 +67,12 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
}
else if ((player.getWeightPenalty() >= 3) || !player.isInventoryUnder90(false))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
return;
}
else if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
return;
}
@@ -101,11 +101,11 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
if (player.getPremiumItemList().isEmpty())
{
- client.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
+ player.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
}
else
{
- client.sendPacket(new ExGetPremiumItemList(player));
+ player.sendPacket(new ExGetPremiumItemList(player));
}
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
index ddde316520..560580862d 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
@@ -48,17 +48,17 @@ public class RequestWithdrawalPledge 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.isClanLeader())
{
- client.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
+ player.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
return;
}
if (player.isInCombat())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
return;
}
@@ -72,7 +72,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
// Remove the Player From the Member list
clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(player.getName()));
clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
- client.sendPacket(SystemMessageId.YOU_HAVE_LEFT_THE_CLAN);
- client.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
+ player.sendPacket(SystemMessageId.YOU_HAVE_LEFT_THE_CLAN);
+ player.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
index 84b879e0f7..13ecd08a96 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
@@ -150,14 +150,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
// Item Max Limit Check
if (!warehouse.validateCapacity(slots))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
+ player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
return;
}
// Check if enough adena and charge the fee
if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, manager, false))
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
return;
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
index a5462164d1..76e8ac2a68 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket
}
player.getBuyList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgBuy(player));
+ player.sendPacket(new PrivateStoreMsgBuy(player));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
index ac64c43c5c..d86bfc8f84 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket
}
player.getSellList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgSell(player));
+ player.sendPacket(new PrivateStoreMsgSell(player));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
index f3078c3e52..2726f99c08 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket
}
player.getSellList().setTitle(_msg);
- client.sendPacket(new ExPrivateStoreSetWholeMsg(player));
+ player.sendPacket(new ExPrivateStoreSetWholeMsg(player));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
index 8e7e6f9b2d..1022c9061d 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
@@ -73,7 +73,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!player.getAccessLevel().allowTransaction())
{
player.sendMessage("Transactions are disabled for your current Access Level.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -84,8 +84,8 @@ public class TradeRequest implements IClientIncomingPacket
{
if (!effect.checkCondition(BotReportTable.TRADE_ACTION_BLOCK_ID))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -104,7 +104,7 @@ public class TradeRequest implements IClientIncomingPacket
// and the following system message is sent to acting player.
if (target.getObjectId() == player.getObjectId())
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
return;
}
@@ -141,7 +141,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!target.isPlayer())
{
- client.sendPacket(SystemMessageId.INVALID_TARGET);
+ player.sendPacket(SystemMessageId.INVALID_TARGET);
return;
}
@@ -161,8 +161,8 @@ public class TradeRequest implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_IS_CURRENTLY_BEING_INVESTIGATED);
sm.addString(partner.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -189,13 +189,13 @@ public class TradeRequest implements IClientIncomingPacket
if ((player.getPrivateStoreType() != PrivateStoreType.NONE) || (partner.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;
}
if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
+ player.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
return;
}
@@ -204,7 +204,7 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
@@ -218,13 +218,13 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
if (player.calculateDistance3D(partner) > 150)
{
- client.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
+ player.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
return;
}
@@ -232,6 +232,6 @@ public class TradeRequest implements IClientIncomingPacket
partner.sendPacket(new SendTradeRequest(player.getObjectId()));
sm = new SystemMessage(SystemMessageId.YOU_HAVE_REQUESTED_A_TRADE_WITH_C1);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
index ece66b1cd9..40f802fb2c 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
@@ -116,7 +116,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (learn == null)
{
PacketLogger.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
break;
}
@@ -124,7 +124,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (skill == null)
{
PacketLogger.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
break;
}
@@ -157,7 +157,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1])
{
PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -167,7 +167,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel())
{
PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -176,7 +176,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points)
{
PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
index dd8e176010..f36b68549c 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
@@ -60,12 +60,12 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
}
else if (player.getLevel() < 85)
{
- client.sendPacket(SystemMessageId.REACH_LEVEL_85_TO_USE_THE_ABILITY);
+ player.sendPacket(SystemMessageId.REACH_LEVEL_85_TO_USE_THE_ABILITY);
return;
}
else if (player.isInOlympiadMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_OR_RESET_ABILITY_POINTS_WHILE_PARTICIPATING_IN_THE_OLYMPIAD_OR_CEREMONY_OF_CHAOS);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_OR_RESET_ABILITY_POINTS_WHILE_PARTICIPATING_IN_THE_OLYMPIAD_OR_CEREMONY_OF_CHAOS);
return;
}
else if (player.isOnEvent())
@@ -85,7 +85,7 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
}
else if (player.getSp() < Config.ABILITY_POINTS_RESET_SP)
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_FOR_THIS);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_FOR_THIS);
return;
}
player.setSp(player.getSp() - Config.ABILITY_POINTS_RESET_SP);
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
index afbd8b0b76..3ccf45b47f 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
@@ -44,6 +44,6 @@ public class RequestExCancelShape_Shifting_Item implements IClientIncomingPacket
}
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
index 055dc2dd1e..6d286b4894 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
@@ -60,7 +60,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -83,7 +83,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (!extractItem.getItem().isAppearanceable())
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -113,15 +113,15 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,20 +129,20 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -154,6 +154,6 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
}
request.setAppearanceExtractItem(extractItem);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
index f7aa0f3047..1c8eaa09c2 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
@@ -55,8 +55,8 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -65,35 +65,35 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -101,7 +101,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -112,6 +112,6 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
return;
}
- client.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
+ player.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 1de9056bda..2a6d3e9bb9 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -64,8 +64,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -74,36 +74,36 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -111,14 +111,14 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!appearanceStone.checkConditions(player, targetItem))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,56 +129,56 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
{
if (extractItem == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getOwnerId() != player.getObjectId())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!extractItem.getItem().isAppearanceable())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -189,21 +189,21 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final long cost = appearanceStone.getCost();
if (cost > player.getAdena())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (stone.getCount() < 1L)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((appearanceStone.getType() == AppearanceType.NORMAL) && (inventory.destroyItem(getClass().getSimpleName(), extractItem, 1, player, this) == null))
{
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -276,7 +276,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
player.sendInventoryUpdate(iu);
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
+ player.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
if (targetItem.isEquipped())
{
player.broadcastUserInfo();
@@ -288,8 +288,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
slots.addComponentType(slot);
}
}
- client.sendPacket(slots);
+ player.sendPacket(slots);
}
- client.sendPacket(new ExAdenaInvenCount(player));
+ player.sendPacket(new ExAdenaInvenCount(player));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
index abea70c48a..bf64e21529 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
@@ -65,8 +65,8 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket
// attempting to destroy item
if (player.getInventory().destroyItemByItemId("ChangeAttribute", _consumeItemId, 1, player, item) == null)
{
- client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
- client.sendPacket(ExChangeAttributeFail.STATIC);
+ player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
+ player.sendPacket(ExChangeAttributeFail.STATIC);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH);
return;
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
index 7f91558675..0de9d8bc72 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
@@ -52,26 +52,26 @@ public class RequestCommissionBuyInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
if (!player.isInventoryUnder80(false) || (player.getWeightPenalty() >= 3))
{
- client.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_AMOUNT_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_AMOUNT_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
return;
}
final CommissionItem commissionItem = ItemCommissionManager.getInstance().getCommissionItem(_commissionId);
if (commissionItem != null)
{
- client.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
+ player.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
}
else
{
- client.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
}
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
index aa794d2d96..16dec35e6f 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
@@ -49,7 +49,7 @@ public class RequestCommissionBuyItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
index 4f7141c09d..8a3ff5c955 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
@@ -50,7 +50,7 @@ public class RequestCommissionDelete implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
index 1a7edbbaac..01005d24c1 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
@@ -50,18 +50,18 @@ public class RequestCommissionInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
final Item itemInstance = player.getInventory().getItemByObjectId(_itemObjectId);
if (itemInstance != null)
{
- client.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
+ player.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
}
else
{
- client.sendPacket(ExResponseCommissionInfo.EMPTY);
+ player.sendPacket(ExResponseCommissionInfo.EMPTY);
}
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
index e5c25df330..c9e13e021f 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
@@ -62,7 +62,7 @@ public class RequestCommissionList implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
index 6b2f96e87d..7eb252c475 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
@@ -95,7 +95,7 @@ public class RequestCommissionRegister implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
index 1e826566da..b19aefac8d 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
@@ -45,7 +45,7 @@ public class RequestCommissionRegisteredItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
index 532c2496c2..75a5a816f0 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
@@ -46,11 +46,11 @@ public class RequestCommissionRegistrableItemList implements IClientIncomingPack
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
- client.sendPacket(new ExResponseCommissionItemList(1, player.getInventory().getAvailableItems(false, false, false)));
- client.sendPacket(new ExResponseCommissionItemList(2, player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(1, player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(2, player.getInventory().getAvailableItems(false, false, false)));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
index 670f9a29ed..398352c0f7 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = new CompoundRequest(player);
if (!player.addRequest(request))
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
@@ -77,7 +79,7 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
final Item itemOne = request.getItemOne();
if (itemOne == null)
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -87,11 +89,11 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItems.isEmpty())
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
- client.sendPacket(ExEnchantOneOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
index 315704e4e5..b8f98ff7ba 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
@@ -51,23 +51,25 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -77,14 +79,14 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -93,10 +95,10 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
- client.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
index 0dbe123787..72a0b34bfc 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemOne();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
request.setItemOne(0);
- client.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
index 5743927fa1..4a05f6c92b 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemTwo();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
request.setItemTwo(0);
- client.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
index c0eb970566..70e94532db 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
return;
}
@@ -78,7 +80,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -86,7 +88,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -96,7 +98,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -113,11 +115,11 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item item = player.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true);
if (success)
{
- client.sendPacket(new ExEnchantSucess(item.getId()));
+ player.sendPacket(new ExEnchantSucess(item.getId()));
}
else
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
index e4e46a5271..d5165c28ec 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
@@ -65,6 +65,7 @@ public class RequestCrystallizeEstimate 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);
@@ -73,28 +74,28 @@ public class RequestCrystallizeEstimate 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);
return;
}
final Item item = player.getInventory().getItemByObjectId(_objectId);
if ((item == null) || item.isShadowItem() || item.isTimeLimitedItem() || item.isHeroItem() || (!Config.ALT_ALLOW_AUGMENT_DESTROY && item.isAugmented()))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
PacketLogger.warning(player + ": tried to crystallize " + item.getItem());
return;
}
@@ -167,8 +168,8 @@ public class RequestCrystallizeEstimate 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;
}
@@ -177,11 +178,11 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket
if ((crystallizationRewards != null) && !crystallizationRewards.isEmpty())
{
player.setInCrystallize(true);
- client.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
+ player.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
}
else
{
- client.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
+ player.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
}
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java
index 6425eba48e..ce7c41304f 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java
@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.faction;
import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.faction.ExFactionInfo;
@@ -39,6 +40,12 @@ public class RequestUserFactionInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.getPlayer().sendPacket(new ExFactionInfo(client.getPlayer(), _openDialog));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ExFactionInfo(player, _openDialog));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
index 584b6e3e4e..a0b7c23c20 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
@@ -40,9 +40,11 @@ public class RequestFriendDetailInfo implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExFriendDetailInfo(player, _name));
+ return;
}
+
+ player.sendPacket(new ExFriendDetailInfo(player, _name));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
index 82fa3a651a..e9e5d90e84 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
@@ -48,6 +48,7 @@ public class RequestMenteeWaitingList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
+
+ player.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
index 7c22e266ca..20ec347a77 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
@@ -41,6 +41,7 @@ public class RequestMentorList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExMentorList(player));
+
+ player.sendPacket(new ExMentorList(player));
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
index 4023b0cff0..618f6dc7ed 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
@@ -37,9 +37,11 @@ public class RequestBRGamePoint implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExBRGamePoint(player));
+ return;
}
+
+ player.sendPacket(new ExBRGamePoint(player));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
index de0446cfd8..7ac78cfe4f 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
@@ -34,7 +34,7 @@ public class RequestBRRecentProductList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- // Player player = client.getPlayer();
+ // Player player = cplayer.getPlayer();
// TODO: Implement it.
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
index 6813c75ed2..f8d602624b 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
@@ -34,7 +34,6 @@ public class ExRestartClient implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.EX_RESTART_CLIENT.writeId(packet);
-
return true;
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
index 89678c1836..4378479707 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
- * A packet used to draw points and lines on client.
+ * A packet used to draw points and lines on cplayer.
* Note: Names in points and lines are bugged they will appear even when not looking at them.
* @author NosBit
*/
@@ -62,7 +62,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -76,7 +76,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -88,7 +88,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -100,7 +100,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
@@ -110,7 +110,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -124,7 +124,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -136,7 +136,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -148,7 +148,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
index ef3f4acc18..25ba232162 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
@@ -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;
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
index c6ea588540..acab47f316 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
@@ -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;
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
index cdfaa128cb..129d1a52d1 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
@@ -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;
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
index ba988591d0..370aeba2c5 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
@@ -51,6 +51,6 @@ public class Appearing implements IClientIncomingPacket
player.onTeleported();
}
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
index 0ea780c5b4..b47439803f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
@@ -55,7 +55,7 @@ public class BypassUserCmd implements IClientIncomingPacket
}
else
{
- handler.useUserCommand(_command, client.getPlayer());
+ handler.useUserCommand(_command, player);
}
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
index a3236b0d83..43c0172038 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
@@ -65,12 +65,12 @@ public class CannotMoveAnymore implements IClientIncomingPacket
// PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+
// " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ());
// StopMove smwl = new StopMove(player);
- // client.getPlayer().sendPacket(smwl);
- // client.getPlayer().broadcastPacket(smwl);
+ // cplayer.getPlayer().sendPacket(smwl);
+ // cplayer.getPlayer().broadcastPacket(smwl);
//
- // StopRotation sr = new StopRotation(client.getPlayer(),
+ // StopRotation sr = new StopRotation(cplayer.getPlayer(),
// _heading);
- // client.getPlayer().sendPacket(sr);
- // client.getPlayer().broadcastPacket(sr);
+ // cplayer.getPlayer().sendPacket(sr);
+ // cplayer.getPlayer().broadcastPacket(sr);
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 0503ced388..17166c416c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -326,18 +326,18 @@ 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(1, player));
- client.sendPacket(new ItemList(2, player));
+ player.sendPacket(new ItemList(1, player));
+ player.sendPacket(new ItemList(2, player));
// Send Quest Item List
- client.sendPacket(new ExQuestItemList(1, player));
- client.sendPacket(new ExQuestItemList(2, player));
+ player.sendPacket(new ExQuestItemList(1, player));
+ player.sendPacket(new ExQuestItemList(2, player));
// Send Shortcuts
- client.sendPacket(new ShortCutInit(player));
+ player.sendPacket(new ShortCutInit(player));
// Send Action list
player.sendPacket(ExBasicActionList.STATIC_PACKET);
@@ -447,7 +447,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");
@@ -488,14 +488,14 @@ public class EnterWorld implements IClientIncomingPacket
notice.replace("%clan_name%", player.getClan().getName());
notice.replace("%notice_text%", player.getClan().getNotice().replaceAll("\r\n", "
"));
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));
}
}
@@ -507,13 +507,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())
@@ -576,7 +576,7 @@ public class EnterWorld implements IClientIncomingPacket
{
if (MailManager.getInstance().hasUnreadPost(player))
{
- client.sendPacket(ExNoticePostArrived.valueOf(false));
+ player.sendPacket(ExNoticePostArrived.valueOf(false));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 4bb789645a..218e629395 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -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;
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 8078d0c10e..6ac4cc7ca0 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -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:
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
index 65c69620a0..94911328a2 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
@@ -41,6 +41,7 @@ public class RequestAlchemySkillList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExAlchemySkillList(player));
+
+ player.sendPacket(new ExAlchemySkillList(player));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
index 49bb9c2285..fb6b18d662 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
index c6f8fe2045..b6f8d4fb9e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
index 5669f5691a..beb5024780 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
index 7ee18d42b3..3e864837f8 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
index 2baf948bc7..4dc52e2648 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
index f8d8826556..0341d285b8 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
@@ -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_SERVITOR);
+ player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_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_SERVITOR);
+ player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_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())
{
- 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);
}
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
index 83ffc494d5..4b817c3e70 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index ce3d851f06..9c2d96e99c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
@@ -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,8 +253,8 @@ 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));
player.sendPacket(SystemMessageId.EXCHANGE_IS_SUCCESSFUL);
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
index d77d8eba6a..f841f306a1 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
@@ -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;
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
index 4534c39c18..b65ad7c589 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
@@ -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;
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
index f1ddb94865..5ae334f854 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
index 21710a1eb0..dd69523f80 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
@@ -96,6 +96,6 @@ public class RequestConfirmSiegeWaitingList implements IClientIncomingPacket
}
// Update the defender list
- client.sendPacket(new SiegeDefenderList(castle));
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
index dc81cb23dc..b2f53bed92 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
index e0443b72b7..c6b44e7c11 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
@@ -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;
}
@@ -223,7 +224,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
@@ -242,13 +243,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();
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
index 36d36097c1..5fd67b8759 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
@@ -42,6 +42,6 @@ public class RequestCursedWeaponList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExCursedWeaponList());
+ player.sendPacket(new ExCursedWeaponList());
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
index 573a4f7950..193c436d7e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
index ce21646986..6d59e89936 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
index 5882d1ea46..88fd8b949d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index cb90d581c8..d8f319bf1f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -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.S1_S2_HAS_BEEN_UNEQUIPPED);
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();
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
index 224a640ef5..5227396561 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
@@ -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);
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
index ed981b63f7..f5607f7fa5 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
@@ -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);
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index dfe7c73eff..bb8c71e69d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -86,7 +86,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;
}
@@ -122,9 +122,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;
}
@@ -133,27 +133,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;
}
@@ -163,9 +163,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;
}
@@ -174,9 +174,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:
@@ -195,7 +195,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)
@@ -260,8 +260,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)
@@ -295,13 +295,13 @@ public class RequestEnchantItem implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED);
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()))
@@ -322,11 +322,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)
@@ -358,7 +358,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)
@@ -401,7 +401,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))
@@ -411,11 +411,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)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
index 4652f15ddc..22d6a0efa5 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
@@ -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);
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
index 161b8d0cab..b7e61d2f18 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
@@ -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,7 +100,7 @@ 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;
}
@@ -108,13 +108,13 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket
if ((item.getItem().getId() == 48168) && (stone.getItem().getId() != 48169))
{
player.removeRequest(request.getClass());
- client.sendPacket(SystemMessageId.ATTRIBUTE_ITEM_USAGE_HAS_BEEN_CANCELLED);
+ player.sendPacket(SystemMessageId.ATTRIBUTE_ITEM_USAGE_HAS_BEEN_CANCELLED);
return;
}
if (!ElementalAttributeData.getInstance().isElementableWithStone(item, stone.getItem().getId()))
{
- 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;
}
@@ -154,7 +154,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;
}
@@ -182,7 +182,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;
}
@@ -259,7 +259,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;
@@ -280,8 +280,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);
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
index 68bb180db1..7b967d8931 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -82,8 +82,8 @@ 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));
+ // cplayer.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
index 35fe136cbd..54a540188c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
@@ -55,6 +55,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket
{
return;
}
+
player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
index 6ec3504089..79088e0c3a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
@@ -47,6 +47,6 @@ public class RequestExFriendListExtended implements IClientIncomingPacket
return;
}
- client.sendPacket(new FriendList(player));
+ player.sendPacket(new FriendList(player));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
index 2e0c2154ac..150caed567 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
@@ -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()));
}
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
index 8851aef463..00bb331778 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
@@ -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 + " !!");
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 16f28d5d04..3ee3f7a9aa 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
index 67a4813cec..fe3c0f5057 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
@@ -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);
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
index c55df32ab6..2b1000f445 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
index 0fdcc5fde4..777238a18e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
@@ -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.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_REGISTER_A_CLAN_CREST);
+ player.sendPacket(SystemMessageId.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_REGISTER_A_CLAN_CREST);
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);
}
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
index f868d0e26f..056262b4ab 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
@@ -48,6 +48,6 @@ public class RequestExShowContactList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExShowContactList(player));
+ player.sendPacket(new ExShowContactList(player));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
index 2d9f0456f4..1589ff8175 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
index 0a4522bf64..a2667da070 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
index b2f32527da..1355a122ce 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
index 73dd408134..1233ad294b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
@@ -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);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
index f1c10ee605..10070bbbeb 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
@@ -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;
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
index b70d188e2b..9624152294 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
@@ -49,7 +49,7 @@ public class RequestGiveNickName implements IClientIncomingPacket
if ((player.getNobleLevel() > 0) && _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.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_GRANT_A_TITLE);
+ player.sendPacket(SystemMessageId.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_GRANT_A_TITLE);
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);
}
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
index 822c7231bc..8f2bd877b9 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
@@ -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;
}
@@ -109,7 +109,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);
}
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
index a7c019d65d..7253226656 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
index ff96a400c9..79db1768e6 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
@@ -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;
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
index 732efa0d71..22bd337c41 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
@@ -49,7 +49,7 @@ public class RequestHennaRemove implements IClientIncomingPacket
if (!client.getFloodProtectors().canPerformTransaction())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -68,7 +68,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;
@@ -78,7 +78,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);
}
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
index 25d004a7b7..2240af9a6e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
@@ -41,6 +41,7 @@ public class RequestHennaRemoveList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new HennaRemoveList(player));
+
+ player.sendPacket(new HennaRemoveList(player));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
index 1c1fc6d8c2..bc9710d465 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
@@ -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()));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
index d46ef778d4..f9e67ea1ed 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
@@ -43,6 +43,7 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExInzoneWaiting(player, _hide));
+
+ player.sendPacket(new ExInzoneWaiting(player, _hide));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
index 6551e7d0c4..42404bdd99 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
@@ -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();
+ return;
}
+
+ if (player.isInventoryDisabled())
+ {
+ return;
+ }
+
+ player.sendItemList();
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
index 99965602f9..cb5c08f036 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
@@ -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)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
index 226f085fb0..9793d6e1d8 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
@@ -44,7 +44,7 @@ public class RequestKeyMapping implements IClientIncomingPacket
if (Config.STORE_UI_SETTINGS)
{
- client.sendPacket(new ExUISetting(player));
+ player.sendPacket(new ExUISetting(player));
}
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
index ada67e190c..2cdc066ead 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
@@ -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);
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
index bffa403c8a..96b1664122 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
@@ -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));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
index 7b4703d69c..9fcb5e9736 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index 36256ab955..cbcbb3e785 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -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_ON_A_BOAT_AIRSHIP_OR_ELEVATOR);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_POLYMORPH_WHILE_RIDING_ON_A_BOAT_AIRSHIP_OR_ELEVATOR);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
index 9372163aea..769c2af9e2 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
@@ -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
{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
index 9149ce1284..8e7c3ee9fe 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
@@ -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));
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
index e670b165cd..de3adf72c3 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
@@ -43,7 +43,7 @@ public class RequestPackageSendableItemList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PackageSendableList(1, player, _objectId));
- client.sendPacket(new PackageSendableList(2, player, _objectId));
+ player.sendPacket(new PackageSendableList(1, player, _objectId));
+ player.sendPacket(new PackageSendableList(2, player, _objectId));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
index e8d53e1a19..e4ddcee7e8 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
@@ -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;
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
index 7d7f4fd83c..2c855d9a02 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
@@ -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_SUPPORT_4GAME_COM);
+ player.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_ON_HTTPS_SUPPORT_4GAME_COM);
return;
}
@@ -91,28 +91,28 @@ public class RequestPetition implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_SUBMITTED_MAXIMUM_NUMBER_OF_PETITIONS_TODAY_YOU_CANNOT_SUBMIT_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);
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
index b7f1ab30a7..7d148f2d91 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
index 8e66271f87..ef3a529b0c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
@@ -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.YOU_HAVE_JOINED_THE_WAITING_LIST_IF_YOU_DO_NOT_JOIN_ANY_CLAN_IN_30_DAYS_YOUR_CHARACTER_WILL_BE_REMOVED_FROM_THE_LIST_IF_EXIT_WAITING_LIST_IS_USED_YOU_WILL_NOT_BE_ABLE_TO_JOIN_THE_WAITING_LIST_FOR_5_MINUTES);
+ player.sendPacket(SystemMessageId.YOU_HAVE_JOINED_THE_WAITING_LIST_IF_YOU_DO_NOT_JOIN_ANY_CLAN_IN_30_DAYS_YOUR_CHARACTER_WILL_BE_REMOVED_FROM_THE_LIST_IF_EXIT_WAITING_LIST_IS_USED_YOU_WILL_NOT_BE_ABLE_TO_JOIN_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;
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
index e3ec88ca13..34af0251ca 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
@@ -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())));
}
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
index 76d591b14c..a4f9ba1784 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
index 3459b04c80..4c077a4c9e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
@@ -64,6 +64,7 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PledgeReceiveMemberInfo(member));
+
+ player.sendPacket(new PledgeReceiveMemberInfo(member));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
index e380ce68c8..464ad76c9f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
@@ -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)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
index 8fabbb1f4a..beee5121dd 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
@@ -52,6 +52,6 @@ public class RequestPledgeRecruitBoardDetail implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
+ player.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
index 1d0458db08..0d0d86f7db 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
index fe019fe6d6..dde18f32a4 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
@@ -44,6 +44,6 @@ public class RequestPledgeWaitingList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeWaitingList(_clanId));
+ player.sendPacket(new ExPledgeWaitingList(_clanId));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
index add0aa2f01..618c787a17 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
@@ -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));
}
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
index 4468b67642..500800df57 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
@@ -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);
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
index 086f76c512..2a75d35297 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
@@ -51,11 +51,11 @@ 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(1, player));
- client.sendPacket(new ExReplyPostItemList(2, player));
+ player.sendPacket(new ExReplyPostItemList(1, player));
+ player.sendPacket(new ExReplyPostItemList(2, player));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
index 44bbd9d34c..a038920c8b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
@@ -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;
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
index 94958bc4fe..2ded12e55d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
@@ -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());
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
index 2d616f2e94..bb2f0e8e6f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
index 8ab3d4962f..243e4a3674 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
@@ -87,7 +87,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
if (_items == null)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -128,13 +128,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;
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
index bee0568e03..365e1f598f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
@@ -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;
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
index b64136dc79..21ba9b39af 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
index 8badb24c5f..6ffcc69313 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
@@ -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();
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
index 461f09492a..06d51160dd 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
index a08127f456..3c38b12a5f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
@@ -45,7 +45,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;
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
index ae18cc60a5..374363bf78 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
@@ -51,6 +51,6 @@ public class RequestRecipeItemMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeItemMakeInfo(_id, player, recipe.getMaxOffering()));
+ player.sendPacket(new RecipeItemMakeInfo(_id, player, recipe.getMaxOffering()));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
index 7b322a8cc8..4db297a810 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
@@ -102,15 +102,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;
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
index 52cce423a0..f79f0f2335 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
@@ -70,6 +70,6 @@ public class RequestRecipeShopMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeShopItemInfo(manufacturer, _recipeId, manufactureRecipeCost, recipe.getMaxOffering()));
+ player.sendPacket(new RecipeShopItemInfo(manufacturer, _recipeId, manufactureRecipeCost, recipe.getMaxOffering()));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
index f1a1490ee0..06e9b74fa4 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
@@ -78,7 +78,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)
@@ -91,6 +91,6 @@ public class RequestRecipeShopManageList implements IClientIncomingPacket
}
}
- client.sendPacket(new RecipeShopManageList(player, true));
+ player.sendPacket(new RecipeShopManageList(player, true));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
index e175401b7a..9cff73412c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
@@ -44,13 +44,13 @@ public class RequestRecipeShopManagePrev implements IClientIncomingPacket
if (player.isAlikeDead() || (player.getTarget() == null) || !player.getTarget().isPlayer())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (player.calculateDistance2D(player.getTarget()) > 250)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index 1bb51eff9d..87a0574a9f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -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))
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
index 4da834c30d..3d01f1e525 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
@@ -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);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
index 1632df189f..9c0c240bd4 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
index b3e709c5db..1a7c1ebc0f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
@@ -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)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index 662058f4d8..dfda7319fc 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
@@ -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;
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
index 7b82b33d56..af5f6876b7 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
index e5c53c86d0..1cf200da52 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
@@ -58,7 +58,7 @@ public class RequestSentPost 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;
}
@@ -73,6 +73,6 @@ public class RequestSentPost implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExReplySentPost(msg));
+ player.sendPacket(new ExReplySentPost(msg));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
index 99aec4ba86..05a414f453 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
@@ -47,6 +47,7 @@ public class RequestSentPostList implements IClientIncomingPacket
// player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
// return;
// }
- client.sendPacket(new ExShowSentPostList(player.getObjectId()));
+
+ player.sendPacket(new ExShowSentPostList(player.getObjectId()));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
index 72578e8d22..197ab07190 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
@@ -78,18 +78,23 @@ public class RequestSetCrop implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
index fe5ea44de4..a3e3ded0a3 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
@@ -77,18 +77,23 @@ public class RequestSetSeed implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index a175a9d052..a6ad0c3e9a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -72,7 +72,7 @@ public class RequestShortCutReg implements IClientIncomingPacket
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
sc.setAutoUse(_active);
player.registerShortCut(sc);
- client.sendPacket(new ShortCutRegister(sc));
+ player.sendPacket(new ShortCutRegister(sc));
player.sendPacket(new ExActivateAutoShortcut(sc, _active));
// When id is not auto used, deactivate auto shortcuts.
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
index 1053bb74c1..fc2725daa7 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
@@ -44,6 +44,6 @@ public class RequestShowBeautyList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExResponseBeautyList(player, _type));
+ player.sendPacket(new ExResponseBeautyList(player, _type));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
index 9c73551f59..541b987e91 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
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;
/**
@@ -40,6 +41,12 @@ public class RequestShowBoard implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, client.getPlayer());
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, player);
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
index 162de17679..f74c3abf4d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
@@ -41,6 +41,7 @@ public class RequestShowMiniMap implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ShowMiniMap(0));
+
+ player.sendPacket(new ShowMiniMap(0));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
index 097e8f5d30..f055ad8a57 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeAttackerList;
@@ -40,9 +41,17 @@ public class RequestSiegeAttackerList implements IClientIncomingPacket
public void run(GameClient client)
{
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
- if (castle != null)
+ if (castle == null)
{
- client.sendPacket(new SiegeAttackerList(castle));
+ return;
}
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeAttackerList(castle));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
index 6df5163c58..a8d4c9f6d0 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList;
@@ -44,6 +45,13 @@ public class RequestSiegeDefenderList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new SiegeDefenderList(castle));
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
index 8ae03da07b..51c42f7b7c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
@@ -34,10 +34,12 @@ public class RequestSkillList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- final Player cha = client.getPlayer();
- if (cha != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- cha.sendSkillList();
+ return;
}
+
+ player.sendSkillList();
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
index 03a4d521e2..51d71c3154 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
@@ -60,52 +60,52 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
if ((clanDeclaringWar.getLevel() < 5) || (clanDeclaringWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_5_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_5_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaringWar.getWarCount() >= 30)
{
- client.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final Clan clanDeclaredWar = ClanTable.getInstance().getClanByName(_pledgeName);
if (clanDeclaredWar == null)
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar == clanDeclaringWar)
{
- client.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaringWar.getAllyId() == clanDeclaredWar.getAllyId()) && (clanDeclaringWar.getAllyId() != 0))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaredWar.getLevel() < 5) || (clanDeclaredWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_5_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_5_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis())
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -116,15 +116,15 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_T_DECLARE_A_WAR_BECAUSE_THE_21_DAY_PERIOD_HASN_T_PASSED_AFTER_A_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ALREADY_BEEN_AT_WAR_WITH_THE_S1_CLAN_5_DAYS_MUST_PASS_BEFORE_YOU_CAN_DECLARE_WAR_AGAIN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
index 47c39e2e70..e8c4b1a0e1 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
@@ -60,7 +60,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if ((member != null) && member.isOnline() && member.getPlayer().isInCombat())
{
player.sendPacket(SystemMessageId.A_CEASE_FIRE_DURING_A_CLAN_WAR_CAN_NOT_BE_CALLED_WHILE_MEMBERS_OF_YOUR_CLAN_ARE_ENGAGED_IN_BATTLE);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -69,13 +69,13 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if (targetClan == null)
{
player.sendMessage("No such clan.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -85,14 +85,14 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_NOT_DECLARED_A_CLAN_WAR_AGAINST_THE_CLAN_S1);
sm.addString(targetClan.getName());
player.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{
player.sendPacket(SystemMessageId.YOU_CANNOT_DECLARE_DEFEAT_AS_IT_HAS_NOT_BEEN_7_DAYS_SINCE_STARTING_A_CLAN_WAR_WITH_CLAN_S1);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
index db5981de3d..32d110951d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
@@ -65,7 +65,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
// The English system message say weapon, but it's applied to any equipped item.
if (player.isAttackingNow() || player.isCastingNow())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
return;
}
@@ -89,13 +89,13 @@ public class RequestUnEquipItem implements IClientIncomingPacket
if (!player.getInventory().canManipulateWithItemId(item.getId()))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
if (item.isWeapon() && item.getWeaponItem().isForceEquip() && !player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
@@ -117,7 +117,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
}
sm.addItemName(unequippedItem);
- client.sendPacket(sm);
+ player.sendPacket(sm);
final InventoryUpdate iu = new InventoryUpdate();
iu.addItems(unequipped);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
index 0b38bcb67c..9e95fb93e1 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
@@ -51,28 +51,28 @@ public class RequestVoteNew implements IClientIncomingPacket
{
if (object == null)
{
- client.sendPacket(SystemMessageId.SELECT_TARGET);
+ player.sendPacket(SystemMessageId.SELECT_TARGET);
}
else if (object.isFakePlayer() && FakePlayerData.getInstance().isTalkable(object.getName()))
{
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addString(FakePlayerData.getInstance().getProperName(object.getName()));
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
player.setRecomLeft(player.getRecomLeft() - 1);
- client.sendPacket(new UserInfo(player));
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new UserInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
}
else
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
}
return;
}
@@ -85,19 +85,19 @@ public class RequestVoteNew implements IClientIncomingPacket
if (target == player)
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
return;
}
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
if (target.getRecomHave() >= 255)
{
- client.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
+ player.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
return;
}
@@ -106,16 +106,16 @@ public class RequestVoteNew implements IClientIncomingPacket
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addPcName(target);
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_BEEN_RECOMMENDED_BY_C1);
sm.addPcName(player);
target.sendPacket(sm);
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
target.broadcastUserInfo();
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
target.sendPacket(new ExVoteSystemInfo(target));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
index 05261ba813..0e3300d03c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
@@ -67,12 +67,12 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
}
else if ((player.getWeightPenalty() >= 3) || !player.isInventoryUnder90(false))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
return;
}
else if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
return;
}
@@ -101,11 +101,11 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
if (player.getPremiumItemList().isEmpty())
{
- client.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
+ player.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
}
else
{
- client.sendPacket(new ExGetPremiumItemList(player));
+ player.sendPacket(new ExGetPremiumItemList(player));
}
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
index c3f29fe9c9..d23918130b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
@@ -48,17 +48,17 @@ public class RequestWithdrawalPledge 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.isClanLeader())
{
- client.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
+ player.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
return;
}
if (player.isInCombat())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
return;
}
@@ -72,7 +72,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
// Remove the Player From the Member list
clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(player.getName()));
clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
- client.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
- client.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
+ player.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
+ player.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
index 84b879e0f7..13ecd08a96 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
@@ -150,14 +150,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
// Item Max Limit Check
if (!warehouse.validateCapacity(slots))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
+ player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
return;
}
// Check if enough adena and charge the fee
if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, manager, false))
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
return;
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
index a5462164d1..76e8ac2a68 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket
}
player.getBuyList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgBuy(player));
+ player.sendPacket(new PrivateStoreMsgBuy(player));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
index ac64c43c5c..d86bfc8f84 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket
}
player.getSellList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgSell(player));
+ player.sendPacket(new PrivateStoreMsgSell(player));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
index f3078c3e52..2726f99c08 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket
}
player.getSellList().setTitle(_msg);
- client.sendPacket(new ExPrivateStoreSetWholeMsg(player));
+ player.sendPacket(new ExPrivateStoreSetWholeMsg(player));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
index d44782af71..5e6691e8be 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
@@ -73,7 +73,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!player.getAccessLevel().allowTransaction())
{
player.sendMessage("Transactions are disabled for your current Access Level.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -84,8 +84,8 @@ public class TradeRequest implements IClientIncomingPacket
{
if (!effect.checkCondition(BotReportTable.TRADE_ACTION_BLOCK_ID))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -104,7 +104,7 @@ public class TradeRequest implements IClientIncomingPacket
// and the following system message is sent to acting player.
if (target.getObjectId() == player.getObjectId())
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
return;
}
@@ -141,7 +141,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!target.isPlayer())
{
- client.sendPacket(SystemMessageId.INVALID_TARGET);
+ player.sendPacket(SystemMessageId.INVALID_TARGET);
return;
}
@@ -161,8 +161,8 @@ public class TradeRequest implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_IS_CURRENTLY_BEING_INVESTIGATED);
sm.addString(partner.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -189,13 +189,13 @@ public class TradeRequest implements IClientIncomingPacket
if ((player.getPrivateStoreType() != PrivateStoreType.NONE) || (partner.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;
}
if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
+ player.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
return;
}
@@ -204,7 +204,7 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
@@ -218,13 +218,13 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.S1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
if (player.calculateDistance3D(partner) > 150)
{
- client.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
+ player.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
return;
}
@@ -232,6 +232,6 @@ public class TradeRequest implements IClientIncomingPacket
partner.sendPacket(new SendTradeRequest(player.getObjectId()));
sm = new SystemMessage(SystemMessageId.YOU_HAVE_REQUESTED_A_TRADE_WITH_C1);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
index ece66b1cd9..40f802fb2c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
@@ -116,7 +116,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (learn == null)
{
PacketLogger.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
break;
}
@@ -124,7 +124,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (skill == null)
{
PacketLogger.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
break;
}
@@ -157,7 +157,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1])
{
PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -167,7 +167,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel())
{
PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -176,7 +176,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points)
{
PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
index dd8e176010..f36b68549c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
@@ -60,12 +60,12 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
}
else if (player.getLevel() < 85)
{
- client.sendPacket(SystemMessageId.REACH_LEVEL_85_TO_USE_THE_ABILITY);
+ player.sendPacket(SystemMessageId.REACH_LEVEL_85_TO_USE_THE_ABILITY);
return;
}
else if (player.isInOlympiadMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_OR_RESET_ABILITY_POINTS_WHILE_PARTICIPATING_IN_THE_OLYMPIAD_OR_CEREMONY_OF_CHAOS);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_OR_RESET_ABILITY_POINTS_WHILE_PARTICIPATING_IN_THE_OLYMPIAD_OR_CEREMONY_OF_CHAOS);
return;
}
else if (player.isOnEvent())
@@ -85,7 +85,7 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
}
else if (player.getSp() < Config.ABILITY_POINTS_RESET_SP)
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_FOR_THIS);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_FOR_THIS);
return;
}
player.setSp(player.getSp() - Config.ABILITY_POINTS_RESET_SP);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
index afbd8b0b76..3ccf45b47f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
@@ -44,6 +44,6 @@ public class RequestExCancelShape_Shifting_Item implements IClientIncomingPacket
}
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
index 055dc2dd1e..6d286b4894 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
@@ -60,7 +60,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -83,7 +83,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (!extractItem.getItem().isAppearanceable())
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -113,15 +113,15 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,20 +129,20 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -154,6 +154,6 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
}
request.setAppearanceExtractItem(extractItem);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
index f7aa0f3047..1c8eaa09c2 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
@@ -55,8 +55,8 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -65,35 +65,35 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -101,7 +101,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -112,6 +112,6 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
return;
}
- client.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
+ player.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 1de9056bda..2a6d3e9bb9 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -64,8 +64,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -74,36 +74,36 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -111,14 +111,14 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!appearanceStone.checkConditions(player, targetItem))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,56 +129,56 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
{
if (extractItem == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getOwnerId() != player.getObjectId())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!extractItem.getItem().isAppearanceable())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -189,21 +189,21 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final long cost = appearanceStone.getCost();
if (cost > player.getAdena())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (stone.getCount() < 1L)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((appearanceStone.getType() == AppearanceType.NORMAL) && (inventory.destroyItem(getClass().getSimpleName(), extractItem, 1, player, this) == null))
{
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -276,7 +276,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
player.sendInventoryUpdate(iu);
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
+ player.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
if (targetItem.isEquipped())
{
player.broadcastUserInfo();
@@ -288,8 +288,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
slots.addComponentType(slot);
}
}
- client.sendPacket(slots);
+ player.sendPacket(slots);
}
- client.sendPacket(new ExAdenaInvenCount(player));
+ player.sendPacket(new ExAdenaInvenCount(player));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
index abea70c48a..bf64e21529 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
@@ -65,8 +65,8 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket
// attempting to destroy item
if (player.getInventory().destroyItemByItemId("ChangeAttribute", _consumeItemId, 1, player, item) == null)
{
- client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
- client.sendPacket(ExChangeAttributeFail.STATIC);
+ player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
+ player.sendPacket(ExChangeAttributeFail.STATIC);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH);
return;
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
index 7f91558675..0de9d8bc72 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
@@ -52,26 +52,26 @@ public class RequestCommissionBuyInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
if (!player.isInventoryUnder80(false) || (player.getWeightPenalty() >= 3))
{
- client.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_AMOUNT_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_AMOUNT_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
return;
}
final CommissionItem commissionItem = ItemCommissionManager.getInstance().getCommissionItem(_commissionId);
if (commissionItem != null)
{
- client.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
+ player.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
}
else
{
- client.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
}
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
index aa794d2d96..16dec35e6f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
@@ -49,7 +49,7 @@ public class RequestCommissionBuyItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
index 4f7141c09d..8a3ff5c955 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
@@ -50,7 +50,7 @@ public class RequestCommissionDelete implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
index 1a7edbbaac..01005d24c1 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
@@ -50,18 +50,18 @@ public class RequestCommissionInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
final Item itemInstance = player.getInventory().getItemByObjectId(_itemObjectId);
if (itemInstance != null)
{
- client.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
+ player.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
}
else
{
- client.sendPacket(ExResponseCommissionInfo.EMPTY);
+ player.sendPacket(ExResponseCommissionInfo.EMPTY);
}
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
index e5c25df330..c9e13e021f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
@@ -62,7 +62,7 @@ public class RequestCommissionList implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
index 6b2f96e87d..7eb252c475 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
@@ -95,7 +95,7 @@ public class RequestCommissionRegister implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
index 1e826566da..b19aefac8d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
@@ -45,7 +45,7 @@ public class RequestCommissionRegisteredItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
index 532c2496c2..75a5a816f0 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
@@ -46,11 +46,11 @@ public class RequestCommissionRegistrableItemList implements IClientIncomingPack
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
- client.sendPacket(new ExResponseCommissionItemList(1, player.getInventory().getAvailableItems(false, false, false)));
- client.sendPacket(new ExResponseCommissionItemList(2, player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(1, player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(2, player.getInventory().getAvailableItems(false, false, false)));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
index 670f9a29ed..398352c0f7 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = new CompoundRequest(player);
if (!player.addRequest(request))
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
@@ -77,7 +79,7 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
final Item itemOne = request.getItemOne();
if (itemOne == null)
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -87,11 +89,11 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItems.isEmpty())
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
- client.sendPacket(ExEnchantOneOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
index 315704e4e5..b8f98ff7ba 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
@@ -51,23 +51,25 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -77,14 +79,14 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -93,10 +95,10 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
- client.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
index 0dbe123787..72a0b34bfc 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemOne();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
request.setItemOne(0);
- client.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
index 5743927fa1..4a05f6c92b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemTwo();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
request.setItemTwo(0);
- client.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
index c0eb970566..70e94532db 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
return;
}
@@ -78,7 +80,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -86,7 +88,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -96,7 +98,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -113,11 +115,11 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item item = player.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true);
if (success)
{
- client.sendPacket(new ExEnchantSucess(item.getId()));
+ player.sendPacket(new ExEnchantSucess(item.getId()));
}
else
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
index 9d5edbda7a..31298a1992 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
@@ -65,6 +65,7 @@ public class RequestCrystallizeEstimate 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);
@@ -73,28 +74,28 @@ public class RequestCrystallizeEstimate 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);
return;
}
final Item item = player.getInventory().getItemByObjectId(_objectId);
if ((item == null) || item.isShadowItem() || item.isTimeLimitedItem() || item.isHeroItem() || (!Config.ALT_ALLOW_AUGMENT_DESTROY && item.isAugmented()))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
PacketLogger.warning(player + ": tried to crystallize " + item.getItem());
return;
}
@@ -167,8 +168,8 @@ public class RequestCrystallizeEstimate 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;
}
@@ -177,13 +178,13 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket
if ((crystallizationRewards != null) && !crystallizationRewards.isEmpty())
{
player.setInCrystallize(true);
- client.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
+ player.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
}
else
{
player.sendMessage("Crystallization cannot be proceeded because there are no items registered.");
// CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED changed to ANGEL_NEVIT_S_DESCENT_BONUS_TIME_S1
- // client.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
+ // player.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
}
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java
index 6425eba48e..ce7c41304f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java
@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.faction;
import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.faction.ExFactionInfo;
@@ -39,6 +40,12 @@ public class RequestUserFactionInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.getPlayer().sendPacket(new ExFactionInfo(client.getPlayer(), _openDialog));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ExFactionInfo(player, _openDialog));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
index 584b6e3e4e..a0b7c23c20 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
@@ -40,9 +40,11 @@ public class RequestFriendDetailInfo implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExFriendDetailInfo(player, _name));
+ return;
}
+
+ player.sendPacket(new ExFriendDetailInfo(player, _name));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
index 82fa3a651a..e9e5d90e84 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
@@ -48,6 +48,7 @@ public class RequestMenteeWaitingList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
+
+ player.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
index 7c22e266ca..20ec347a77 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
@@ -41,6 +41,7 @@ public class RequestMentorList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExMentorList(player));
+
+ player.sendPacket(new ExMentorList(player));
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
index 4023b0cff0..618f6dc7ed 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
@@ -37,9 +37,11 @@ public class RequestBRGamePoint implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExBRGamePoint(player));
+ return;
}
+
+ player.sendPacket(new ExBRGamePoint(player));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
index de0446cfd8..7ac78cfe4f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
@@ -34,7 +34,7 @@ public class RequestBRRecentProductList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- // Player player = client.getPlayer();
+ // Player player = cplayer.getPlayer();
// TODO: Implement it.
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
index 6813c75ed2..f8d602624b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
@@ -34,7 +34,6 @@ public class ExRestartClient implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.EX_RESTART_CLIENT.writeId(packet);
-
return true;
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
index 89678c1836..4378479707 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
- * A packet used to draw points and lines on client.
+ * A packet used to draw points and lines on cplayer.
* Note: Names in points and lines are bugged they will appear even when not looking at them.
* @author NosBit
*/
@@ -62,7 +62,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -76,7 +76,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -88,7 +88,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -100,7 +100,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
@@ -110,7 +110,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -124,7 +124,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -136,7 +136,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -148,7 +148,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
index ef3f4acc18..25ba232162 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
@@ -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;
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
index c6ea588540..acab47f316 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
@@ -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;
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
index cdfaa128cb..129d1a52d1 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
@@ -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;
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
index ba988591d0..370aeba2c5 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
@@ -51,6 +51,6 @@ public class Appearing implements IClientIncomingPacket
player.onTeleported();
}
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
index 0ea780c5b4..b47439803f 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
@@ -55,7 +55,7 @@ public class BypassUserCmd implements IClientIncomingPacket
}
else
{
- handler.useUserCommand(_command, client.getPlayer());
+ handler.useUserCommand(_command, player);
}
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
index a3236b0d83..43c0172038 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
@@ -65,12 +65,12 @@ public class CannotMoveAnymore implements IClientIncomingPacket
// PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+
// " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ());
// StopMove smwl = new StopMove(player);
- // client.getPlayer().sendPacket(smwl);
- // client.getPlayer().broadcastPacket(smwl);
+ // cplayer.getPlayer().sendPacket(smwl);
+ // cplayer.getPlayer().broadcastPacket(smwl);
//
- // StopRotation sr = new StopRotation(client.getPlayer(),
+ // StopRotation sr = new StopRotation(cplayer.getPlayer(),
// _heading);
- // client.getPlayer().sendPacket(sr);
- // client.getPlayer().broadcastPacket(sr);
+ // cplayer.getPlayer().sendPacket(sr);
+ // cplayer.getPlayer().broadcastPacket(sr);
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index fa829a9c4b..a79c7987d2 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -336,18 +336,18 @@ 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(1, player));
- client.sendPacket(new ItemList(2, player));
+ player.sendPacket(new ItemList(1, player));
+ player.sendPacket(new ItemList(2, player));
// Send Quest Item List
- client.sendPacket(new ExQuestItemList(1, player));
- client.sendPacket(new ExQuestItemList(2, player));
+ player.sendPacket(new ExQuestItemList(1, player));
+ player.sendPacket(new ExQuestItemList(2, player));
// Send Shortcuts
- client.sendPacket(new ShortCutInit(player));
+ player.sendPacket(new ShortCutInit(player));
// Send Action list
player.sendPacket(ExBasicActionList.STATIC_PACKET);
@@ -457,7 +457,7 @@ public class EnterWorld implements IClientIncomingPacket
player.sendPacket(new ExUserInfoEquipSlot(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");
@@ -498,14 +498,14 @@ public class EnterWorld implements IClientIncomingPacket
notice.replace("%clan_name%", player.getClan().getName());
notice.replace("%notice_text%", player.getClan().getNotice().replaceAll("\r\n", "
"));
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));
}
}
@@ -517,13 +517,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())
@@ -586,7 +586,7 @@ public class EnterWorld implements IClientIncomingPacket
{
if (MailManager.getInstance().hasUnreadPost(player))
{
- client.sendPacket(ExNoticePostArrived.valueOf(false));
+ player.sendPacket(ExNoticePostArrived.valueOf(false));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 4bb789645a..218e629395 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -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;
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 8078d0c10e..6ac4cc7ca0 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -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:
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
index 65c69620a0..94911328a2 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
@@ -41,6 +41,7 @@ public class RequestAlchemySkillList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExAlchemySkillList(player));
+
+ player.sendPacket(new ExAlchemySkillList(player));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
index 49bb9c2285..fb6b18d662 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
index c6f8fe2045..b6f8d4fb9e 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
index 5669f5691a..beb5024780 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
index 7ee18d42b3..3e864837f8 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
index 2baf948bc7..4dc52e2648 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
index f8d8826556..0341d285b8 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
@@ -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_SERVITOR);
+ player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_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_SERVITOR);
+ player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_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())
{
- 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);
}
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
index 83ffc494d5..4b817c3e70 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index ce3d851f06..9c2d96e99c 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
@@ -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,8 +253,8 @@ 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));
player.sendPacket(SystemMessageId.EXCHANGE_IS_SUCCESSFUL);
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
index d77d8eba6a..f841f306a1 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
@@ -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;
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
index 4534c39c18..b65ad7c589 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
@@ -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;
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
index f1ddb94865..5ae334f854 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
index 21710a1eb0..dd69523f80 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
@@ -96,6 +96,6 @@ public class RequestConfirmSiegeWaitingList implements IClientIncomingPacket
}
// Update the defender list
- client.sendPacket(new SiegeDefenderList(castle));
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
index dc81cb23dc..b2f53bed92 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
index e0443b72b7..c6b44e7c11 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
@@ -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;
}
@@ -223,7 +224,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
@@ -242,13 +243,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();
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
index 36d36097c1..5fd67b8759 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
@@ -42,6 +42,6 @@ public class RequestCursedWeaponList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExCursedWeaponList());
+ player.sendPacket(new ExCursedWeaponList());
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
index 573a4f7950..193c436d7e 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
index ce21646986..6d59e89936 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
index 5882d1ea46..88fd8b949d 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index cb90d581c8..d8f319bf1f 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -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.S1_S2_HAS_BEEN_UNEQUIPPED);
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();
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
index 224a640ef5..5227396561 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
@@ -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);
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
index ed981b63f7..f5607f7fa5 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
@@ -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);
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index bff5cf585f..325ff253dd 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -86,7 +86,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;
}
@@ -122,9 +122,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;
}
@@ -133,27 +133,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;
}
@@ -163,9 +163,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;
}
@@ -174,9 +174,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:
@@ -195,7 +195,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)
@@ -260,8 +260,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)
@@ -295,13 +295,13 @@ public class RequestEnchantItem implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED);
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()))
@@ -322,11 +322,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)
@@ -358,7 +358,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)
@@ -401,7 +401,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))
@@ -411,11 +411,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)
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
index 4652f15ddc..22d6a0efa5 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
@@ -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);
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
index 161b8d0cab..b7e61d2f18 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
@@ -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,7 +100,7 @@ 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;
}
@@ -108,13 +108,13 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket
if ((item.getItem().getId() == 48168) && (stone.getItem().getId() != 48169))
{
player.removeRequest(request.getClass());
- client.sendPacket(SystemMessageId.ATTRIBUTE_ITEM_USAGE_HAS_BEEN_CANCELLED);
+ player.sendPacket(SystemMessageId.ATTRIBUTE_ITEM_USAGE_HAS_BEEN_CANCELLED);
return;
}
if (!ElementalAttributeData.getInstance().isElementableWithStone(item, stone.getItem().getId()))
{
- 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;
}
@@ -154,7 +154,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;
}
@@ -182,7 +182,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;
}
@@ -259,7 +259,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;
@@ -280,8 +280,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);
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
index 68bb180db1..7b967d8931 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -82,8 +82,8 @@ 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));
+ // cplayer.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
index 35fe136cbd..54a540188c 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
@@ -55,6 +55,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket
{
return;
}
+
player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
index 6ec3504089..79088e0c3a 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
@@ -47,6 +47,6 @@ public class RequestExFriendListExtended implements IClientIncomingPacket
return;
}
- client.sendPacket(new FriendList(player));
+ player.sendPacket(new FriendList(player));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
index 2e0c2154ac..150caed567 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
@@ -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()));
}
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
index 8851aef463..00bb331778 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
@@ -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 + " !!");
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 16f28d5d04..3ee3f7a9aa 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
index 67a4813cec..fe3c0f5057 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
@@ -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);
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
index c55df32ab6..2b1000f445 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
index 0fdcc5fde4..777238a18e 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
@@ -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.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_REGISTER_A_CLAN_CREST);
+ player.sendPacket(SystemMessageId.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_REGISTER_A_CLAN_CREST);
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);
}
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
index f868d0e26f..056262b4ab 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
@@ -48,6 +48,6 @@ public class RequestExShowContactList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExShowContactList(player));
+ player.sendPacket(new ExShowContactList(player));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
index 2d9f0456f4..1589ff8175 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
index 0a4522bf64..a2667da070 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
index b2f32527da..1355a122ce 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
index 73dd408134..1233ad294b 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
@@ -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);
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
index f1c10ee605..10070bbbeb 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
@@ -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;
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
index b70d188e2b..9624152294 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
@@ -49,7 +49,7 @@ public class RequestGiveNickName implements IClientIncomingPacket
if ((player.getNobleLevel() > 0) && _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.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_GRANT_A_TITLE);
+ player.sendPacket(SystemMessageId.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_GRANT_A_TITLE);
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);
}
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
index 822c7231bc..8f2bd877b9 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
@@ -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;
}
@@ -109,7 +109,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);
}
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
index a7c019d65d..7253226656 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
index ff96a400c9..79db1768e6 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
@@ -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;
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
index 732efa0d71..22bd337c41 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
@@ -49,7 +49,7 @@ public class RequestHennaRemove implements IClientIncomingPacket
if (!client.getFloodProtectors().canPerformTransaction())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -68,7 +68,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;
@@ -78,7 +78,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);
}
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
index 25d004a7b7..2240af9a6e 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
@@ -41,6 +41,7 @@ public class RequestHennaRemoveList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new HennaRemoveList(player));
+
+ player.sendPacket(new HennaRemoveList(player));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
index 1c1fc6d8c2..bc9710d465 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
@@ -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()));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
index d46ef778d4..f9e67ea1ed 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
@@ -43,6 +43,7 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExInzoneWaiting(player, _hide));
+
+ player.sendPacket(new ExInzoneWaiting(player, _hide));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
index 6551e7d0c4..42404bdd99 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
@@ -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();
+ return;
}
+
+ if (player.isInventoryDisabled())
+ {
+ return;
+ }
+
+ player.sendItemList();
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
index 99965602f9..cb5c08f036 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
@@ -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)
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
index 226f085fb0..9793d6e1d8 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
@@ -44,7 +44,7 @@ public class RequestKeyMapping implements IClientIncomingPacket
if (Config.STORE_UI_SETTINGS)
{
- client.sendPacket(new ExUISetting(player));
+ player.sendPacket(new ExUISetting(player));
}
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
index ada67e190c..2cdc066ead 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
@@ -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);
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
index bffa403c8a..96b1664122 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
@@ -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));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
index 7b4703d69c..9fcb5e9736 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index 36256ab955..cbcbb3e785 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -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_ON_A_BOAT_AIRSHIP_OR_ELEVATOR);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_POLYMORPH_WHILE_RIDING_ON_A_BOAT_AIRSHIP_OR_ELEVATOR);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
index 9372163aea..769c2af9e2 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
@@ -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
{
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
index 9149ce1284..8e7c3ee9fe 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
@@ -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));
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
index e670b165cd..de3adf72c3 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
@@ -43,7 +43,7 @@ public class RequestPackageSendableItemList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PackageSendableList(1, player, _objectId));
- client.sendPacket(new PackageSendableList(2, player, _objectId));
+ player.sendPacket(new PackageSendableList(1, player, _objectId));
+ player.sendPacket(new PackageSendableList(2, player, _objectId));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
index e8d53e1a19..e4ddcee7e8 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
@@ -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;
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
index 7d7f4fd83c..2c855d9a02 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
@@ -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_SUPPORT_4GAME_COM);
+ player.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_ON_HTTPS_SUPPORT_4GAME_COM);
return;
}
@@ -91,28 +91,28 @@ public class RequestPetition implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_SUBMITTED_MAXIMUM_NUMBER_OF_PETITIONS_TODAY_YOU_CANNOT_SUBMIT_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);
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
index b7f1ab30a7..7d148f2d91 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
index 8e66271f87..ef3a529b0c 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
@@ -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.YOU_HAVE_JOINED_THE_WAITING_LIST_IF_YOU_DO_NOT_JOIN_ANY_CLAN_IN_30_DAYS_YOUR_CHARACTER_WILL_BE_REMOVED_FROM_THE_LIST_IF_EXIT_WAITING_LIST_IS_USED_YOU_WILL_NOT_BE_ABLE_TO_JOIN_THE_WAITING_LIST_FOR_5_MINUTES);
+ player.sendPacket(SystemMessageId.YOU_HAVE_JOINED_THE_WAITING_LIST_IF_YOU_DO_NOT_JOIN_ANY_CLAN_IN_30_DAYS_YOUR_CHARACTER_WILL_BE_REMOVED_FROM_THE_LIST_IF_EXIT_WAITING_LIST_IS_USED_YOU_WILL_NOT_BE_ABLE_TO_JOIN_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;
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
index e3ec88ca13..34af0251ca 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
@@ -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())));
}
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
index 76d591b14c..a4f9ba1784 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
index 3459b04c80..4c077a4c9e 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
@@ -64,6 +64,7 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PledgeReceiveMemberInfo(member));
+
+ player.sendPacket(new PledgeReceiveMemberInfo(member));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
index e380ce68c8..464ad76c9f 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
@@ -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)
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
index 8fabbb1f4a..beee5121dd 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
@@ -52,6 +52,6 @@ public class RequestPledgeRecruitBoardDetail implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
+ player.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
index 1d0458db08..0d0d86f7db 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
index fe019fe6d6..dde18f32a4 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
@@ -44,6 +44,6 @@ public class RequestPledgeWaitingList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeWaitingList(_clanId));
+ player.sendPacket(new ExPledgeWaitingList(_clanId));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
index add0aa2f01..618c787a17 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
@@ -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));
}
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
index 4468b67642..500800df57 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
@@ -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);
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
index 086f76c512..2a75d35297 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
@@ -51,11 +51,11 @@ 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(1, player));
- client.sendPacket(new ExReplyPostItemList(2, player));
+ player.sendPacket(new ExReplyPostItemList(1, player));
+ player.sendPacket(new ExReplyPostItemList(2, player));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
index 44bbd9d34c..a038920c8b 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
@@ -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;
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
index 94958bc4fe..2ded12e55d 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
@@ -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());
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
index 2d616f2e94..bb2f0e8e6f 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
index 8ab3d4962f..243e4a3674 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
@@ -87,7 +87,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
if (_items == null)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -128,13 +128,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;
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
index bee0568e03..365e1f598f 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
@@ -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;
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
index b64136dc79..21ba9b39af 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
index 8badb24c5f..6ffcc69313 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
@@ -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();
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
index 461f09492a..06d51160dd 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
index a08127f456..3c38b12a5f 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
@@ -45,7 +45,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;
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
index ae18cc60a5..374363bf78 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
@@ -51,6 +51,6 @@ public class RequestRecipeItemMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeItemMakeInfo(_id, player, recipe.getMaxOffering()));
+ player.sendPacket(new RecipeItemMakeInfo(_id, player, recipe.getMaxOffering()));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
index 7b322a8cc8..4db297a810 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
@@ -102,15 +102,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;
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
index 52cce423a0..f79f0f2335 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
@@ -70,6 +70,6 @@ public class RequestRecipeShopMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeShopItemInfo(manufacturer, _recipeId, manufactureRecipeCost, recipe.getMaxOffering()));
+ player.sendPacket(new RecipeShopItemInfo(manufacturer, _recipeId, manufactureRecipeCost, recipe.getMaxOffering()));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
index f1a1490ee0..06e9b74fa4 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
@@ -78,7 +78,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)
@@ -91,6 +91,6 @@ public class RequestRecipeShopManageList implements IClientIncomingPacket
}
}
- client.sendPacket(new RecipeShopManageList(player, true));
+ player.sendPacket(new RecipeShopManageList(player, true));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
index e175401b7a..9cff73412c 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
@@ -44,13 +44,13 @@ public class RequestRecipeShopManagePrev implements IClientIncomingPacket
if (player.isAlikeDead() || (player.getTarget() == null) || !player.getTarget().isPlayer())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (player.calculateDistance2D(player.getTarget()) > 250)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index 1bb51eff9d..87a0574a9f 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -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))
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
index 4da834c30d..3d01f1e525 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
@@ -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);
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
index 1632df189f..9c0c240bd4 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
index b3e709c5db..1a7c1ebc0f 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
@@ -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)
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index 662058f4d8..dfda7319fc 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
@@ -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;
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
index 7b82b33d56..af5f6876b7 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
index e5c53c86d0..1cf200da52 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
@@ -58,7 +58,7 @@ public class RequestSentPost 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;
}
@@ -73,6 +73,6 @@ public class RequestSentPost implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExReplySentPost(msg));
+ player.sendPacket(new ExReplySentPost(msg));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
index 99aec4ba86..05a414f453 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
@@ -47,6 +47,7 @@ public class RequestSentPostList implements IClientIncomingPacket
// player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
// return;
// }
- client.sendPacket(new ExShowSentPostList(player.getObjectId()));
+
+ player.sendPacket(new ExShowSentPostList(player.getObjectId()));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
index 72578e8d22..197ab07190 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
@@ -78,18 +78,23 @@ public class RequestSetCrop implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
index fe5ea44de4..a3e3ded0a3 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
@@ -77,18 +77,23 @@ public class RequestSetSeed implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index a175a9d052..a6ad0c3e9a 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -72,7 +72,7 @@ public class RequestShortCutReg implements IClientIncomingPacket
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
sc.setAutoUse(_active);
player.registerShortCut(sc);
- client.sendPacket(new ShortCutRegister(sc));
+ player.sendPacket(new ShortCutRegister(sc));
player.sendPacket(new ExActivateAutoShortcut(sc, _active));
// When id is not auto used, deactivate auto shortcuts.
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
index 1053bb74c1..fc2725daa7 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
@@ -44,6 +44,6 @@ public class RequestShowBeautyList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExResponseBeautyList(player, _type));
+ player.sendPacket(new ExResponseBeautyList(player, _type));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
index 9c73551f59..541b987e91 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
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;
/**
@@ -40,6 +41,12 @@ public class RequestShowBoard implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, client.getPlayer());
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, player);
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
index 162de17679..f74c3abf4d 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
@@ -41,6 +41,7 @@ public class RequestShowMiniMap implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ShowMiniMap(0));
+
+ player.sendPacket(new ShowMiniMap(0));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
index 097e8f5d30..f055ad8a57 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeAttackerList;
@@ -40,9 +41,17 @@ public class RequestSiegeAttackerList implements IClientIncomingPacket
public void run(GameClient client)
{
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
- if (castle != null)
+ if (castle == null)
{
- client.sendPacket(new SiegeAttackerList(castle));
+ return;
}
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeAttackerList(castle));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
index 6df5163c58..a8d4c9f6d0 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList;
@@ -44,6 +45,13 @@ public class RequestSiegeDefenderList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new SiegeDefenderList(castle));
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
index 8ae03da07b..51c42f7b7c 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
@@ -34,10 +34,12 @@ public class RequestSkillList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- final Player cha = client.getPlayer();
- if (cha != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- cha.sendSkillList();
+ return;
}
+
+ player.sendSkillList();
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
index 03a4d521e2..51d71c3154 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
@@ -60,52 +60,52 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
if ((clanDeclaringWar.getLevel() < 5) || (clanDeclaringWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_5_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_5_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaringWar.getWarCount() >= 30)
{
- client.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final Clan clanDeclaredWar = ClanTable.getInstance().getClanByName(_pledgeName);
if (clanDeclaredWar == null)
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar == clanDeclaringWar)
{
- client.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaringWar.getAllyId() == clanDeclaredWar.getAllyId()) && (clanDeclaringWar.getAllyId() != 0))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaredWar.getLevel() < 5) || (clanDeclaredWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_5_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_5_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis())
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -116,15 +116,15 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_T_DECLARE_A_WAR_BECAUSE_THE_21_DAY_PERIOD_HASN_T_PASSED_AFTER_A_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ALREADY_BEEN_AT_WAR_WITH_THE_S1_CLAN_5_DAYS_MUST_PASS_BEFORE_YOU_CAN_DECLARE_WAR_AGAIN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
index 47c39e2e70..e8c4b1a0e1 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
@@ -60,7 +60,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if ((member != null) && member.isOnline() && member.getPlayer().isInCombat())
{
player.sendPacket(SystemMessageId.A_CEASE_FIRE_DURING_A_CLAN_WAR_CAN_NOT_BE_CALLED_WHILE_MEMBERS_OF_YOUR_CLAN_ARE_ENGAGED_IN_BATTLE);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -69,13 +69,13 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if (targetClan == null)
{
player.sendMessage("No such clan.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -85,14 +85,14 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_NOT_DECLARED_A_CLAN_WAR_AGAINST_THE_CLAN_S1);
sm.addString(targetClan.getName());
player.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{
player.sendPacket(SystemMessageId.YOU_CANNOT_DECLARE_DEFEAT_AS_IT_HAS_NOT_BEEN_7_DAYS_SINCE_STARTING_A_CLAN_WAR_WITH_CLAN_S1);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
index db5981de3d..32d110951d 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
@@ -65,7 +65,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
// The English system message say weapon, but it's applied to any equipped item.
if (player.isAttackingNow() || player.isCastingNow())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
return;
}
@@ -89,13 +89,13 @@ public class RequestUnEquipItem implements IClientIncomingPacket
if (!player.getInventory().canManipulateWithItemId(item.getId()))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
if (item.isWeapon() && item.getWeaponItem().isForceEquip() && !player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
@@ -117,7 +117,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
}
sm.addItemName(unequippedItem);
- client.sendPacket(sm);
+ player.sendPacket(sm);
final InventoryUpdate iu = new InventoryUpdate();
iu.addItems(unequipped);
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
index 0b38bcb67c..9e95fb93e1 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
@@ -51,28 +51,28 @@ public class RequestVoteNew implements IClientIncomingPacket
{
if (object == null)
{
- client.sendPacket(SystemMessageId.SELECT_TARGET);
+ player.sendPacket(SystemMessageId.SELECT_TARGET);
}
else if (object.isFakePlayer() && FakePlayerData.getInstance().isTalkable(object.getName()))
{
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addString(FakePlayerData.getInstance().getProperName(object.getName()));
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
player.setRecomLeft(player.getRecomLeft() - 1);
- client.sendPacket(new UserInfo(player));
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new UserInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
}
else
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
}
return;
}
@@ -85,19 +85,19 @@ public class RequestVoteNew implements IClientIncomingPacket
if (target == player)
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
return;
}
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
if (target.getRecomHave() >= 255)
{
- client.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
+ player.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
return;
}
@@ -106,16 +106,16 @@ public class RequestVoteNew implements IClientIncomingPacket
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addPcName(target);
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_BEEN_RECOMMENDED_BY_C1);
sm.addPcName(player);
target.sendPacket(sm);
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
target.broadcastUserInfo();
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
target.sendPacket(new ExVoteSystemInfo(target));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
index 05261ba813..0e3300d03c 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
@@ -67,12 +67,12 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
}
else if ((player.getWeightPenalty() >= 3) || !player.isInventoryUnder90(false))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
return;
}
else if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
return;
}
@@ -101,11 +101,11 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
if (player.getPremiumItemList().isEmpty())
{
- client.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
+ player.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
}
else
{
- client.sendPacket(new ExGetPremiumItemList(player));
+ player.sendPacket(new ExGetPremiumItemList(player));
}
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
index c3f29fe9c9..d23918130b 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
@@ -48,17 +48,17 @@ public class RequestWithdrawalPledge 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.isClanLeader())
{
- client.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
+ player.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
return;
}
if (player.isInCombat())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
return;
}
@@ -72,7 +72,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
// Remove the Player From the Member list
clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(player.getName()));
clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
- client.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
- client.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
+ player.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
+ player.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
index 84b879e0f7..13ecd08a96 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
@@ -150,14 +150,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
// Item Max Limit Check
if (!warehouse.validateCapacity(slots))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
+ player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
return;
}
// Check if enough adena and charge the fee
if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, manager, false))
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
return;
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
index a5462164d1..76e8ac2a68 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket
}
player.getBuyList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgBuy(player));
+ player.sendPacket(new PrivateStoreMsgBuy(player));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
index ac64c43c5c..d86bfc8f84 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket
}
player.getSellList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgSell(player));
+ player.sendPacket(new PrivateStoreMsgSell(player));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
index f3078c3e52..2726f99c08 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket
}
player.getSellList().setTitle(_msg);
- client.sendPacket(new ExPrivateStoreSetWholeMsg(player));
+ player.sendPacket(new ExPrivateStoreSetWholeMsg(player));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
index d44782af71..5e6691e8be 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
@@ -73,7 +73,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!player.getAccessLevel().allowTransaction())
{
player.sendMessage("Transactions are disabled for your current Access Level.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -84,8 +84,8 @@ public class TradeRequest implements IClientIncomingPacket
{
if (!effect.checkCondition(BotReportTable.TRADE_ACTION_BLOCK_ID))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -104,7 +104,7 @@ public class TradeRequest implements IClientIncomingPacket
// and the following system message is sent to acting player.
if (target.getObjectId() == player.getObjectId())
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
return;
}
@@ -141,7 +141,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!target.isPlayer())
{
- client.sendPacket(SystemMessageId.INVALID_TARGET);
+ player.sendPacket(SystemMessageId.INVALID_TARGET);
return;
}
@@ -161,8 +161,8 @@ public class TradeRequest implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_IS_CURRENTLY_BEING_INVESTIGATED);
sm.addString(partner.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -189,13 +189,13 @@ public class TradeRequest implements IClientIncomingPacket
if ((player.getPrivateStoreType() != PrivateStoreType.NONE) || (partner.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;
}
if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
+ player.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
return;
}
@@ -204,7 +204,7 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
@@ -218,13 +218,13 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.S1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
if (player.calculateDistance3D(partner) > 150)
{
- client.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
+ player.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
return;
}
@@ -232,6 +232,6 @@ public class TradeRequest implements IClientIncomingPacket
partner.sendPacket(new SendTradeRequest(player.getObjectId()));
sm = new SystemMessage(SystemMessageId.YOU_HAVE_REQUESTED_A_TRADE_WITH_C1);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
index ece66b1cd9..40f802fb2c 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
@@ -116,7 +116,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (learn == null)
{
PacketLogger.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
break;
}
@@ -124,7 +124,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (skill == null)
{
PacketLogger.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
break;
}
@@ -157,7 +157,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1])
{
PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -167,7 +167,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel())
{
PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -176,7 +176,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points)
{
PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
index dd8e176010..f36b68549c 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
@@ -60,12 +60,12 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
}
else if (player.getLevel() < 85)
{
- client.sendPacket(SystemMessageId.REACH_LEVEL_85_TO_USE_THE_ABILITY);
+ player.sendPacket(SystemMessageId.REACH_LEVEL_85_TO_USE_THE_ABILITY);
return;
}
else if (player.isInOlympiadMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_OR_RESET_ABILITY_POINTS_WHILE_PARTICIPATING_IN_THE_OLYMPIAD_OR_CEREMONY_OF_CHAOS);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_OR_RESET_ABILITY_POINTS_WHILE_PARTICIPATING_IN_THE_OLYMPIAD_OR_CEREMONY_OF_CHAOS);
return;
}
else if (player.isOnEvent())
@@ -85,7 +85,7 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
}
else if (player.getSp() < Config.ABILITY_POINTS_RESET_SP)
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_FOR_THIS);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_FOR_THIS);
return;
}
player.setSp(player.getSp() - Config.ABILITY_POINTS_RESET_SP);
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
index afbd8b0b76..3ccf45b47f 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
@@ -44,6 +44,6 @@ public class RequestExCancelShape_Shifting_Item implements IClientIncomingPacket
}
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
index 055dc2dd1e..6d286b4894 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
@@ -60,7 +60,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -83,7 +83,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (!extractItem.getItem().isAppearanceable())
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -113,15 +113,15 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,20 +129,20 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -154,6 +154,6 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
}
request.setAppearanceExtractItem(extractItem);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
index f7aa0f3047..1c8eaa09c2 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
@@ -55,8 +55,8 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -65,35 +65,35 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -101,7 +101,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -112,6 +112,6 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
return;
}
- client.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
+ player.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 1de9056bda..2a6d3e9bb9 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -64,8 +64,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -74,36 +74,36 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -111,14 +111,14 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!appearanceStone.checkConditions(player, targetItem))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,56 +129,56 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
{
if (extractItem == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getOwnerId() != player.getObjectId())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!extractItem.getItem().isAppearanceable())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -189,21 +189,21 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final long cost = appearanceStone.getCost();
if (cost > player.getAdena())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (stone.getCount() < 1L)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((appearanceStone.getType() == AppearanceType.NORMAL) && (inventory.destroyItem(getClass().getSimpleName(), extractItem, 1, player, this) == null))
{
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -276,7 +276,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
player.sendInventoryUpdate(iu);
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
+ player.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
if (targetItem.isEquipped())
{
player.broadcastUserInfo();
@@ -288,8 +288,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
slots.addComponentType(slot);
}
}
- client.sendPacket(slots);
+ player.sendPacket(slots);
}
- client.sendPacket(new ExAdenaInvenCount(player));
+ player.sendPacket(new ExAdenaInvenCount(player));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
index abea70c48a..bf64e21529 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
@@ -65,8 +65,8 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket
// attempting to destroy item
if (player.getInventory().destroyItemByItemId("ChangeAttribute", _consumeItemId, 1, player, item) == null)
{
- client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
- client.sendPacket(ExChangeAttributeFail.STATIC);
+ player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
+ player.sendPacket(ExChangeAttributeFail.STATIC);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH);
return;
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
index 7f91558675..0de9d8bc72 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
@@ -52,26 +52,26 @@ public class RequestCommissionBuyInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
if (!player.isInventoryUnder80(false) || (player.getWeightPenalty() >= 3))
{
- client.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_AMOUNT_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_AMOUNT_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
return;
}
final CommissionItem commissionItem = ItemCommissionManager.getInstance().getCommissionItem(_commissionId);
if (commissionItem != null)
{
- client.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
+ player.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
}
else
{
- client.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
}
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
index aa794d2d96..16dec35e6f 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
@@ -49,7 +49,7 @@ public class RequestCommissionBuyItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
index 4f7141c09d..8a3ff5c955 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
@@ -50,7 +50,7 @@ public class RequestCommissionDelete implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
index 1a7edbbaac..01005d24c1 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
@@ -50,18 +50,18 @@ public class RequestCommissionInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
final Item itemInstance = player.getInventory().getItemByObjectId(_itemObjectId);
if (itemInstance != null)
{
- client.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
+ player.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
}
else
{
- client.sendPacket(ExResponseCommissionInfo.EMPTY);
+ player.sendPacket(ExResponseCommissionInfo.EMPTY);
}
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
index e5c25df330..c9e13e021f 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
@@ -62,7 +62,7 @@ public class RequestCommissionList implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
index 6b2f96e87d..7eb252c475 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
@@ -95,7 +95,7 @@ public class RequestCommissionRegister implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
index 1e826566da..b19aefac8d 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
@@ -45,7 +45,7 @@ public class RequestCommissionRegisteredItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
index 532c2496c2..75a5a816f0 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
@@ -46,11 +46,11 @@ public class RequestCommissionRegistrableItemList implements IClientIncomingPack
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
- client.sendPacket(new ExResponseCommissionItemList(1, player.getInventory().getAvailableItems(false, false, false)));
- client.sendPacket(new ExResponseCommissionItemList(2, player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(1, player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(2, player.getInventory().getAvailableItems(false, false, false)));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
index 670f9a29ed..398352c0f7 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = new CompoundRequest(player);
if (!player.addRequest(request))
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
@@ -77,7 +79,7 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
final Item itemOne = request.getItemOne();
if (itemOne == null)
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -87,11 +89,11 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItems.isEmpty())
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
- client.sendPacket(ExEnchantOneOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
index 3b6cd21f20..9ee2839dc3 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
@@ -51,23 +51,25 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -77,14 +79,14 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -93,10 +95,10 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
- client.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
index 0dbe123787..72a0b34bfc 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemOne();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
request.setItemOne(0);
- client.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
index 5743927fa1..4a05f6c92b 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemTwo();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
request.setItemTwo(0);
- client.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
index 8bb6a1605c..6d024a6343 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
return;
}
@@ -78,7 +80,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -86,7 +88,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -96,7 +98,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -113,11 +115,11 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item item = player.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true);
if (success)
{
- client.sendPacket(new ExEnchantSucess(item.getId()));
+ player.sendPacket(new ExEnchantSucess(item.getId()));
}
else
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
index 9d5edbda7a..31298a1992 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
@@ -65,6 +65,7 @@ public class RequestCrystallizeEstimate 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);
@@ -73,28 +74,28 @@ public class RequestCrystallizeEstimate 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);
return;
}
final Item item = player.getInventory().getItemByObjectId(_objectId);
if ((item == null) || item.isShadowItem() || item.isTimeLimitedItem() || item.isHeroItem() || (!Config.ALT_ALLOW_AUGMENT_DESTROY && item.isAugmented()))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
PacketLogger.warning(player + ": tried to crystallize " + item.getItem());
return;
}
@@ -167,8 +168,8 @@ public class RequestCrystallizeEstimate 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;
}
@@ -177,13 +178,13 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket
if ((crystallizationRewards != null) && !crystallizationRewards.isEmpty())
{
player.setInCrystallize(true);
- client.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
+ player.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
}
else
{
player.sendMessage("Crystallization cannot be proceeded because there are no items registered.");
// CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED changed to ANGEL_NEVIT_S_DESCENT_BONUS_TIME_S1
- // client.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
+ // player.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
}
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java
index 6425eba48e..ce7c41304f 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java
@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.faction;
import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.faction.ExFactionInfo;
@@ -39,6 +40,12 @@ public class RequestUserFactionInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.getPlayer().sendPacket(new ExFactionInfo(client.getPlayer(), _openDialog));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ExFactionInfo(player, _openDialog));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
index 584b6e3e4e..a0b7c23c20 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
@@ -40,9 +40,11 @@ public class RequestFriendDetailInfo implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExFriendDetailInfo(player, _name));
+ return;
}
+
+ player.sendPacket(new ExFriendDetailInfo(player, _name));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
index 82fa3a651a..e9e5d90e84 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
@@ -48,6 +48,7 @@ public class RequestMenteeWaitingList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
+
+ player.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
index 7c22e266ca..20ec347a77 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
@@ -41,6 +41,7 @@ public class RequestMentorList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExMentorList(player));
+
+ player.sendPacket(new ExMentorList(player));
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
index 4023b0cff0..618f6dc7ed 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
@@ -37,9 +37,11 @@ public class RequestBRGamePoint implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExBRGamePoint(player));
+ return;
}
+
+ player.sendPacket(new ExBRGamePoint(player));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
index de0446cfd8..7ac78cfe4f 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
@@ -34,7 +34,7 @@ public class RequestBRRecentProductList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- // Player player = client.getPlayer();
+ // Player player = cplayer.getPlayer();
// TODO: Implement it.
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
index 6813c75ed2..f8d602624b 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
@@ -34,7 +34,6 @@ public class ExRestartClient implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.EX_RESTART_CLIENT.writeId(packet);
-
return true;
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
index 89678c1836..4378479707 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
- * A packet used to draw points and lines on client.
+ * A packet used to draw points and lines on cplayer.
* Note: Names in points and lines are bugged they will appear even when not looking at them.
* @author NosBit
*/
@@ -62,7 +62,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -76,7 +76,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -88,7 +88,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -100,7 +100,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
@@ -110,7 +110,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -124,7 +124,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -136,7 +136,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -148,7 +148,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
index ef3f4acc18..25ba232162 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
@@ -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;
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
index c6ea588540..acab47f316 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
@@ -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;
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
index cdfaa128cb..129d1a52d1 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
@@ -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;
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
index ba988591d0..370aeba2c5 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
@@ -51,6 +51,6 @@ public class Appearing implements IClientIncomingPacket
player.onTeleported();
}
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
index 0ea780c5b4..b47439803f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
@@ -55,7 +55,7 @@ public class BypassUserCmd implements IClientIncomingPacket
}
else
{
- handler.useUserCommand(_command, client.getPlayer());
+ handler.useUserCommand(_command, player);
}
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
index a3236b0d83..43c0172038 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
@@ -65,12 +65,12 @@ public class CannotMoveAnymore implements IClientIncomingPacket
// PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+
// " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ());
// StopMove smwl = new StopMove(player);
- // client.getPlayer().sendPacket(smwl);
- // client.getPlayer().broadcastPacket(smwl);
+ // cplayer.getPlayer().sendPacket(smwl);
+ // cplayer.getPlayer().broadcastPacket(smwl);
//
- // StopRotation sr = new StopRotation(client.getPlayer(),
+ // StopRotation sr = new StopRotation(cplayer.getPlayer(),
// _heading);
- // client.getPlayer().sendPacket(sr);
- // client.getPlayer().broadcastPacket(sr);
+ // cplayer.getPlayer().sendPacket(sr);
+ // cplayer.getPlayer().broadcastPacket(sr);
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 82c24b3907..151472d735 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -338,18 +338,18 @@ 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(1, player));
- client.sendPacket(new ItemList(2, player));
+ player.sendPacket(new ItemList(1, player));
+ player.sendPacket(new ItemList(2, player));
// Send Quest Item List
- client.sendPacket(new ExQuestItemList(1, player));
- client.sendPacket(new ExQuestItemList(2, player));
+ player.sendPacket(new ExQuestItemList(1, player));
+ player.sendPacket(new ExQuestItemList(2, player));
// Send Shortcuts
- client.sendPacket(new ShortCutInit(player));
+ player.sendPacket(new ShortCutInit(player));
// Send Action list
player.sendPacket(ExBasicActionList.STATIC_PACKET);
@@ -462,7 +462,7 @@ public class EnterWorld implements IClientIncomingPacket
player.sendPacket(new ExUserInfoEquipSlot(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");
@@ -503,14 +503,14 @@ public class EnterWorld implements IClientIncomingPacket
notice.replace("%clan_name%", player.getClan().getName());
notice.replace("%notice_text%", player.getClan().getNotice().replaceAll("\r\n", "
"));
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));
}
}
@@ -522,13 +522,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())
@@ -591,7 +591,7 @@ public class EnterWorld implements IClientIncomingPacket
{
if (MailManager.getInstance().hasUnreadPost(player))
{
- client.sendPacket(ExNoticePostArrived.valueOf(false));
+ player.sendPacket(ExNoticePostArrived.valueOf(false));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 4bb789645a..218e629395 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -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;
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 8078d0c10e..6ac4cc7ca0 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -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:
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
index 65c69620a0..94911328a2 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
@@ -41,6 +41,7 @@ public class RequestAlchemySkillList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExAlchemySkillList(player));
+
+ player.sendPacket(new ExAlchemySkillList(player));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
index 49bb9c2285..fb6b18d662 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
index c6f8fe2045..b6f8d4fb9e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
index 5669f5691a..beb5024780 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
index 7ee18d42b3..3e864837f8 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
index 2baf948bc7..4dc52e2648 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
index f8d8826556..0341d285b8 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
@@ -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_SERVITOR);
+ player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_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_SERVITOR);
+ player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_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())
{
- 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);
}
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
index 83ffc494d5..4b817c3e70 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index ce3d851f06..9c2d96e99c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
@@ -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,8 +253,8 @@ 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));
player.sendPacket(SystemMessageId.EXCHANGE_IS_SUCCESSFUL);
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
index d77d8eba6a..f841f306a1 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
@@ -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;
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
index 4534c39c18..b65ad7c589 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
@@ -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;
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
index f1ddb94865..5ae334f854 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
index 21710a1eb0..dd69523f80 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
@@ -96,6 +96,6 @@ public class RequestConfirmSiegeWaitingList implements IClientIncomingPacket
}
// Update the defender list
- client.sendPacket(new SiegeDefenderList(castle));
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
index dc81cb23dc..b2f53bed92 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
index e0443b72b7..c6b44e7c11 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
@@ -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;
}
@@ -223,7 +224,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
@@ -242,13 +243,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();
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
index 36d36097c1..5fd67b8759 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
@@ -42,6 +42,6 @@ public class RequestCursedWeaponList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExCursedWeaponList());
+ player.sendPacket(new ExCursedWeaponList());
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
index 573a4f7950..193c436d7e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
index ce21646986..6d59e89936 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
index 5882d1ea46..88fd8b949d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index cb90d581c8..d8f319bf1f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -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.S1_S2_HAS_BEEN_UNEQUIPPED);
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();
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
index 224a640ef5..5227396561 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
@@ -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);
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
index ed981b63f7..f5607f7fa5 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
@@ -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);
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index bff5cf585f..325ff253dd 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -86,7 +86,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;
}
@@ -122,9 +122,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;
}
@@ -133,27 +133,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;
}
@@ -163,9 +163,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;
}
@@ -174,9 +174,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:
@@ -195,7 +195,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)
@@ -260,8 +260,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)
@@ -295,13 +295,13 @@ public class RequestEnchantItem implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED);
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()))
@@ -322,11 +322,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)
@@ -358,7 +358,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)
@@ -401,7 +401,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))
@@ -411,11 +411,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)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
index 4652f15ddc..22d6a0efa5 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
@@ -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);
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
index 161b8d0cab..b7e61d2f18 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
@@ -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,7 +100,7 @@ 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;
}
@@ -108,13 +108,13 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket
if ((item.getItem().getId() == 48168) && (stone.getItem().getId() != 48169))
{
player.removeRequest(request.getClass());
- client.sendPacket(SystemMessageId.ATTRIBUTE_ITEM_USAGE_HAS_BEEN_CANCELLED);
+ player.sendPacket(SystemMessageId.ATTRIBUTE_ITEM_USAGE_HAS_BEEN_CANCELLED);
return;
}
if (!ElementalAttributeData.getInstance().isElementableWithStone(item, stone.getItem().getId()))
{
- 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;
}
@@ -154,7 +154,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;
}
@@ -182,7 +182,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;
}
@@ -259,7 +259,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;
@@ -280,8 +280,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);
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
index 68bb180db1..7b967d8931 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -82,8 +82,8 @@ 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));
+ // cplayer.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
index 35fe136cbd..54a540188c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
@@ -55,6 +55,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket
{
return;
}
+
player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
index 6ec3504089..79088e0c3a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
@@ -47,6 +47,6 @@ public class RequestExFriendListExtended implements IClientIncomingPacket
return;
}
- client.sendPacket(new FriendList(player));
+ player.sendPacket(new FriendList(player));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
index 2e0c2154ac..150caed567 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
@@ -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()));
}
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
index 8851aef463..00bb331778 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
@@ -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 + " !!");
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 16f28d5d04..3ee3f7a9aa 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
index 67a4813cec..fe3c0f5057 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
@@ -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);
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
index c55df32ab6..2b1000f445 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
index 0fdcc5fde4..777238a18e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
@@ -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.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_REGISTER_A_CLAN_CREST);
+ player.sendPacket(SystemMessageId.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_REGISTER_A_CLAN_CREST);
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);
}
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
index f868d0e26f..056262b4ab 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
@@ -48,6 +48,6 @@ public class RequestExShowContactList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExShowContactList(player));
+ player.sendPacket(new ExShowContactList(player));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
index 2d9f0456f4..1589ff8175 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
index 0a4522bf64..a2667da070 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
index b2f32527da..1355a122ce 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
index 73dd408134..1233ad294b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
@@ -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);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
index f1c10ee605..10070bbbeb 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
@@ -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;
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
index b70d188e2b..9624152294 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
@@ -49,7 +49,7 @@ public class RequestGiveNickName implements IClientIncomingPacket
if ((player.getNobleLevel() > 0) && _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.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_GRANT_A_TITLE);
+ player.sendPacket(SystemMessageId.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_GRANT_A_TITLE);
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);
}
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
index 822c7231bc..8f2bd877b9 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
@@ -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;
}
@@ -109,7 +109,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);
}
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
index a7c019d65d..7253226656 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
index ff96a400c9..79db1768e6 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
@@ -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;
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
index 732efa0d71..22bd337c41 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
@@ -49,7 +49,7 @@ public class RequestHennaRemove implements IClientIncomingPacket
if (!client.getFloodProtectors().canPerformTransaction())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -68,7 +68,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;
@@ -78,7 +78,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);
}
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
index 25d004a7b7..2240af9a6e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
@@ -41,6 +41,7 @@ public class RequestHennaRemoveList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new HennaRemoveList(player));
+
+ player.sendPacket(new HennaRemoveList(player));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
index 1c1fc6d8c2..bc9710d465 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
@@ -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()));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
index d46ef778d4..f9e67ea1ed 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
@@ -43,6 +43,7 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExInzoneWaiting(player, _hide));
+
+ player.sendPacket(new ExInzoneWaiting(player, _hide));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
index 6551e7d0c4..42404bdd99 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
@@ -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();
+ return;
}
+
+ if (player.isInventoryDisabled())
+ {
+ return;
+ }
+
+ player.sendItemList();
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
index 99965602f9..cb5c08f036 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
@@ -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)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
index 226f085fb0..9793d6e1d8 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
@@ -44,7 +44,7 @@ public class RequestKeyMapping implements IClientIncomingPacket
if (Config.STORE_UI_SETTINGS)
{
- client.sendPacket(new ExUISetting(player));
+ player.sendPacket(new ExUISetting(player));
}
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
index ada67e190c..2cdc066ead 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
@@ -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);
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
index bffa403c8a..96b1664122 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
@@ -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));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
index 7b4703d69c..9fcb5e9736 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index 36256ab955..cbcbb3e785 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -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_ON_A_BOAT_AIRSHIP_OR_ELEVATOR);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_POLYMORPH_WHILE_RIDING_ON_A_BOAT_AIRSHIP_OR_ELEVATOR);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
index 9372163aea..769c2af9e2 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
@@ -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
{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
index 9149ce1284..8e7c3ee9fe 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
@@ -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));
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
index e670b165cd..de3adf72c3 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
@@ -43,7 +43,7 @@ public class RequestPackageSendableItemList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PackageSendableList(1, player, _objectId));
- client.sendPacket(new PackageSendableList(2, player, _objectId));
+ player.sendPacket(new PackageSendableList(1, player, _objectId));
+ player.sendPacket(new PackageSendableList(2, player, _objectId));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
index e8d53e1a19..e4ddcee7e8 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
@@ -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;
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
index 7d7f4fd83c..2c855d9a02 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
@@ -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_SUPPORT_4GAME_COM);
+ player.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_ON_HTTPS_SUPPORT_4GAME_COM);
return;
}
@@ -91,28 +91,28 @@ public class RequestPetition implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_SUBMITTED_MAXIMUM_NUMBER_OF_PETITIONS_TODAY_YOU_CANNOT_SUBMIT_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);
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
index b7f1ab30a7..7d148f2d91 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
index 8e66271f87..ef3a529b0c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
@@ -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.YOU_HAVE_JOINED_THE_WAITING_LIST_IF_YOU_DO_NOT_JOIN_ANY_CLAN_IN_30_DAYS_YOUR_CHARACTER_WILL_BE_REMOVED_FROM_THE_LIST_IF_EXIT_WAITING_LIST_IS_USED_YOU_WILL_NOT_BE_ABLE_TO_JOIN_THE_WAITING_LIST_FOR_5_MINUTES);
+ player.sendPacket(SystemMessageId.YOU_HAVE_JOINED_THE_WAITING_LIST_IF_YOU_DO_NOT_JOIN_ANY_CLAN_IN_30_DAYS_YOUR_CHARACTER_WILL_BE_REMOVED_FROM_THE_LIST_IF_EXIT_WAITING_LIST_IS_USED_YOU_WILL_NOT_BE_ABLE_TO_JOIN_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;
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
index e3ec88ca13..34af0251ca 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
@@ -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())));
}
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
index 76d591b14c..a4f9ba1784 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
index 3459b04c80..4c077a4c9e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
@@ -64,6 +64,7 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PledgeReceiveMemberInfo(member));
+
+ player.sendPacket(new PledgeReceiveMemberInfo(member));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
index e380ce68c8..464ad76c9f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
@@ -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)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
index 8fabbb1f4a..beee5121dd 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
@@ -52,6 +52,6 @@ public class RequestPledgeRecruitBoardDetail implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
+ player.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
index 1d0458db08..0d0d86f7db 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
index fe019fe6d6..dde18f32a4 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
@@ -44,6 +44,6 @@ public class RequestPledgeWaitingList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeWaitingList(_clanId));
+ player.sendPacket(new ExPledgeWaitingList(_clanId));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
index add0aa2f01..618c787a17 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
@@ -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));
}
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
index 4468b67642..500800df57 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
@@ -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);
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
index 086f76c512..2a75d35297 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
@@ -51,11 +51,11 @@ 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(1, player));
- client.sendPacket(new ExReplyPostItemList(2, player));
+ player.sendPacket(new ExReplyPostItemList(1, player));
+ player.sendPacket(new ExReplyPostItemList(2, player));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
index 44bbd9d34c..a038920c8b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
@@ -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;
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
index 94958bc4fe..2ded12e55d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
@@ -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());
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
index 2d616f2e94..bb2f0e8e6f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
index 8ab3d4962f..243e4a3674 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
@@ -87,7 +87,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
if (_items == null)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -128,13 +128,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;
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
index bee0568e03..365e1f598f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
@@ -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;
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
index b64136dc79..21ba9b39af 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
index 8badb24c5f..6ffcc69313 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
@@ -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();
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
index 461f09492a..06d51160dd 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
index a08127f456..3c38b12a5f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
@@ -45,7 +45,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;
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
index ae18cc60a5..374363bf78 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
@@ -51,6 +51,6 @@ public class RequestRecipeItemMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeItemMakeInfo(_id, player, recipe.getMaxOffering()));
+ player.sendPacket(new RecipeItemMakeInfo(_id, player, recipe.getMaxOffering()));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
index 7b322a8cc8..4db297a810 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
@@ -102,15 +102,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;
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
index 52cce423a0..f79f0f2335 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
@@ -70,6 +70,6 @@ public class RequestRecipeShopMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeShopItemInfo(manufacturer, _recipeId, manufactureRecipeCost, recipe.getMaxOffering()));
+ player.sendPacket(new RecipeShopItemInfo(manufacturer, _recipeId, manufactureRecipeCost, recipe.getMaxOffering()));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
index f1a1490ee0..06e9b74fa4 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
@@ -78,7 +78,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)
@@ -91,6 +91,6 @@ public class RequestRecipeShopManageList implements IClientIncomingPacket
}
}
- client.sendPacket(new RecipeShopManageList(player, true));
+ player.sendPacket(new RecipeShopManageList(player, true));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
index e175401b7a..9cff73412c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
@@ -44,13 +44,13 @@ public class RequestRecipeShopManagePrev implements IClientIncomingPacket
if (player.isAlikeDead() || (player.getTarget() == null) || !player.getTarget().isPlayer())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (player.calculateDistance2D(player.getTarget()) > 250)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index 1bb51eff9d..87a0574a9f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -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))
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
index 4da834c30d..3d01f1e525 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
@@ -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);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
index 1632df189f..9c0c240bd4 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
index b3e709c5db..1a7c1ebc0f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
@@ -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)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index 662058f4d8..dfda7319fc 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
@@ -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;
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
index 7b82b33d56..af5f6876b7 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
index e5c53c86d0..1cf200da52 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
@@ -58,7 +58,7 @@ public class RequestSentPost 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;
}
@@ -73,6 +73,6 @@ public class RequestSentPost implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExReplySentPost(msg));
+ player.sendPacket(new ExReplySentPost(msg));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
index 99aec4ba86..05a414f453 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
@@ -47,6 +47,7 @@ public class RequestSentPostList implements IClientIncomingPacket
// player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
// return;
// }
- client.sendPacket(new ExShowSentPostList(player.getObjectId()));
+
+ player.sendPacket(new ExShowSentPostList(player.getObjectId()));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
index 72578e8d22..197ab07190 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
@@ -78,18 +78,23 @@ public class RequestSetCrop implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
index fe5ea44de4..a3e3ded0a3 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
@@ -77,18 +77,23 @@ public class RequestSetSeed implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index a175a9d052..a6ad0c3e9a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -72,7 +72,7 @@ public class RequestShortCutReg implements IClientIncomingPacket
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
sc.setAutoUse(_active);
player.registerShortCut(sc);
- client.sendPacket(new ShortCutRegister(sc));
+ player.sendPacket(new ShortCutRegister(sc));
player.sendPacket(new ExActivateAutoShortcut(sc, _active));
// When id is not auto used, deactivate auto shortcuts.
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
index 1053bb74c1..fc2725daa7 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
@@ -44,6 +44,6 @@ public class RequestShowBeautyList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExResponseBeautyList(player, _type));
+ player.sendPacket(new ExResponseBeautyList(player, _type));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
index 9c73551f59..541b987e91 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
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;
/**
@@ -40,6 +41,12 @@ public class RequestShowBoard implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, client.getPlayer());
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, player);
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
index 162de17679..f74c3abf4d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
@@ -41,6 +41,7 @@ public class RequestShowMiniMap implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ShowMiniMap(0));
+
+ player.sendPacket(new ShowMiniMap(0));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
index 097e8f5d30..f055ad8a57 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeAttackerList;
@@ -40,9 +41,17 @@ public class RequestSiegeAttackerList implements IClientIncomingPacket
public void run(GameClient client)
{
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
- if (castle != null)
+ if (castle == null)
{
- client.sendPacket(new SiegeAttackerList(castle));
+ return;
}
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeAttackerList(castle));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
index 6df5163c58..a8d4c9f6d0 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList;
@@ -44,6 +45,13 @@ public class RequestSiegeDefenderList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new SiegeDefenderList(castle));
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
index 8ae03da07b..51c42f7b7c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
@@ -34,10 +34,12 @@ public class RequestSkillList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- final Player cha = client.getPlayer();
- if (cha != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- cha.sendSkillList();
+ return;
}
+
+ player.sendSkillList();
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
index 03a4d521e2..51d71c3154 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
@@ -60,52 +60,52 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
if ((clanDeclaringWar.getLevel() < 5) || (clanDeclaringWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_5_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_5_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaringWar.getWarCount() >= 30)
{
- client.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final Clan clanDeclaredWar = ClanTable.getInstance().getClanByName(_pledgeName);
if (clanDeclaredWar == null)
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar == clanDeclaringWar)
{
- client.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaringWar.getAllyId() == clanDeclaredWar.getAllyId()) && (clanDeclaringWar.getAllyId() != 0))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaredWar.getLevel() < 5) || (clanDeclaredWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_5_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_5_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis())
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -116,15 +116,15 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_T_DECLARE_A_WAR_BECAUSE_THE_21_DAY_PERIOD_HASN_T_PASSED_AFTER_A_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ALREADY_BEEN_AT_WAR_WITH_THE_S1_CLAN_5_DAYS_MUST_PASS_BEFORE_YOU_CAN_DECLARE_WAR_AGAIN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
index 47c39e2e70..e8c4b1a0e1 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
@@ -60,7 +60,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if ((member != null) && member.isOnline() && member.getPlayer().isInCombat())
{
player.sendPacket(SystemMessageId.A_CEASE_FIRE_DURING_A_CLAN_WAR_CAN_NOT_BE_CALLED_WHILE_MEMBERS_OF_YOUR_CLAN_ARE_ENGAGED_IN_BATTLE);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -69,13 +69,13 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if (targetClan == null)
{
player.sendMessage("No such clan.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -85,14 +85,14 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_NOT_DECLARED_A_CLAN_WAR_AGAINST_THE_CLAN_S1);
sm.addString(targetClan.getName());
player.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{
player.sendPacket(SystemMessageId.YOU_CANNOT_DECLARE_DEFEAT_AS_IT_HAS_NOT_BEEN_7_DAYS_SINCE_STARTING_A_CLAN_WAR_WITH_CLAN_S1);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
index db5981de3d..32d110951d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
@@ -65,7 +65,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
// The English system message say weapon, but it's applied to any equipped item.
if (player.isAttackingNow() || player.isCastingNow())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
return;
}
@@ -89,13 +89,13 @@ public class RequestUnEquipItem implements IClientIncomingPacket
if (!player.getInventory().canManipulateWithItemId(item.getId()))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
if (item.isWeapon() && item.getWeaponItem().isForceEquip() && !player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
@@ -117,7 +117,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
}
sm.addItemName(unequippedItem);
- client.sendPacket(sm);
+ player.sendPacket(sm);
final InventoryUpdate iu = new InventoryUpdate();
iu.addItems(unequipped);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
index 0b38bcb67c..9e95fb93e1 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
@@ -51,28 +51,28 @@ public class RequestVoteNew implements IClientIncomingPacket
{
if (object == null)
{
- client.sendPacket(SystemMessageId.SELECT_TARGET);
+ player.sendPacket(SystemMessageId.SELECT_TARGET);
}
else if (object.isFakePlayer() && FakePlayerData.getInstance().isTalkable(object.getName()))
{
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addString(FakePlayerData.getInstance().getProperName(object.getName()));
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
player.setRecomLeft(player.getRecomLeft() - 1);
- client.sendPacket(new UserInfo(player));
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new UserInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
}
else
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
}
return;
}
@@ -85,19 +85,19 @@ public class RequestVoteNew implements IClientIncomingPacket
if (target == player)
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
return;
}
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
if (target.getRecomHave() >= 255)
{
- client.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
+ player.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
return;
}
@@ -106,16 +106,16 @@ public class RequestVoteNew implements IClientIncomingPacket
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addPcName(target);
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_BEEN_RECOMMENDED_BY_C1);
sm.addPcName(player);
target.sendPacket(sm);
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
target.broadcastUserInfo();
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
target.sendPacket(new ExVoteSystemInfo(target));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
index 05261ba813..0e3300d03c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
@@ -67,12 +67,12 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
}
else if ((player.getWeightPenalty() >= 3) || !player.isInventoryUnder90(false))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
return;
}
else if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
return;
}
@@ -101,11 +101,11 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
if (player.getPremiumItemList().isEmpty())
{
- client.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
+ player.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
}
else
{
- client.sendPacket(new ExGetPremiumItemList(player));
+ player.sendPacket(new ExGetPremiumItemList(player));
}
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
index c3f29fe9c9..d23918130b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
@@ -48,17 +48,17 @@ public class RequestWithdrawalPledge 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.isClanLeader())
{
- client.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
+ player.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
return;
}
if (player.isInCombat())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
return;
}
@@ -72,7 +72,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
// Remove the Player From the Member list
clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(player.getName()));
clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
- client.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
- client.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
+ player.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
+ player.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
index 84b879e0f7..13ecd08a96 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
@@ -150,14 +150,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
// Item Max Limit Check
if (!warehouse.validateCapacity(slots))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
+ player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
return;
}
// Check if enough adena and charge the fee
if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, manager, false))
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
return;
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
index a5462164d1..76e8ac2a68 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket
}
player.getBuyList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgBuy(player));
+ player.sendPacket(new PrivateStoreMsgBuy(player));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
index ac64c43c5c..d86bfc8f84 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket
}
player.getSellList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgSell(player));
+ player.sendPacket(new PrivateStoreMsgSell(player));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
index f3078c3e52..2726f99c08 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket
}
player.getSellList().setTitle(_msg);
- client.sendPacket(new ExPrivateStoreSetWholeMsg(player));
+ player.sendPacket(new ExPrivateStoreSetWholeMsg(player));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
index d44782af71..5e6691e8be 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
@@ -73,7 +73,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!player.getAccessLevel().allowTransaction())
{
player.sendMessage("Transactions are disabled for your current Access Level.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -84,8 +84,8 @@ public class TradeRequest implements IClientIncomingPacket
{
if (!effect.checkCondition(BotReportTable.TRADE_ACTION_BLOCK_ID))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -104,7 +104,7 @@ public class TradeRequest implements IClientIncomingPacket
// and the following system message is sent to acting player.
if (target.getObjectId() == player.getObjectId())
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
return;
}
@@ -141,7 +141,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!target.isPlayer())
{
- client.sendPacket(SystemMessageId.INVALID_TARGET);
+ player.sendPacket(SystemMessageId.INVALID_TARGET);
return;
}
@@ -161,8 +161,8 @@ public class TradeRequest implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_IS_CURRENTLY_BEING_INVESTIGATED);
sm.addString(partner.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -189,13 +189,13 @@ public class TradeRequest implements IClientIncomingPacket
if ((player.getPrivateStoreType() != PrivateStoreType.NONE) || (partner.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;
}
if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
+ player.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
return;
}
@@ -204,7 +204,7 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
@@ -218,13 +218,13 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.S1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
if (player.calculateDistance3D(partner) > 150)
{
- client.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
+ player.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
return;
}
@@ -232,6 +232,6 @@ public class TradeRequest implements IClientIncomingPacket
partner.sendPacket(new SendTradeRequest(player.getObjectId()));
sm = new SystemMessage(SystemMessageId.YOU_HAVE_REQUESTED_A_TRADE_WITH_C1);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
index ece66b1cd9..40f802fb2c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
@@ -116,7 +116,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (learn == null)
{
PacketLogger.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
break;
}
@@ -124,7 +124,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (skill == null)
{
PacketLogger.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
break;
}
@@ -157,7 +157,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1])
{
PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -167,7 +167,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel())
{
PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -176,7 +176,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points)
{
PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
index dd8e176010..f36b68549c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
@@ -60,12 +60,12 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
}
else if (player.getLevel() < 85)
{
- client.sendPacket(SystemMessageId.REACH_LEVEL_85_TO_USE_THE_ABILITY);
+ player.sendPacket(SystemMessageId.REACH_LEVEL_85_TO_USE_THE_ABILITY);
return;
}
else if (player.isInOlympiadMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_OR_RESET_ABILITY_POINTS_WHILE_PARTICIPATING_IN_THE_OLYMPIAD_OR_CEREMONY_OF_CHAOS);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_OR_RESET_ABILITY_POINTS_WHILE_PARTICIPATING_IN_THE_OLYMPIAD_OR_CEREMONY_OF_CHAOS);
return;
}
else if (player.isOnEvent())
@@ -85,7 +85,7 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
}
else if (player.getSp() < Config.ABILITY_POINTS_RESET_SP)
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_FOR_THIS);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_FOR_THIS);
return;
}
player.setSp(player.getSp() - Config.ABILITY_POINTS_RESET_SP);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
index afbd8b0b76..3ccf45b47f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
@@ -44,6 +44,6 @@ public class RequestExCancelShape_Shifting_Item implements IClientIncomingPacket
}
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
index 055dc2dd1e..6d286b4894 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
@@ -60,7 +60,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -83,7 +83,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (!extractItem.getItem().isAppearanceable())
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -113,15 +113,15 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,20 +129,20 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -154,6 +154,6 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
}
request.setAppearanceExtractItem(extractItem);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
index f7aa0f3047..1c8eaa09c2 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
@@ -55,8 +55,8 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -65,35 +65,35 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -101,7 +101,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -112,6 +112,6 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
return;
}
- client.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
+ player.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 1de9056bda..2a6d3e9bb9 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -64,8 +64,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -74,36 +74,36 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -111,14 +111,14 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!appearanceStone.checkConditions(player, targetItem))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,56 +129,56 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
{
if (extractItem == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getOwnerId() != player.getObjectId())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!extractItem.getItem().isAppearanceable())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -189,21 +189,21 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final long cost = appearanceStone.getCost();
if (cost > player.getAdena())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (stone.getCount() < 1L)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((appearanceStone.getType() == AppearanceType.NORMAL) && (inventory.destroyItem(getClass().getSimpleName(), extractItem, 1, player, this) == null))
{
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -276,7 +276,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
player.sendInventoryUpdate(iu);
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
+ player.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
if (targetItem.isEquipped())
{
player.broadcastUserInfo();
@@ -288,8 +288,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
slots.addComponentType(slot);
}
}
- client.sendPacket(slots);
+ player.sendPacket(slots);
}
- client.sendPacket(new ExAdenaInvenCount(player));
+ player.sendPacket(new ExAdenaInvenCount(player));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
index abea70c48a..bf64e21529 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
@@ -65,8 +65,8 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket
// attempting to destroy item
if (player.getInventory().destroyItemByItemId("ChangeAttribute", _consumeItemId, 1, player, item) == null)
{
- client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
- client.sendPacket(ExChangeAttributeFail.STATIC);
+ player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
+ player.sendPacket(ExChangeAttributeFail.STATIC);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH);
return;
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
index 7f91558675..0de9d8bc72 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
@@ -52,26 +52,26 @@ public class RequestCommissionBuyInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
if (!player.isInventoryUnder80(false) || (player.getWeightPenalty() >= 3))
{
- client.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_AMOUNT_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_AMOUNT_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
return;
}
final CommissionItem commissionItem = ItemCommissionManager.getInstance().getCommissionItem(_commissionId);
if (commissionItem != null)
{
- client.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
+ player.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
}
else
{
- client.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
}
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
index aa794d2d96..16dec35e6f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
@@ -49,7 +49,7 @@ public class RequestCommissionBuyItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
index 4f7141c09d..8a3ff5c955 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
@@ -50,7 +50,7 @@ public class RequestCommissionDelete implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
index 1a7edbbaac..01005d24c1 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
@@ -50,18 +50,18 @@ public class RequestCommissionInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
final Item itemInstance = player.getInventory().getItemByObjectId(_itemObjectId);
if (itemInstance != null)
{
- client.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
+ player.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
}
else
{
- client.sendPacket(ExResponseCommissionInfo.EMPTY);
+ player.sendPacket(ExResponseCommissionInfo.EMPTY);
}
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
index e5c25df330..c9e13e021f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
@@ -62,7 +62,7 @@ public class RequestCommissionList implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
index 6b2f96e87d..7eb252c475 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
@@ -95,7 +95,7 @@ public class RequestCommissionRegister implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
index 1e826566da..b19aefac8d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
@@ -45,7 +45,7 @@ public class RequestCommissionRegisteredItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
index 532c2496c2..75a5a816f0 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
@@ -46,11 +46,11 @@ public class RequestCommissionRegistrableItemList implements IClientIncomingPack
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
- client.sendPacket(new ExResponseCommissionItemList(1, player.getInventory().getAvailableItems(false, false, false)));
- client.sendPacket(new ExResponseCommissionItemList(2, player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(1, player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(2, player.getInventory().getAvailableItems(false, false, false)));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
index 9cc69554c4..f72f1b6cef 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = new CompoundRequest(player);
if (!player.addRequest(request))
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
@@ -77,7 +79,7 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
final Item itemOne = request.getItemOne();
if (itemOne == null)
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -87,11 +89,11 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItems.isEmpty())
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
- client.sendPacket(ExEnchantOneOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
index 53112870da..1da5028812 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
@@ -51,23 +51,25 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -77,14 +79,14 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -93,10 +95,10 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
- client.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
index 0dbe123787..72a0b34bfc 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemOne();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
request.setItemOne(0);
- client.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
index 5743927fa1..4a05f6c92b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemTwo();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
request.setItemTwo(0);
- client.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
index 8562dc024b..3d54ac4f0d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
return;
}
@@ -78,7 +80,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -86,7 +88,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -96,7 +98,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -121,11 +123,11 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item item = player.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true);
if (success)
{
- client.sendPacket(new ExEnchantSucess(item.getId()));
+ player.sendPacket(new ExEnchantSucess(item.getId()));
}
else
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
index 9d5edbda7a..31298a1992 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
@@ -65,6 +65,7 @@ public class RequestCrystallizeEstimate 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);
@@ -73,28 +74,28 @@ public class RequestCrystallizeEstimate 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);
return;
}
final Item item = player.getInventory().getItemByObjectId(_objectId);
if ((item == null) || item.isShadowItem() || item.isTimeLimitedItem() || item.isHeroItem() || (!Config.ALT_ALLOW_AUGMENT_DESTROY && item.isAugmented()))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
PacketLogger.warning(player + ": tried to crystallize " + item.getItem());
return;
}
@@ -167,8 +168,8 @@ public class RequestCrystallizeEstimate 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;
}
@@ -177,13 +178,13 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket
if ((crystallizationRewards != null) && !crystallizationRewards.isEmpty())
{
player.setInCrystallize(true);
- client.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
+ player.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
}
else
{
player.sendMessage("Crystallization cannot be proceeded because there are no items registered.");
// CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED changed to ANGEL_NEVIT_S_DESCENT_BONUS_TIME_S1
- // client.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
+ // player.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
}
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java
index 6425eba48e..ce7c41304f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java
@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.faction;
import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.faction.ExFactionInfo;
@@ -39,6 +40,12 @@ public class RequestUserFactionInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.getPlayer().sendPacket(new ExFactionInfo(client.getPlayer(), _openDialog));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ExFactionInfo(player, _openDialog));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
index 584b6e3e4e..a0b7c23c20 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
@@ -40,9 +40,11 @@ public class RequestFriendDetailInfo implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExFriendDetailInfo(player, _name));
+ return;
}
+
+ player.sendPacket(new ExFriendDetailInfo(player, _name));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
index 82fa3a651a..e9e5d90e84 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
@@ -48,6 +48,7 @@ public class RequestMenteeWaitingList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
+
+ player.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
index 7c22e266ca..20ec347a77 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
@@ -41,6 +41,7 @@ public class RequestMentorList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExMentorList(player));
+
+ player.sendPacket(new ExMentorList(player));
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
index 4023b0cff0..618f6dc7ed 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
@@ -37,9 +37,11 @@ public class RequestBRGamePoint implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExBRGamePoint(player));
+ return;
}
+
+ player.sendPacket(new ExBRGamePoint(player));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
index de0446cfd8..7ac78cfe4f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
@@ -34,7 +34,7 @@ public class RequestBRRecentProductList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- // Player player = client.getPlayer();
+ // Player player = cplayer.getPlayer();
// TODO: Implement it.
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
index 6813c75ed2..f8d602624b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
@@ -34,7 +34,6 @@ public class ExRestartClient implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.EX_RESTART_CLIENT.writeId(packet);
-
return true;
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
index 89678c1836..4378479707 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
- * A packet used to draw points and lines on client.
+ * A packet used to draw points and lines on cplayer.
* Note: Names in points and lines are bugged they will appear even when not looking at them.
* @author NosBit
*/
@@ -62,7 +62,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -76,7 +76,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -88,7 +88,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -100,7 +100,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
@@ -110,7 +110,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -124,7 +124,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -136,7 +136,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -148,7 +148,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
index ef3f4acc18..25ba232162 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
@@ -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;
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
index c6ea588540..acab47f316 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
@@ -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;
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
index cdfaa128cb..129d1a52d1 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
@@ -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;
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
index ba988591d0..370aeba2c5 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
@@ -51,6 +51,6 @@ public class Appearing implements IClientIncomingPacket
player.onTeleported();
}
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
index 0ea780c5b4..b47439803f 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
@@ -55,7 +55,7 @@ public class BypassUserCmd implements IClientIncomingPacket
}
else
{
- handler.useUserCommand(_command, client.getPlayer());
+ handler.useUserCommand(_command, player);
}
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
index a3236b0d83..43c0172038 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
@@ -65,12 +65,12 @@ public class CannotMoveAnymore implements IClientIncomingPacket
// PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+
// " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ());
// StopMove smwl = new StopMove(player);
- // client.getPlayer().sendPacket(smwl);
- // client.getPlayer().broadcastPacket(smwl);
+ // cplayer.getPlayer().sendPacket(smwl);
+ // cplayer.getPlayer().broadcastPacket(smwl);
//
- // StopRotation sr = new StopRotation(client.getPlayer(),
+ // StopRotation sr = new StopRotation(cplayer.getPlayer(),
// _heading);
- // client.getPlayer().sendPacket(sr);
- // client.getPlayer().broadcastPacket(sr);
+ // cplayer.getPlayer().sendPacket(sr);
+ // cplayer.getPlayer().broadcastPacket(sr);
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 91ceee0470..5a1266cb11 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -339,18 +339,18 @@ 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(1, player));
- client.sendPacket(new ItemList(2, player));
+ player.sendPacket(new ItemList(1, player));
+ player.sendPacket(new ItemList(2, player));
// Send Quest Item List
- client.sendPacket(new ExQuestItemList(1, player));
- client.sendPacket(new ExQuestItemList(2, player));
+ player.sendPacket(new ExQuestItemList(1, player));
+ player.sendPacket(new ExQuestItemList(2, player));
// Send Shortcuts
- client.sendPacket(new ShortCutInit(player));
+ player.sendPacket(new ShortCutInit(player));
// Send Action list
player.sendPacket(ExBasicActionList.STATIC_PACKET);
@@ -466,7 +466,7 @@ public class EnterWorld implements IClientIncomingPacket
player.sendPacket(new ExUserInfoEquipSlot(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");
@@ -507,14 +507,14 @@ public class EnterWorld implements IClientIncomingPacket
notice.replace("%clan_name%", player.getClan().getName());
notice.replace("%notice_text%", player.getClan().getNotice().replaceAll("\r\n", "
"));
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));
}
}
@@ -526,13 +526,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())
@@ -595,7 +595,7 @@ public class EnterWorld implements IClientIncomingPacket
{
if (MailManager.getInstance().hasUnreadPost(player))
{
- client.sendPacket(ExNoticePostArrived.valueOf(false));
+ player.sendPacket(ExNoticePostArrived.valueOf(false));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 4bb789645a..218e629395 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -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;
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 8078d0c10e..6ac4cc7ca0 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -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:
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
index 65c69620a0..94911328a2 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
@@ -41,6 +41,7 @@ public class RequestAlchemySkillList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExAlchemySkillList(player));
+
+ player.sendPacket(new ExAlchemySkillList(player));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
index 49bb9c2285..fb6b18d662 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
index c6f8fe2045..b6f8d4fb9e 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
index 5669f5691a..beb5024780 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
index 7ee18d42b3..3e864837f8 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
index 2baf948bc7..4dc52e2648 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
index f8d8826556..0341d285b8 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
@@ -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_SERVITOR);
+ player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_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_SERVITOR);
+ player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_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())
{
- 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);
}
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
index 83ffc494d5..4b817c3e70 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index ce3d851f06..9c2d96e99c 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
@@ -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,8 +253,8 @@ 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));
player.sendPacket(SystemMessageId.EXCHANGE_IS_SUCCESSFUL);
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
index d77d8eba6a..f841f306a1 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
@@ -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;
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
index 4534c39c18..b65ad7c589 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
@@ -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;
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
index f1ddb94865..5ae334f854 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
index 21710a1eb0..dd69523f80 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
@@ -96,6 +96,6 @@ public class RequestConfirmSiegeWaitingList implements IClientIncomingPacket
}
// Update the defender list
- client.sendPacket(new SiegeDefenderList(castle));
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
index dc81cb23dc..b2f53bed92 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
index e0443b72b7..c6b44e7c11 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
@@ -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;
}
@@ -223,7 +224,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
@@ -242,13 +243,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();
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
index 36d36097c1..5fd67b8759 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
@@ -42,6 +42,6 @@ public class RequestCursedWeaponList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExCursedWeaponList());
+ player.sendPacket(new ExCursedWeaponList());
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
index 573a4f7950..193c436d7e 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
index ce21646986..6d59e89936 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
index 5882d1ea46..88fd8b949d 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index cb90d581c8..d8f319bf1f 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -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.S1_S2_HAS_BEEN_UNEQUIPPED);
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();
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
index 224a640ef5..5227396561 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
@@ -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);
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
index ed981b63f7..f5607f7fa5 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
@@ -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);
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index bff5cf585f..325ff253dd 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -86,7 +86,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;
}
@@ -122,9 +122,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;
}
@@ -133,27 +133,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;
}
@@ -163,9 +163,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;
}
@@ -174,9 +174,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:
@@ -195,7 +195,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)
@@ -260,8 +260,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)
@@ -295,13 +295,13 @@ public class RequestEnchantItem implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED);
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()))
@@ -322,11 +322,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)
@@ -358,7 +358,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)
@@ -401,7 +401,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))
@@ -411,11 +411,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)
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
index 4652f15ddc..22d6a0efa5 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
@@ -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);
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
index 161b8d0cab..b7e61d2f18 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
@@ -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,7 +100,7 @@ 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;
}
@@ -108,13 +108,13 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket
if ((item.getItem().getId() == 48168) && (stone.getItem().getId() != 48169))
{
player.removeRequest(request.getClass());
- client.sendPacket(SystemMessageId.ATTRIBUTE_ITEM_USAGE_HAS_BEEN_CANCELLED);
+ player.sendPacket(SystemMessageId.ATTRIBUTE_ITEM_USAGE_HAS_BEEN_CANCELLED);
return;
}
if (!ElementalAttributeData.getInstance().isElementableWithStone(item, stone.getItem().getId()))
{
- 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;
}
@@ -154,7 +154,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;
}
@@ -182,7 +182,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;
}
@@ -259,7 +259,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;
@@ -280,8 +280,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);
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
index 68bb180db1..7b967d8931 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -82,8 +82,8 @@ 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));
+ // cplayer.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
index 35fe136cbd..54a540188c 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
@@ -55,6 +55,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket
{
return;
}
+
player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
index 6ec3504089..79088e0c3a 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
@@ -47,6 +47,6 @@ public class RequestExFriendListExtended implements IClientIncomingPacket
return;
}
- client.sendPacket(new FriendList(player));
+ player.sendPacket(new FriendList(player));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
index 2e0c2154ac..150caed567 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
@@ -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()));
}
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
index 8851aef463..00bb331778 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
@@ -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 + " !!");
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 16f28d5d04..3ee3f7a9aa 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
index 67a4813cec..fe3c0f5057 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
@@ -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);
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
index c55df32ab6..2b1000f445 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
index 0fdcc5fde4..777238a18e 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
@@ -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.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_REGISTER_A_CLAN_CREST);
+ player.sendPacket(SystemMessageId.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_REGISTER_A_CLAN_CREST);
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);
}
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
index f868d0e26f..056262b4ab 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
@@ -48,6 +48,6 @@ public class RequestExShowContactList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExShowContactList(player));
+ player.sendPacket(new ExShowContactList(player));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
index 2d9f0456f4..1589ff8175 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
index 0a4522bf64..a2667da070 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
index b2f32527da..1355a122ce 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
index 73dd408134..1233ad294b 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
@@ -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);
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
index f1c10ee605..10070bbbeb 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
@@ -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;
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
index b70d188e2b..9624152294 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
@@ -49,7 +49,7 @@ public class RequestGiveNickName implements IClientIncomingPacket
if ((player.getNobleLevel() > 0) && _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.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_GRANT_A_TITLE);
+ player.sendPacket(SystemMessageId.THE_CLAN_MUST_BE_LEVEL_3_OR_ABOVE_TO_GRANT_A_TITLE);
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);
}
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
index 822c7231bc..8f2bd877b9 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
@@ -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;
}
@@ -109,7 +109,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);
}
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
index a7c019d65d..7253226656 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
index ff96a400c9..79db1768e6 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
@@ -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;
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
index 732efa0d71..22bd337c41 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
@@ -49,7 +49,7 @@ public class RequestHennaRemove implements IClientIncomingPacket
if (!client.getFloodProtectors().canPerformTransaction())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -68,7 +68,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;
@@ -78,7 +78,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);
}
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
index 25d004a7b7..2240af9a6e 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
@@ -41,6 +41,7 @@ public class RequestHennaRemoveList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new HennaRemoveList(player));
+
+ player.sendPacket(new HennaRemoveList(player));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
index 1c1fc6d8c2..bc9710d465 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
@@ -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()));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
index d46ef778d4..f9e67ea1ed 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
@@ -43,6 +43,7 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExInzoneWaiting(player, _hide));
+
+ player.sendPacket(new ExInzoneWaiting(player, _hide));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
index 6551e7d0c4..42404bdd99 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
@@ -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();
+ return;
}
+
+ if (player.isInventoryDisabled())
+ {
+ return;
+ }
+
+ player.sendItemList();
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
index 99965602f9..cb5c08f036 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
@@ -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)
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
index 226f085fb0..9793d6e1d8 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
@@ -44,7 +44,7 @@ public class RequestKeyMapping implements IClientIncomingPacket
if (Config.STORE_UI_SETTINGS)
{
- client.sendPacket(new ExUISetting(player));
+ player.sendPacket(new ExUISetting(player));
}
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
index ada67e190c..2cdc066ead 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
@@ -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);
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
index bffa403c8a..96b1664122 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
@@ -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));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
index 7b4703d69c..9fcb5e9736 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index 36256ab955..cbcbb3e785 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -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_ON_A_BOAT_AIRSHIP_OR_ELEVATOR);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_POLYMORPH_WHILE_RIDING_ON_A_BOAT_AIRSHIP_OR_ELEVATOR);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
index 9372163aea..769c2af9e2 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
@@ -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
{
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
index 9149ce1284..8e7c3ee9fe 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
@@ -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));
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
index e670b165cd..de3adf72c3 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
@@ -43,7 +43,7 @@ public class RequestPackageSendableItemList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PackageSendableList(1, player, _objectId));
- client.sendPacket(new PackageSendableList(2, player, _objectId));
+ player.sendPacket(new PackageSendableList(1, player, _objectId));
+ player.sendPacket(new PackageSendableList(2, player, _objectId));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
index e8d53e1a19..e4ddcee7e8 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
@@ -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;
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
index 7d7f4fd83c..2c855d9a02 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
@@ -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_SUPPORT_4GAME_COM);
+ player.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_ON_HTTPS_SUPPORT_4GAME_COM);
return;
}
@@ -91,28 +91,28 @@ public class RequestPetition implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_SUBMITTED_MAXIMUM_NUMBER_OF_PETITIONS_TODAY_YOU_CANNOT_SUBMIT_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);
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
index b7f1ab30a7..7d148f2d91 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
index 8e66271f87..ef3a529b0c 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
@@ -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.YOU_HAVE_JOINED_THE_WAITING_LIST_IF_YOU_DO_NOT_JOIN_ANY_CLAN_IN_30_DAYS_YOUR_CHARACTER_WILL_BE_REMOVED_FROM_THE_LIST_IF_EXIT_WAITING_LIST_IS_USED_YOU_WILL_NOT_BE_ABLE_TO_JOIN_THE_WAITING_LIST_FOR_5_MINUTES);
+ player.sendPacket(SystemMessageId.YOU_HAVE_JOINED_THE_WAITING_LIST_IF_YOU_DO_NOT_JOIN_ANY_CLAN_IN_30_DAYS_YOUR_CHARACTER_WILL_BE_REMOVED_FROM_THE_LIST_IF_EXIT_WAITING_LIST_IS_USED_YOU_WILL_NOT_BE_ABLE_TO_JOIN_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;
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
index e3ec88ca13..34af0251ca 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
@@ -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())));
}
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
index 76d591b14c..a4f9ba1784 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
index 3459b04c80..4c077a4c9e 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
@@ -64,6 +64,7 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PledgeReceiveMemberInfo(member));
+
+ player.sendPacket(new PledgeReceiveMemberInfo(member));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
index e380ce68c8..464ad76c9f 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
@@ -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)
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
index 8fabbb1f4a..beee5121dd 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
@@ -52,6 +52,6 @@ public class RequestPledgeRecruitBoardDetail implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
+ player.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
index 1d0458db08..0d0d86f7db 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
index fe019fe6d6..dde18f32a4 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
@@ -44,6 +44,6 @@ public class RequestPledgeWaitingList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeWaitingList(_clanId));
+ player.sendPacket(new ExPledgeWaitingList(_clanId));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
index add0aa2f01..618c787a17 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
@@ -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));
}
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
index 4468b67642..500800df57 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
@@ -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);
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
index 086f76c512..2a75d35297 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
@@ -51,11 +51,11 @@ 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(1, player));
- client.sendPacket(new ExReplyPostItemList(2, player));
+ player.sendPacket(new ExReplyPostItemList(1, player));
+ player.sendPacket(new ExReplyPostItemList(2, player));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
index 44bbd9d34c..a038920c8b 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
@@ -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;
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
index 94958bc4fe..2ded12e55d 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
@@ -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());
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
index 2d616f2e94..bb2f0e8e6f 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
index 8ab3d4962f..243e4a3674 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
@@ -87,7 +87,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
if (_items == null)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -128,13 +128,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;
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
index bee0568e03..365e1f598f 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
@@ -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;
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
index b64136dc79..21ba9b39af 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
index 8badb24c5f..6ffcc69313 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
@@ -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();
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
index 461f09492a..06d51160dd 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
index a08127f456..3c38b12a5f 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
@@ -45,7 +45,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;
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
index ae18cc60a5..374363bf78 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
@@ -51,6 +51,6 @@ public class RequestRecipeItemMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeItemMakeInfo(_id, player, recipe.getMaxOffering()));
+ player.sendPacket(new RecipeItemMakeInfo(_id, player, recipe.getMaxOffering()));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
index 7b322a8cc8..4db297a810 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
@@ -102,15 +102,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;
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
index 52cce423a0..f79f0f2335 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
@@ -70,6 +70,6 @@ public class RequestRecipeShopMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeShopItemInfo(manufacturer, _recipeId, manufactureRecipeCost, recipe.getMaxOffering()));
+ player.sendPacket(new RecipeShopItemInfo(manufacturer, _recipeId, manufactureRecipeCost, recipe.getMaxOffering()));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
index f1a1490ee0..06e9b74fa4 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
@@ -78,7 +78,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)
@@ -91,6 +91,6 @@ public class RequestRecipeShopManageList implements IClientIncomingPacket
}
}
- client.sendPacket(new RecipeShopManageList(player, true));
+ player.sendPacket(new RecipeShopManageList(player, true));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
index e175401b7a..9cff73412c 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
@@ -44,13 +44,13 @@ public class RequestRecipeShopManagePrev implements IClientIncomingPacket
if (player.isAlikeDead() || (player.getTarget() == null) || !player.getTarget().isPlayer())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (player.calculateDistance2D(player.getTarget()) > 250)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index 1bb51eff9d..87a0574a9f 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -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))
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
index 4da834c30d..3d01f1e525 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
@@ -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);
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
index 1632df189f..9c0c240bd4 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
index b3e709c5db..1a7c1ebc0f 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
@@ -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)
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index 662058f4d8..dfda7319fc 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
@@ -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;
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
index 7b82b33d56..af5f6876b7 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
index e5c53c86d0..1cf200da52 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
@@ -58,7 +58,7 @@ public class RequestSentPost 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;
}
@@ -73,6 +73,6 @@ public class RequestSentPost implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExReplySentPost(msg));
+ player.sendPacket(new ExReplySentPost(msg));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
index 99aec4ba86..05a414f453 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
@@ -47,6 +47,7 @@ public class RequestSentPostList implements IClientIncomingPacket
// player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
// return;
// }
- client.sendPacket(new ExShowSentPostList(player.getObjectId()));
+
+ player.sendPacket(new ExShowSentPostList(player.getObjectId()));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
index 72578e8d22..197ab07190 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
@@ -78,18 +78,23 @@ public class RequestSetCrop implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
index fe5ea44de4..a3e3ded0a3 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
@@ -77,18 +77,23 @@ public class RequestSetSeed implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index a175a9d052..a6ad0c3e9a 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -72,7 +72,7 @@ public class RequestShortCutReg implements IClientIncomingPacket
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
sc.setAutoUse(_active);
player.registerShortCut(sc);
- client.sendPacket(new ShortCutRegister(sc));
+ player.sendPacket(new ShortCutRegister(sc));
player.sendPacket(new ExActivateAutoShortcut(sc, _active));
// When id is not auto used, deactivate auto shortcuts.
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
index 1053bb74c1..fc2725daa7 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
@@ -44,6 +44,6 @@ public class RequestShowBeautyList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExResponseBeautyList(player, _type));
+ player.sendPacket(new ExResponseBeautyList(player, _type));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
index 9c73551f59..541b987e91 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
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;
/**
@@ -40,6 +41,12 @@ public class RequestShowBoard implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, client.getPlayer());
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, player);
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
index 162de17679..f74c3abf4d 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
@@ -41,6 +41,7 @@ public class RequestShowMiniMap implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ShowMiniMap(0));
+
+ player.sendPacket(new ShowMiniMap(0));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
index 097e8f5d30..f055ad8a57 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeAttackerList;
@@ -40,9 +41,17 @@ public class RequestSiegeAttackerList implements IClientIncomingPacket
public void run(GameClient client)
{
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
- if (castle != null)
+ if (castle == null)
{
- client.sendPacket(new SiegeAttackerList(castle));
+ return;
}
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeAttackerList(castle));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
index 6df5163c58..a8d4c9f6d0 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList;
@@ -44,6 +45,13 @@ public class RequestSiegeDefenderList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new SiegeDefenderList(castle));
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
index 8ae03da07b..51c42f7b7c 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
@@ -34,10 +34,12 @@ public class RequestSkillList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- final Player cha = client.getPlayer();
- if (cha != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- cha.sendSkillList();
+ return;
}
+
+ player.sendSkillList();
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
index 03a4d521e2..51d71c3154 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
@@ -60,52 +60,52 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
if ((clanDeclaringWar.getLevel() < 5) || (clanDeclaringWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_5_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_5_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaringWar.getWarCount() >= 30)
{
- client.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final Clan clanDeclaredWar = ClanTable.getInstance().getClanByName(_pledgeName);
if (clanDeclaredWar == null)
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar == clanDeclaringWar)
{
- client.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaringWar.getAllyId() == clanDeclaredWar.getAllyId()) && (clanDeclaringWar.getAllyId() != 0))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaredWar.getLevel() < 5) || (clanDeclaredWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_5_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_5_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis())
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -116,15 +116,15 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_T_DECLARE_A_WAR_BECAUSE_THE_21_DAY_PERIOD_HASN_T_PASSED_AFTER_A_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ALREADY_BEEN_AT_WAR_WITH_THE_S1_CLAN_5_DAYS_MUST_PASS_BEFORE_YOU_CAN_DECLARE_WAR_AGAIN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
index 47c39e2e70..e8c4b1a0e1 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
@@ -60,7 +60,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if ((member != null) && member.isOnline() && member.getPlayer().isInCombat())
{
player.sendPacket(SystemMessageId.A_CEASE_FIRE_DURING_A_CLAN_WAR_CAN_NOT_BE_CALLED_WHILE_MEMBERS_OF_YOUR_CLAN_ARE_ENGAGED_IN_BATTLE);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -69,13 +69,13 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if (targetClan == null)
{
player.sendMessage("No such clan.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -85,14 +85,14 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_NOT_DECLARED_A_CLAN_WAR_AGAINST_THE_CLAN_S1);
sm.addString(targetClan.getName());
player.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{
player.sendPacket(SystemMessageId.YOU_CANNOT_DECLARE_DEFEAT_AS_IT_HAS_NOT_BEEN_7_DAYS_SINCE_STARTING_A_CLAN_WAR_WITH_CLAN_S1);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
index db5981de3d..32d110951d 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
@@ -65,7 +65,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
// The English system message say weapon, but it's applied to any equipped item.
if (player.isAttackingNow() || player.isCastingNow())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
return;
}
@@ -89,13 +89,13 @@ public class RequestUnEquipItem implements IClientIncomingPacket
if (!player.getInventory().canManipulateWithItemId(item.getId()))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
if (item.isWeapon() && item.getWeaponItem().isForceEquip() && !player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
@@ -117,7 +117,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
}
sm.addItemName(unequippedItem);
- client.sendPacket(sm);
+ player.sendPacket(sm);
final InventoryUpdate iu = new InventoryUpdate();
iu.addItems(unequipped);
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
index 0b38bcb67c..9e95fb93e1 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
@@ -51,28 +51,28 @@ public class RequestVoteNew implements IClientIncomingPacket
{
if (object == null)
{
- client.sendPacket(SystemMessageId.SELECT_TARGET);
+ player.sendPacket(SystemMessageId.SELECT_TARGET);
}
else if (object.isFakePlayer() && FakePlayerData.getInstance().isTalkable(object.getName()))
{
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addString(FakePlayerData.getInstance().getProperName(object.getName()));
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
player.setRecomLeft(player.getRecomLeft() - 1);
- client.sendPacket(new UserInfo(player));
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new UserInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
}
else
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
}
return;
}
@@ -85,19 +85,19 @@ public class RequestVoteNew implements IClientIncomingPacket
if (target == player)
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
return;
}
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
if (target.getRecomHave() >= 255)
{
- client.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
+ player.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
return;
}
@@ -106,16 +106,16 @@ public class RequestVoteNew implements IClientIncomingPacket
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addPcName(target);
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_BEEN_RECOMMENDED_BY_C1);
sm.addPcName(player);
target.sendPacket(sm);
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
target.broadcastUserInfo();
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
target.sendPacket(new ExVoteSystemInfo(target));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
index 05261ba813..0e3300d03c 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
@@ -67,12 +67,12 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
}
else if ((player.getWeightPenalty() >= 3) || !player.isInventoryUnder90(false))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
return;
}
else if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
return;
}
@@ -101,11 +101,11 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
if (player.getPremiumItemList().isEmpty())
{
- client.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
+ player.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
}
else
{
- client.sendPacket(new ExGetPremiumItemList(player));
+ player.sendPacket(new ExGetPremiumItemList(player));
}
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
index c3f29fe9c9..d23918130b 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
@@ -48,17 +48,17 @@ public class RequestWithdrawalPledge 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.isClanLeader())
{
- client.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
+ player.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
return;
}
if (player.isInCombat())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
return;
}
@@ -72,7 +72,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
// Remove the Player From the Member list
clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(player.getName()));
clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
- client.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
- client.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
+ player.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
+ player.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
index 84b879e0f7..13ecd08a96 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
@@ -150,14 +150,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
// Item Max Limit Check
if (!warehouse.validateCapacity(slots))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
+ player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
return;
}
// Check if enough adena and charge the fee
if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, manager, false))
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
return;
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
index a5462164d1..76e8ac2a68 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket
}
player.getBuyList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgBuy(player));
+ player.sendPacket(new PrivateStoreMsgBuy(player));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
index ac64c43c5c..d86bfc8f84 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket
}
player.getSellList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgSell(player));
+ player.sendPacket(new PrivateStoreMsgSell(player));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
index f3078c3e52..2726f99c08 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket
}
player.getSellList().setTitle(_msg);
- client.sendPacket(new ExPrivateStoreSetWholeMsg(player));
+ player.sendPacket(new ExPrivateStoreSetWholeMsg(player));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
index d44782af71..5e6691e8be 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
@@ -73,7 +73,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!player.getAccessLevel().allowTransaction())
{
player.sendMessage("Transactions are disabled for your current Access Level.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -84,8 +84,8 @@ public class TradeRequest implements IClientIncomingPacket
{
if (!effect.checkCondition(BotReportTable.TRADE_ACTION_BLOCK_ID))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -104,7 +104,7 @@ public class TradeRequest implements IClientIncomingPacket
// and the following system message is sent to acting player.
if (target.getObjectId() == player.getObjectId())
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
return;
}
@@ -141,7 +141,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!target.isPlayer())
{
- client.sendPacket(SystemMessageId.INVALID_TARGET);
+ player.sendPacket(SystemMessageId.INVALID_TARGET);
return;
}
@@ -161,8 +161,8 @@ public class TradeRequest implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_IS_CURRENTLY_BEING_INVESTIGATED);
sm.addString(partner.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -189,13 +189,13 @@ public class TradeRequest implements IClientIncomingPacket
if ((player.getPrivateStoreType() != PrivateStoreType.NONE) || (partner.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;
}
if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
+ player.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
return;
}
@@ -204,7 +204,7 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
@@ -218,13 +218,13 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.S1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
if (player.calculateDistance3D(partner) > 150)
{
- client.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
+ player.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
return;
}
@@ -232,6 +232,6 @@ public class TradeRequest implements IClientIncomingPacket
partner.sendPacket(new SendTradeRequest(player.getObjectId()));
sm = new SystemMessage(SystemMessageId.YOU_HAVE_REQUESTED_A_TRADE_WITH_C1);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
index ece66b1cd9..40f802fb2c 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
@@ -116,7 +116,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (learn == null)
{
PacketLogger.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
break;
}
@@ -124,7 +124,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (skill == null)
{
PacketLogger.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
break;
}
@@ -157,7 +157,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1])
{
PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -167,7 +167,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel())
{
PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -176,7 +176,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points)
{
PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
index dd8e176010..f36b68549c 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
@@ -60,12 +60,12 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
}
else if (player.getLevel() < 85)
{
- client.sendPacket(SystemMessageId.REACH_LEVEL_85_TO_USE_THE_ABILITY);
+ player.sendPacket(SystemMessageId.REACH_LEVEL_85_TO_USE_THE_ABILITY);
return;
}
else if (player.isInOlympiadMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_OR_RESET_ABILITY_POINTS_WHILE_PARTICIPATING_IN_THE_OLYMPIAD_OR_CEREMONY_OF_CHAOS);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_OR_RESET_ABILITY_POINTS_WHILE_PARTICIPATING_IN_THE_OLYMPIAD_OR_CEREMONY_OF_CHAOS);
return;
}
else if (player.isOnEvent())
@@ -85,7 +85,7 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
}
else if (player.getSp() < Config.ABILITY_POINTS_RESET_SP)
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_FOR_THIS);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_FOR_THIS);
return;
}
player.setSp(player.getSp() - Config.ABILITY_POINTS_RESET_SP);
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
index afbd8b0b76..3ccf45b47f 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
@@ -44,6 +44,6 @@ public class RequestExCancelShape_Shifting_Item implements IClientIncomingPacket
}
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
index 055dc2dd1e..6d286b4894 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
@@ -60,7 +60,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -83,7 +83,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (!extractItem.getItem().isAppearanceable())
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -113,15 +113,15 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,20 +129,20 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -154,6 +154,6 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
}
request.setAppearanceExtractItem(extractItem);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
index f7aa0f3047..1c8eaa09c2 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
@@ -55,8 +55,8 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -65,35 +65,35 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -101,7 +101,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -112,6 +112,6 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
return;
}
- client.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
+ player.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 1de9056bda..2a6d3e9bb9 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -64,8 +64,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -74,36 +74,36 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -111,14 +111,14 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!appearanceStone.checkConditions(player, targetItem))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,56 +129,56 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
{
if (extractItem == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getOwnerId() != player.getObjectId())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!extractItem.getItem().isAppearanceable())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -189,21 +189,21 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final long cost = appearanceStone.getCost();
if (cost > player.getAdena())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (stone.getCount() < 1L)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((appearanceStone.getType() == AppearanceType.NORMAL) && (inventory.destroyItem(getClass().getSimpleName(), extractItem, 1, player, this) == null))
{
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -276,7 +276,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
player.sendInventoryUpdate(iu);
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
+ player.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
if (targetItem.isEquipped())
{
player.broadcastUserInfo();
@@ -288,8 +288,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
slots.addComponentType(slot);
}
}
- client.sendPacket(slots);
+ player.sendPacket(slots);
}
- client.sendPacket(new ExAdenaInvenCount(player));
+ player.sendPacket(new ExAdenaInvenCount(player));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
index abea70c48a..bf64e21529 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
@@ -65,8 +65,8 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket
// attempting to destroy item
if (player.getInventory().destroyItemByItemId("ChangeAttribute", _consumeItemId, 1, player, item) == null)
{
- client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
- client.sendPacket(ExChangeAttributeFail.STATIC);
+ player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
+ player.sendPacket(ExChangeAttributeFail.STATIC);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH);
return;
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
index 7f91558675..0de9d8bc72 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
@@ -52,26 +52,26 @@ public class RequestCommissionBuyInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
if (!player.isInventoryUnder80(false) || (player.getWeightPenalty() >= 3))
{
- client.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_AMOUNT_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_AMOUNT_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
return;
}
final CommissionItem commissionItem = ItemCommissionManager.getInstance().getCommissionItem(_commissionId);
if (commissionItem != null)
{
- client.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
+ player.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
}
else
{
- client.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
}
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
index aa794d2d96..16dec35e6f 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
@@ -49,7 +49,7 @@ public class RequestCommissionBuyItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
index 4f7141c09d..8a3ff5c955 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
@@ -50,7 +50,7 @@ public class RequestCommissionDelete implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
index 1a7edbbaac..01005d24c1 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
@@ -50,18 +50,18 @@ public class RequestCommissionInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
final Item itemInstance = player.getInventory().getItemByObjectId(_itemObjectId);
if (itemInstance != null)
{
- client.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
+ player.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
}
else
{
- client.sendPacket(ExResponseCommissionInfo.EMPTY);
+ player.sendPacket(ExResponseCommissionInfo.EMPTY);
}
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
index e5c25df330..c9e13e021f 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
@@ -62,7 +62,7 @@ public class RequestCommissionList implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
index 6b2f96e87d..7eb252c475 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
@@ -95,7 +95,7 @@ public class RequestCommissionRegister implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
index 1e826566da..b19aefac8d 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
@@ -45,7 +45,7 @@ public class RequestCommissionRegisteredItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
index 532c2496c2..75a5a816f0 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
@@ -46,11 +46,11 @@ public class RequestCommissionRegistrableItemList implements IClientIncomingPack
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
- client.sendPacket(new ExResponseCommissionItemList(1, player.getInventory().getAvailableItems(false, false, false)));
- client.sendPacket(new ExResponseCommissionItemList(2, player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(1, player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(2, player.getInventory().getAvailableItems(false, false, false)));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
index 9cc69554c4..f72f1b6cef 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = new CompoundRequest(player);
if (!player.addRequest(request))
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
@@ -77,7 +79,7 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
final Item itemOne = request.getItemOne();
if (itemOne == null)
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -87,11 +89,11 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItems.isEmpty())
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
- client.sendPacket(ExEnchantOneOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
index 53112870da..1da5028812 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
@@ -51,23 +51,25 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -77,14 +79,14 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -93,10 +95,10 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
- client.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
index 0dbe123787..72a0b34bfc 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemOne();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
request.setItemOne(0);
- client.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
index 5743927fa1..4a05f6c92b 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemTwo();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
request.setItemTwo(0);
- client.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
index 8562dc024b..3d54ac4f0d 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
return;
}
@@ -78,7 +80,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -86,7 +88,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -96,7 +98,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -121,11 +123,11 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item item = player.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true);
if (success)
{
- client.sendPacket(new ExEnchantSucess(item.getId()));
+ player.sendPacket(new ExEnchantSucess(item.getId()));
}
else
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
index 9d5edbda7a..31298a1992 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
@@ -65,6 +65,7 @@ public class RequestCrystallizeEstimate 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);
@@ -73,28 +74,28 @@ public class RequestCrystallizeEstimate 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);
return;
}
final Item item = player.getInventory().getItemByObjectId(_objectId);
if ((item == null) || item.isShadowItem() || item.isTimeLimitedItem() || item.isHeroItem() || (!Config.ALT_ALLOW_AUGMENT_DESTROY && item.isAugmented()))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
PacketLogger.warning(player + ": tried to crystallize " + item.getItem());
return;
}
@@ -167,8 +168,8 @@ public class RequestCrystallizeEstimate 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;
}
@@ -177,13 +178,13 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket
if ((crystallizationRewards != null) && !crystallizationRewards.isEmpty())
{
player.setInCrystallize(true);
- client.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
+ player.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
}
else
{
player.sendMessage("Crystallization cannot be proceeded because there are no items registered.");
// CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED changed to ANGEL_NEVIT_S_DESCENT_BONUS_TIME_S1
- // client.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
+ // player.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
}
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java
index 6425eba48e..ce7c41304f 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/faction/RequestUserFactionInfo.java
@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.faction;
import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.faction.ExFactionInfo;
@@ -39,6 +40,12 @@ public class RequestUserFactionInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.getPlayer().sendPacket(new ExFactionInfo(client.getPlayer(), _openDialog));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ExFactionInfo(player, _openDialog));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
index 584b6e3e4e..a0b7c23c20 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
@@ -40,9 +40,11 @@ public class RequestFriendDetailInfo implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExFriendDetailInfo(player, _name));
+ return;
}
+
+ player.sendPacket(new ExFriendDetailInfo(player, _name));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
index 82fa3a651a..e9e5d90e84 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
@@ -48,6 +48,7 @@ public class RequestMenteeWaitingList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
+
+ player.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
index 7c22e266ca..20ec347a77 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
@@ -41,6 +41,7 @@ public class RequestMentorList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExMentorList(player));
+
+ player.sendPacket(new ExMentorList(player));
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
index 4023b0cff0..618f6dc7ed 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
@@ -37,9 +37,11 @@ public class RequestBRGamePoint implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExBRGamePoint(player));
+ return;
}
+
+ player.sendPacket(new ExBRGamePoint(player));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
index de0446cfd8..7ac78cfe4f 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
@@ -34,7 +34,7 @@ public class RequestBRRecentProductList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- // Player player = client.getPlayer();
+ // Player player = cplayer.getPlayer();
// TODO: Implement it.
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
index 6813c75ed2..f8d602624b 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
@@ -34,7 +34,6 @@ public class ExRestartClient implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.EX_RESTART_CLIENT.writeId(packet);
-
return true;
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
index 89678c1836..4378479707 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
- * A packet used to draw points and lines on client.
+ * A packet used to draw points and lines on cplayer.
* Note: Names in points and lines are bugged they will appear even when not looking at them.
* @author NosBit
*/
@@ -62,7 +62,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -76,7 +76,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -88,7 +88,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -100,7 +100,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
@@ -110,7 +110,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -124,7 +124,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -136,7 +136,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -148,7 +148,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
index 69dcdf5a0a..34f6dec2d8 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
@@ -84,21 +84,21 @@ public class Action implements IClientIncomingPacket
// pressing e.g. pickup many times quickly would get you here
if (obj == null)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Players can't interact with objects in the other instances except from multiverse
if ((obj.getInstanceId() != player.getInstanceId()) && (player.getInstanceId() != -1))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Only GMs can directly interact with invisible characters
if ((obj instanceof Player) && (((Player) obj).getAppearance().isInvisible()) && !player.isGM())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -128,14 +128,14 @@ public class Action implements IClientIncomingPacket
{
// Invalid action detected (probably client cheating), LOGGER this
PacketLogger.warning("Character: " + player.getName() + " requested invalid action: " + _actionId);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
break;
}
}
}
else
{
- client.sendPacket(ActionFailed.STATIC_PACKET); // Actions prohibited when in trade
+ player.sendPacket(ActionFailed.STATIC_PACKET); // Actions prohibited when in trade
}
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
index 747c7b0b89..5211fde529 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
@@ -37,9 +37,14 @@ public class Appearing implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if ((player == null) || !player.isOnline())
+ if (player == null)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ return;
+ }
+
+ if (!player.isOnline())
+ {
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -48,6 +53,6 @@ public class Appearing implements IClientIncomingPacket
player.onTeleported();
}
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
index 1d7243bdb6..148e65d511 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
@@ -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;
@@ -37,6 +38,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));
}
}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
index d5ed83cf33..a74b0930ed 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
@@ -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.AllyInfo;
@@ -31,6 +32,12 @@ public class RequestAllyInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.sendPacket(new AllyInfo(client.getPlayer()));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new AllyInfo(player));
}
}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index 8816ee7b87..b036149454 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
@@ -72,6 +72,7 @@ public class RequestBuyItem implements IClientIncomingPacket
_count = 0;
return false;
}
+
_items[(i * 2) + 0] = itemId;
final int count = packet.readD();
@@ -80,12 +81,14 @@ public class RequestBuyItem implements IClientIncomingPacket
_count = 0;
return false;
}
+
if (count > 10000) // Count check.
{
client.getPlayer().sendMessage("You cannot buy more than 10.000 items.");
_count = 0;
return false;
}
+
_items[(i * 2) + 1] = count;
}
@@ -114,10 +117,9 @@ public class RequestBuyItem implements IClientIncomingPacket
}
final WorldObject target = player.getTarget();
- if (!player.isGM() && ((target == null // No target (ie GM Shop)
- ) || (!(target instanceof Merchant) && !(target instanceof Fisherman) && !(target instanceof MercManager) && !(target instanceof ClanHallManager) && !(target instanceof CastleChamberlain)) // Target not a merchant, fisherman or mercmanager
- || !player.isInsideRadius2D(target, Npc.INTERACTION_DISTANCE) // Distance is too far
- ))
+ if (!player.isGM() && ((target == null) // No target (ie GM Shop)
+ || (!(target instanceof Merchant) && !(target instanceof Fisherman) && !(target instanceof MercManager) && !(target instanceof ClanHallManager) && !(target instanceof CastleChamberlain)) // Target not a merchant, fisherman or mercmanager
+ || !player.isInsideRadius2D(target, Npc.INTERACTION_DISTANCE))) // Distance is too far
{
return;
}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 7e35c11822..f8418e721a 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -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.ExPledgeEmblem;
@@ -38,6 +39,12 @@ public class RequestExPledgeCrestLarge implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.sendPacket(new ExPledgeEmblem(_crestId));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ExPledgeEmblem(_crestId));
}
}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
index 4719fb2dc8..b2fe37b2ad 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -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;
@@ -34,6 +35,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));
}
}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
index 9db17b4b27..fdb8ecc319 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
@@ -63,6 +63,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
_count = 0;
return false;
}
+
_items[i] = new ItemRequest(objectId, itemId, enchant, (int) count, price);
priceTotal += price * count;
}
@@ -76,7 +77,6 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
}
_price = (int) priceTotal;
-
return true;
}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
index b5e259a520..e148f393c7 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.FortManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.network.GameClient;
@@ -41,6 +42,12 @@ public class RequestSiegeAttackerList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
if (_castleId < 100)
{
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
@@ -49,7 +56,7 @@ public class RequestSiegeAttackerList implements IClientIncomingPacket
return;
}
- client.sendPacket(new SiegeAttackerList(castle));
+ player.sendPacket(new SiegeAttackerList(castle));
}
else
{
@@ -59,7 +66,7 @@ public class RequestSiegeAttackerList implements IClientIncomingPacket
return;
}
- client.sendPacket(new SiegeAttackerList(fort));
+ player.sendPacket(new SiegeAttackerList(fort));
}
}
}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
index 121c954ccd..5039a3e2a1 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.FortManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.network.GameClient;
@@ -41,6 +42,12 @@ public class RequestSiegeDefenderList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
if (_castleId < 100)
{
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
@@ -49,7 +56,7 @@ public class RequestSiegeDefenderList implements IClientIncomingPacket
return;
}
- client.sendPacket(new SiegeDefenderList(castle));
+ player.sendPacket(new SiegeDefenderList(castle));
}
else
{
@@ -59,7 +66,7 @@ public class RequestSiegeDefenderList implements IClientIncomingPacket
return;
}
- client.sendPacket(new SiegeDefenderList(fort));
+ player.sendPacket(new SiegeDefenderList(fort));
}
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
index 69dcdf5a0a..34f6dec2d8 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
@@ -84,21 +84,21 @@ public class Action implements IClientIncomingPacket
// pressing e.g. pickup many times quickly would get you here
if (obj == null)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Players can't interact with objects in the other instances except from multiverse
if ((obj.getInstanceId() != player.getInstanceId()) && (player.getInstanceId() != -1))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Only GMs can directly interact with invisible characters
if ((obj instanceof Player) && (((Player) obj).getAppearance().isInvisible()) && !player.isGM())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -128,14 +128,14 @@ public class Action implements IClientIncomingPacket
{
// Invalid action detected (probably client cheating), LOGGER this
PacketLogger.warning("Character: " + player.getName() + " requested invalid action: " + _actionId);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
break;
}
}
}
else
{
- client.sendPacket(ActionFailed.STATIC_PACKET); // Actions prohibited when in trade
+ player.sendPacket(ActionFailed.STATIC_PACKET); // Actions prohibited when in trade
}
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
index 747c7b0b89..5211fde529 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
@@ -37,9 +37,14 @@ public class Appearing implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if ((player == null) || !player.isOnline())
+ if (player == null)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ return;
+ }
+
+ if (!player.isOnline())
+ {
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -48,6 +53,6 @@ public class Appearing implements IClientIncomingPacket
player.onTeleported();
}
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
index 1d7243bdb6..148e65d511 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
@@ -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;
@@ -37,6 +38,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));
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
index d5ed83cf33..a74b0930ed 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
@@ -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.AllyInfo;
@@ -31,6 +32,12 @@ public class RequestAllyInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.sendPacket(new AllyInfo(client.getPlayer()));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new AllyInfo(player));
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index 8816ee7b87..b036149454 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
@@ -72,6 +72,7 @@ public class RequestBuyItem implements IClientIncomingPacket
_count = 0;
return false;
}
+
_items[(i * 2) + 0] = itemId;
final int count = packet.readD();
@@ -80,12 +81,14 @@ public class RequestBuyItem implements IClientIncomingPacket
_count = 0;
return false;
}
+
if (count > 10000) // Count check.
{
client.getPlayer().sendMessage("You cannot buy more than 10.000 items.");
_count = 0;
return false;
}
+
_items[(i * 2) + 1] = count;
}
@@ -114,10 +117,9 @@ public class RequestBuyItem implements IClientIncomingPacket
}
final WorldObject target = player.getTarget();
- if (!player.isGM() && ((target == null // No target (ie GM Shop)
- ) || (!(target instanceof Merchant) && !(target instanceof Fisherman) && !(target instanceof MercManager) && !(target instanceof ClanHallManager) && !(target instanceof CastleChamberlain)) // Target not a merchant, fisherman or mercmanager
- || !player.isInsideRadius2D(target, Npc.INTERACTION_DISTANCE) // Distance is too far
- ))
+ if (!player.isGM() && ((target == null) // No target (ie GM Shop)
+ || (!(target instanceof Merchant) && !(target instanceof Fisherman) && !(target instanceof MercManager) && !(target instanceof ClanHallManager) && !(target instanceof CastleChamberlain)) // Target not a merchant, fisherman or mercmanager
+ || !player.isInsideRadius2D(target, Npc.INTERACTION_DISTANCE))) // Distance is too far
{
return;
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
index ed981b63f7..f5607f7fa5 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
@@ -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);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 7e35c11822..f8418e721a 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -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.ExPledgeEmblem;
@@ -38,6 +39,12 @@ public class RequestExPledgeCrestLarge implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.sendPacket(new ExPledgeEmblem(_crestId));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ExPledgeEmblem(_crestId));
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
index 4719fb2dc8..b2fe37b2ad 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -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;
@@ -34,6 +35,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));
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
index 9db17b4b27..fdb8ecc319 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
@@ -63,6 +63,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
_count = 0;
return false;
}
+
_items[i] = new ItemRequest(objectId, itemId, enchant, (int) count, price);
priceTotal += price * count;
}
@@ -76,7 +77,6 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
}
_price = (int) priceTotal;
-
return true;
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
index b5e259a520..e148f393c7 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.FortManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.network.GameClient;
@@ -41,6 +42,12 @@ public class RequestSiegeAttackerList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
if (_castleId < 100)
{
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
@@ -49,7 +56,7 @@ public class RequestSiegeAttackerList implements IClientIncomingPacket
return;
}
- client.sendPacket(new SiegeAttackerList(castle));
+ player.sendPacket(new SiegeAttackerList(castle));
}
else
{
@@ -59,7 +66,7 @@ public class RequestSiegeAttackerList implements IClientIncomingPacket
return;
}
- client.sendPacket(new SiegeAttackerList(fort));
+ player.sendPacket(new SiegeAttackerList(fort));
}
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
index 121c954ccd..5039a3e2a1 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.FortManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.network.GameClient;
@@ -41,6 +42,12 @@ public class RequestSiegeDefenderList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
if (_castleId < 100)
{
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
@@ -49,7 +56,7 @@ public class RequestSiegeDefenderList implements IClientIncomingPacket
return;
}
- client.sendPacket(new SiegeDefenderList(castle));
+ player.sendPacket(new SiegeDefenderList(castle));
}
else
{
@@ -59,7 +66,7 @@ public class RequestSiegeDefenderList implements IClientIncomingPacket
return;
}
- client.sendPacket(new SiegeDefenderList(fort));
+ player.sendPacket(new SiegeDefenderList(fort));
}
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
index a7de76689d..d1938cf7c6 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
@@ -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.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, except from multiverse
if ((obj.getInstanceId() != player.getInstanceId()) && (player.getInstanceId() != -1))
{
- 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("[C] Action: Character: " + player.getName() + " requested invalid action: " + _actionId);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
break;
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
index cdfaa128cb..129d1a52d1 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
@@ -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;
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
index c40f45d29b..822cc69db7 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
@@ -47,12 +47,13 @@ public class Appearing implements IClientIncomingPacket
{
return;
}
+
if (player.isTeleporting())
{
player.onTeleported();
}
- client.sendPacket(new UserInfo(player));
- client.sendPacket(new ExBrExtraUserInfo(player));
+ player.sendPacket(new UserInfo(player));
+ player.sendPacket(new ExBrExtraUserInfo(player));
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
index 0ea780c5b4..b47439803f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
@@ -55,7 +55,7 @@ public class BypassUserCmd implements IClientIncomingPacket
}
else
{
- handler.useUserCommand(_command, client.getPlayer());
+ handler.useUserCommand(_command, player);
}
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index d01954c1ca..1f4fa26f12 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -312,8 +312,8 @@ public class EnterWorld implements IClientIncomingPacket
}
}
- client.sendPacket(new PledgeShowMemberListAll(player.getClan(), player));
- client.sendPacket(new PledgeStatusChanged(player.getClan()));
+ player.sendPacket(new PledgeShowMemberListAll(player.getClan(), player));
+ player.sendPacket(new PledgeStatusChanged(player.getClan()));
// Residential skills support
if (player.getClan().getCastleId() > 0)
@@ -378,13 +378,13 @@ public class EnterWorld implements IClientIncomingPacket
player.getInventory().applyItemSkills();
// Send Item List
- client.sendPacket(new ItemList(player, false));
+ player.sendPacket(new ItemList(player, false));
// Send Teleport Bookmark List
- client.sendPacket(new ExGetBookMarkInfoPacket(player));
+ player.sendPacket(new ExGetBookMarkInfoPacket(player));
// Send Shortcuts
- client.sendPacket(new ShortCutInit(player));
+ player.sendPacket(new ShortCutInit(player));
// Send Action list
player.sendPacket(ExBasicActionList.STATIC_PACKET);
@@ -449,7 +449,7 @@ public class EnterWorld implements IClientIncomingPacket
// Expand Skill
player.sendPacket(new ExStorageMaxCount(player));
- client.sendPacket(new FriendList(player));
+ player.sendPacket(new FriendList(player));
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN);
sm.addString(player.getName());
for (int id : player.getFriendList())
@@ -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", "
"));
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,12 +497,12 @@ 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));
+ player.sendPacket(new SkillCoolTime(player));
for (Item i : player.getInventory().getItems())
{
if (i.isTimeLimitedItem())
@@ -568,7 +568,7 @@ public class EnterWorld implements IClientIncomingPacket
if (Config.ALLOW_MAIL && MailManager.getInstance().hasUnreadPost(player))
{
- client.sendPacket(ExNoticePostArrived.valueOf(false));
+ player.sendPacket(ExNoticePostArrived.valueOf(false));
}
if (Config.WELCOME_MESSAGE_ENABLED)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index ab8d3762f7..ed09c0d5a1 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -90,7 +90,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket
case COLLECT:
case TRANSFER:
{
- client.sendPacket(new AcquireSkillInfo(_skillType, s));
+ player.sendPacket(new AcquireSkillInfo(_skillType, s));
break;
}
case CLASS:
@@ -98,7 +98,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket
if (trainer.getTemplate().canTeach(player.getLearningClass()))
{
final int customSp = s.getCalculatedLevelUpSp(player.getClassId(), player.getLearningClass());
- client.sendPacket(new AcquireSkillInfo(_skillType, s, customSp));
+ player.sendPacket(new AcquireSkillInfo(_skillType, s, customSp));
}
break;
}
@@ -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;
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 9fd731f2b1..1a6d625273 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -101,7 +101,7 @@ public class RequestActionUse implements IClientIncomingPacket
// Don't do anything if player is dead or confused
if ((player.isFakeDeath() && (_actionId != 0)) || player.isDead() || player.isOutOfControl())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -125,7 +125,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().getId());
return;
}
@@ -200,23 +200,23 @@ public class RequestActionUse implements IClientIncomingPacket
}
if (summon.isDead())
{
- client.sendPacket(SystemMessageId.DEAD_PETS_CANNOT_BE_RETURNED_TO_THEIR_SUMMONING_ITEM);
+ player.sendPacket(SystemMessageId.DEAD_PETS_CANNOT_BE_RETURNED_TO_THEIR_SUMMONING_ITEM);
break;
}
if (summon.isAttackingNow() || summon.isInCombat() || summon.isMovementDisabled())
{
- client.sendPacket(SystemMessageId.A_PET_CANNOT_BE_UNSUMMONED_DURING_BATTLE);
+ player.sendPacket(SystemMessageId.A_PET_CANNOT_BE_UNSUMMONED_DURING_BATTLE);
break;
}
if (summon.isHungry())
{
if (summon.isPet() && !((Pet) summon).getPetData().getFood().isEmpty())
{
- client.sendPacket(SystemMessageId.YOU_MAY_NOT_RESTORE_A_HUNGRY_PET);
+ player.sendPacket(SystemMessageId.YOU_MAY_NOT_RESTORE_A_HUNGRY_PET);
}
else
{
- client.sendPacket(SystemMessageId.THE_HUNTING_HELPER_PET_CANNOT_BE_RETURNED_BECAUSE_THERE_IS_NOT_MUCH_TIME_REMAINING_UNTIL_IT_LEAVES);
+ player.sendPacket(SystemMessageId.THE_HUNTING_HELPER_PET_CANNOT_BE_RETURNED_BECAUSE_THERE_IS_NOT_MUCH_TIME_REMAINING_UNTIL_IT_LEAVES);
}
break;
}
@@ -266,7 +266,7 @@ public class RequestActionUse implements IClientIncomingPacket
{
if (player.isAlikeDead() || player.isSellingBuffs())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (player.getPrivateStoreType() != PrivateStoreType.NONE)
@@ -278,7 +278,7 @@ public class RequestActionUse implements IClientIncomingPacket
{
player.standUp();
}
- client.sendPacket(new RecipeShopManageList(player, true));
+ player.sendPacket(new RecipeShopManageList(player, true));
break;
}
case 38: // Mount/Dismount
@@ -301,7 +301,7 @@ public class RequestActionUse implements IClientIncomingPacket
}
else
{
- client.sendPacket(SystemMessageId.INVALID_TARGET);
+ player.sendPacket(SystemMessageId.INVALID_TARGET);
}
}
break;
@@ -346,7 +346,7 @@ 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.getPrivateStoreType() != PrivateStoreType.NONE)
@@ -358,7 +358,7 @@ public class RequestActionUse implements IClientIncomingPacket
{
player.standUp();
}
- client.sendPacket(new RecipeShopManageList(player, false));
+ player.sendPacket(new RecipeShopManageList(player, false));
break;
}
case 52: // Unsummon Servitor
@@ -367,7 +367,7 @@ public class RequestActionUse implements IClientIncomingPacket
{
if (summon.isAttackingNow() || summon.isInCombat())
{
- client.sendPacket(SystemMessageId.A_SERVITOR_WHOM_IS_ENGAGED_IN_BATTLE_CANNOT_BE_DE_ACTIVATED);
+ player.sendPacket(SystemMessageId.A_SERVITOR_WHOM_IS_ENGAGED_IN_BATTLE_CANNOT_BE_DE_ACTIVATED);
break;
}
summon.unSummon(player);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
index d119309567..5788f7b28b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
@@ -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,9 +35,12 @@ public class RequestAllAgitInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- if (client != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- client.sendPacket(new ExShowAgitInfo());
+ return;
}
+
+ player.sendPacket(new ExShowAgitInfo());
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
index 7ddfb434c6..44ceaa0b87 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
@@ -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,9 +35,12 @@ public class RequestAllCastleInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- if (client != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- client.sendPacket(new ExShowCastleInfo());
+ return;
}
+
+ player.sendPacket(new ExShowCastleInfo());
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
index 581e9f8131..beb5024780 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
@@ -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,9 +35,12 @@ public class RequestAllFortressInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- if (client != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- client.sendPacket(ExShowFortressInfo.STATIC_PACKET);
+ return;
}
+
+ player.sendPacket(ExShowFortressInfo.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
index 348bbc7713..9d051a99c3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
@@ -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;
@@ -37,6 +38,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));
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
index 83ffc494d5..4b817c3e70 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index ea672b97d0..43e75207a2 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
@@ -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.getKarma() > 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.getInstanceId() != target.getInstanceId()))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
merchant = (Creature) target;
@@ -118,7 +118,7 @@ public class RequestBuyItem implements IClientIncomingPacket
double baseTaxRate = 0;
if ((merchant == null) && !player.isGM() && (_listId != CUSTOM_CB_SELL_LIST))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -133,7 +133,7 @@ public class RequestBuyItem implements IClientIncomingPacket
{
if (!buyList.isNpcAllowed(merchant.getId()))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -167,7 +167,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;
}
@@ -180,7 +180,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;
}
@@ -194,7 +194,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;
}
@@ -222,14 +222,14 @@ public class RequestBuyItem implements IClientIncomingPacket
if (!player.isGM() && ((weight > Integer.MAX_VALUE) || (weight < 0) || !player.getInventory().validateWeight((int) weight)))
{
player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!player.isGM() && ((slots > Integer.MAX_VALUE) || (slots < 0) || !player.getInventory().validateCapacity((int) slots)))
{
player.sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -237,7 +237,7 @@ public class RequestBuyItem implements IClientIncomingPacket
if ((subTotal < 0) || !player.reduceAdena("Buy", subTotal, player.getLastFolkNPC(), false))
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
index 715db6bd67..c422667c75 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
@@ -83,35 +83,37 @@ public class RequestBuySeed implements IClientIncomingPacket
{
return;
}
- else if (!client.getFloodProtectors().canPerformTransaction())
+
+ if (!client.getFloodProtectors().canPerformTransaction())
{
player.sendMessage("You are buying seeds too fast!");
return;
}
- else if (_items == null)
+
+ 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.getTemplate().getParameters().getInt("manor_id", -1) != _manorId))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -125,7 +127,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 +136,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;
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
index 7cd80adde7..c3099f275d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
@@ -56,7 +56,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;
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteMacro.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteMacro.java
index 5341737d55..018f1548df 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteMacro.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteMacro.java
@@ -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;
public class RequestDeleteMacro implements IClientIncomingPacket
@@ -33,10 +34,12 @@ public class RequestDeleteMacro implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- if (client.getPlayer() == null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
return;
}
- client.getPlayer().deleteMacro(_id);
+
+ player.deleteMacro(_id);
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
index 5a3cf237c2..48148e7c31 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
@@ -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));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
index 5882d1ea46..88fd8b949d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index 5839091933..23e1cd3afc 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -204,7 +204,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
}
else
{
- client.sendPacket(new ItemList(player, true));
+ player.sendPacket(new ItemList(player, true));
}
final StatusUpdate su = new StatusUpdate(player);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDominionInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDominionInfo.java
index 16ef9e78f0..0bc11f7724 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDominionInfo.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDominionInfo.java
@@ -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.ExReplyDominionInfo;
import org.l2jmobius.gameserver.network.serverpackets.ExShowOwnthingPos;
@@ -35,7 +36,13 @@ public class RequestDominionInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.sendPacket(ExReplyDominionInfo.STATIC_PACKET);
- client.sendPacket(ExShowOwnthingPos.STATIC_PACKET);
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(ExReplyDominionInfo.STATIC_PACKET);
+ player.sendPacket(ExShowOwnthingPos.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
index ed981b63f7..f5607f7fa5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
@@ -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);
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 79427c61ea..7250a1e20a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -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.ExPledgeEmblem;
@@ -38,6 +39,12 @@ public class RequestExPledgeCrestLarge implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.sendPacket(new ExPledgeEmblem(_crestId));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ExPledgeEmblem(_crestId));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
index c55df32ab6..2b1000f445 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
index 0a4522bf64..a2667da070 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
index f98a033967..1355a122ce 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
@@ -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,14 +37,17 @@ public class RequestFortressSiegeInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- if (client != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- for (Fort fort : FortManager.getInstance().getForts())
+ return;
+ }
+
+ for (Fort fort : FortManager.getInstance().getForts())
+ {
+ if ((fort != null) && fort.getSiege().isInProgress())
{
- if ((fort != null) && fort.getSiege().isInProgress())
- {
- client.sendPacket(new ExShowFortressSiegeInfo(fort));
- }
+ player.sendPacket(new ExShowFortressSiegeInfo(fort));
}
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
index 73dd408134..1233ad294b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
@@ -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);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
index f1c10ee605..10070bbbeb 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
@@ -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;
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGmList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGmList.java
index 738dc9ae47..af59712311 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGmList.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGmList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.AdminData;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
/**
@@ -35,10 +36,12 @@ public class RequestGmList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- if (client.getPlayer() == null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
return;
}
- AdminData.getInstance().sendListToPlayer(client.getPlayer());
+
+ AdminData.getInstance().sendListToPlayer(player);
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
index c5f3deafb0..41131e90ce 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
@@ -60,7 +60,7 @@ public class RequestHennaEquip implements IClientIncomingPacket
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;
}
@@ -68,7 +68,7 @@ public class RequestHennaEquip implements IClientIncomingPacket
if (henna == null)
{
PacketLogger.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + player);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -89,7 +89,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);
}
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
index cd17a6c3a8..7253226656 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
@@ -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;
}
+
player.sendPacket(new HennaItemDrawInfo(henna, player));
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
index 703ef39e5e..7c1c9fbf6a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
@@ -52,9 +52,10 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket
if (henna == null)
{
PacketLogger.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + player);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
+
player.sendPacket(new HennaItemRemoveInfo(henna, player));
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
index 89e11ba6a9..f51eec948c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
index 8ee493f30a..0f7a8cc6ee 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
@@ -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.ItemList;
@@ -34,9 +35,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.sendPacket(new ItemList(client.getPlayer(), true));
+ return;
}
+
+ if (player.isInventoryDisabled())
+ {
+ return;
+ }
+
+ player.sendPacket(new ItemList(player, true));
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java
index 7a35a6f4cf..866dfcb72a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java
@@ -49,12 +49,12 @@ public class RequestJoinParty implements IClientIncomingPacket
public void run(GameClient client)
{
final Player requestor = client.getPlayer();
- final Player target = World.getInstance().getPlayer(_name);
if (requestor == null)
{
return;
}
+ final Player target = World.getInstance().getPlayer(_name);
if (target == null)
{
requestor.sendPacket(SystemMessageId.YOU_MUST_FIRST_SELECT_A_USER_TO_INVITE_TO_YOUR_PARTY);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
index c9f27ad24c..b09d18125e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
@@ -43,32 +43,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;
@@ -76,7 +76,7 @@ public class RequestLinkHtml implements IClientIncomingPacket
final String filename = "data/html/" + _link;
final NpcHtmlMessage msg = new NpcHtmlMessage(htmlObjectId);
- msg.setFile(actor, filename);
- client.sendPacket(msg);
+ msg.setFile(player, filename);
+ player.sendPacket(msg);
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
index ee7f865f0c..f2bb6c1413 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
@@ -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(new ExSendManorList());
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ExSendManorList());
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java
index d6075cb0ea..9d5da9e660 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java
@@ -204,11 +204,11 @@ public class RequestPackageSend implements IClientIncomingPacket
warehouse.deleteMe();
// Send updated item list to the player
- client.sendPacket(playerIU != null ? playerIU : new ItemList(player, false));
+ player.sendPacket(playerIU != null ? playerIU : new ItemList(player, false));
// Update current load status on player
final StatusUpdate su = new StatusUpdate(player);
su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad());
- client.sendPacket(su);
+ player.sendPacket(su);
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
index 787b343137..2dceac3cdf 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.Collection;
import org.l2jmobius.commons.network.PacketReader;
+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.PackageSendableList;
@@ -41,7 +42,13 @@ public class RequestPackageSendableItemList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- final Collection- items = client.getPlayer().getInventory().getAvailableItems(true, true, true);
- client.sendPacket(new PackageSendableList(items, _objectID, client.getPlayer().getAdena()));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ final Collection
- items = player.getInventory().getAvailableItems(true, true, true);
+ player.sendPacket(new PackageSendableList(items, _objectID, player.getAdena()));
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
index 1fca5b87d6..5b7ba789f3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
@@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
import org.l2jmobius.gameserver.instancemanager.MercTicketManager;
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.network.GameClient;
@@ -40,31 +41,42 @@ 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 int castleId = MercTicketManager.getInstance().getTicketCastleId(item.getId());
if (castleId > 0)
{
- 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 = (Pet) client.getPlayer().getSummon();
+ final Pet pet = (Pet) player.getSummon();
if (pet.isDead() || pet.isOutOfControl())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
index e5c09a3ad5..5ea033e30b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -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;
@@ -37,6 +38,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));
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
index 489ea28ada..f098b50a98 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
@@ -73,7 +73,7 @@ public class RequestPledgePower implements IClientIncomingPacket
}
else
{
- player.sendPacket(new ManagePledgePower(client.getPlayer().getClan(), _action, _rank));
+ player.sendPacket(new ManagePledgePower(player.getClan(), _action, _rank));
}
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
index d16cb82368..51723e8700 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
@@ -143,7 +143,7 @@ public class RequestPreviewItem implements IClientIncomingPacket
if ((_count < 1) || (_listId >= 4000000))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
index 2b28f271af..caa2639793 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
@@ -79,7 +79,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket
if (_items == null)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -125,21 +125,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());
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
index ac9c4ba6c4..28a5ffff0a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
index 024db347c5..5291e9528c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
@@ -79,7 +79,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
if (_items == null)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -125,13 +125,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;
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
index b390f5db5a..24e526120d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
@@ -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.getTemplate().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;
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
index b64136dc79..21ba9b39af 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
index 891d914e07..e30bee1ac5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
@@ -41,6 +41,6 @@ public class RequestRecipeItemMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeItemMakeInfo(_id, player));
+ player.sendPacket(new RecipeItemMakeInfo(_id, player));
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
index d7f4ab4c7d..07996c5c4a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
@@ -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;
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
index e8b8812aa7..da49fdad3b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
@@ -43,9 +43,10 @@ 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)
{
player.setPrivateStoreType(PrivateStoreType.NONE);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
index 85e67c77ed..82f12af318 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
@@ -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;
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
index 9429c64055..4828086556 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
@@ -58,7 +58,7 @@ public class RequestRefineCancel implements IClientIncomingPacket
}
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
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
index 847b056759..474540f7df 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
@@ -82,7 +82,7 @@ public class RequestRefundItem implements IClientIncomingPacket
if ((_items == null) || !player.hasRefund())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -92,7 +92,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 = (Creature) target;
@@ -100,7 +100,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;
}
@@ -113,7 +113,7 @@ public class RequestRefundItem implements IClientIncomingPacket
if ((merchant != null) && !buyList.isNpcAllowed(merchant.getId()))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -171,22 +171,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;
}
@@ -202,7 +202,7 @@ public class RequestRefundItem implements IClientIncomingPacket
// Update current load status on player
final StatusUpdate su = new StatusUpdate(player);
su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad());
- client.sendPacket(su);
- client.sendPacket(new ExBuySellList(player, buyList, true));
+ player.sendPacket(su);
+ player.sendPacket(new ExBuySellList(player, buyList, true));
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index b8e34e6ddb..18d6025de4 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
@@ -64,7 +64,7 @@ public class RequestRestart implements IClientIncomingPacket
if ((player.getActiveEnchantItemId() != Player.ID_NONE) || (player.getActiveEnchantAttrItemId() != Player.ID_NONE))
{
- client.sendPacket(RestartResponse.valueOf(false));
+ player.sendPacket(RestartResponse.valueOf(false));
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -72,7 +72,7 @@ public class RequestRestart implements IClientIncomingPacket
if (player.isLocked())
{
PacketLogger.warning("Player " + player.getName() + " tried to restart during class change.");
- client.sendPacket(RestartResponse.valueOf(false));
+ player.sendPacket(RestartResponse.valueOf(false));
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -80,14 +80,14 @@ public class RequestRestart implements IClientIncomingPacket
if (player.getPrivateStoreType() != PrivateStoreType.NONE)
{
player.sendMessage("Cannot restart while trading.");
- client.sendPacket(RestartResponse.valueOf(false));
+ player.sendPacket(RestartResponse.valueOf(false));
return;
}
if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player) && !(player.isGM() && Config.GM_RESTART_FIGHTING))
{
player.sendPacket(SystemMessageId.YOU_CANNOT_RESTART_WHILE_IN_COMBAT);
- client.sendPacket(RestartResponse.valueOf(false));
+ player.sendPacket(RestartResponse.valueOf(false));
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -99,7 +99,7 @@ public class RequestRestart implements IClientIncomingPacket
if (SevenSignsFestival.getInstance().isFestivalInitialized())
{
player.sendMessage("You cannot restart while you are a participant in a festival.");
- client.sendPacket(RestartResponse.valueOf(false));
+ player.sendPacket(RestartResponse.valueOf(false));
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -113,7 +113,7 @@ public class RequestRestart implements IClientIncomingPacket
if (!player.canLogout())
{
- client.sendPacket(RestartResponse.valueOf(false));
+ player.sendPacket(RestartResponse.valueOf(false));
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
index 393a9ca55c..9de569639b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
@@ -91,14 +91,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.getKarma() > 0))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -108,7 +108,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)
@@ -117,14 +117,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;
}
@@ -137,7 +137,7 @@ public class RequestSellItem implements IClientIncomingPacket
if ((merchant != null) && !buyList.isNpcAllowed(merchant.getId()))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
index e5c53c86d0..1cf200da52 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
@@ -58,7 +58,7 @@ public class RequestSentPost 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;
}
@@ -73,6 +73,6 @@ public class RequestSentPost implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExReplySentPost(msg));
+ player.sendPacket(new ExReplySentPost(msg));
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
index 72578e8d22..197ab07190 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
@@ -78,18 +78,23 @@ public class RequestSetCrop implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
index 7e963d44b9..7fbe851664 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
@@ -77,18 +77,23 @@ public class RequestSetSeed implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index 3b3563db4b..a3bb33c912 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
@@ -48,13 +49,19 @@ public class RequestShortCutReg implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- if ((client.getPlayer() == null) || (_page > 10) || (_page < 0))
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ if ((_page > 10) || (_page < 0))
{
return;
}
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _characterType);
- client.getPlayer().registerShortCut(sc);
- client.sendPacket(new ShortCutRegister(sc));
+ player.registerShortCut(sc);
+ player.sendPacket(new ShortCutRegister(sc));
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
index 9c73551f59..541b987e91 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
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;
/**
@@ -40,6 +41,12 @@ public class RequestShowBoard implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, client.getPlayer());
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, player);
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
index 49d28a9a03..c313f65ebf 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
@@ -20,6 +20,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CHSiegeManager;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.clanhalls.SiegableHall;
import org.l2jmobius.gameserver.network.GameClient;
@@ -42,17 +43,23 @@ public class RequestSiegeAttackerList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
if (castle != null)
{
- client.sendPacket(new SiegeAttackerList(castle));
+ player.sendPacket(new SiegeAttackerList(castle));
}
else
{
final SiegableHall hall = CHSiegeManager.getInstance().getSiegableHall(_castleId);
if (hall != null)
{
- client.sendPacket(new SiegeAttackerList(hall));
+ player.sendPacket(new SiegeAttackerList(hall));
}
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
index aaebd94461..57584a89ce 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList;
@@ -45,6 +46,13 @@ public class RequestSiegeDefenderList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new SiegeDefenderList(castle));
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
index 8ae03da07b..51c42f7b7c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
@@ -34,10 +34,12 @@ public class RequestSkillList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- final Player cha = client.getPlayer();
- if (cha != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- cha.sendSkillList();
+ return;
}
+
+ player.sendSkillList();
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
index 0713ef2e07..978fd529b6 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
@@ -47,7 +47,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
return;
}
- final Clan playerClan = client.getPlayer().getClan();
+ final Clan playerClan = player.getClan();
if (playerClan == null)
{
return;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
index 204484db56..ebdf32ccc2 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
@@ -58,7 +58,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
return;
}
- PacketLogger.info("RequestSurrenderPledgeWar by " + client.getPlayer().getClan().getName() + " with " + _pledgeName);
+ PacketLogger.info("RequestSurrenderPledgeWar by " + player.getClan().getName() + " with " + _pledgeName);
if (!playerClan.isAtWarWith(clan.getId()))
{
player.sendMessage("You aren't at war with this clan.");
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
index a5462164d1..76e8ac2a68 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket
}
player.getBuyList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgBuy(player));
+ player.sendPacket(new PrivateStoreMsgBuy(player));
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
index ac64c43c5c..d86bfc8f84 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket
}
player.getSellList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgSell(player));
+ player.sendPacket(new PrivateStoreMsgSell(player));
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
index f3078c3e52..2726f99c08 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket
}
player.getSellList().setTitle(_msg);
- client.sendPacket(new ExPrivateStoreSetWholeMsg(player));
+ player.sendPacket(new ExPrivateStoreSetWholeMsg(player));
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
index cc05b215fc..930ba564d6 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
@@ -59,7 +59,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!player.getAccessLevel().allowTransaction())
{
player.sendMessage("Transactions are disabled for your current Access Level.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
index 2f44afd3a4..9efc6e7368 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
@@ -320,7 +320,7 @@ public class UseItem implements IClientIncomingPacket
player.getInventory().setPaperdollItem(Inventory.PAPERDOLL_LHAND, item);
player.broadcastUserInfo();
// Send a Server->Client packet ItemList to this Player to update left hand equipment.
- client.sendPacket(new ItemList(player, false));
+ player.sendPacket(new ItemList(player, false));
return;
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
index a7de76689d..d1938cf7c6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
@@ -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.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, except from multiverse
if ((obj.getInstanceId() != player.getInstanceId()) && (player.getInstanceId() != -1))
{
- 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("[C] Action: Character: " + player.getName() + " requested invalid action: " + _actionId);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
break;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
index c6ea588540..acab47f316 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
@@ -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;
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
index cdfaa128cb..129d1a52d1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
@@ -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;
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
index c40f45d29b..822cc69db7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
@@ -47,12 +47,13 @@ public class Appearing implements IClientIncomingPacket
{
return;
}
+
if (player.isTeleporting())
{
player.onTeleported();
}
- client.sendPacket(new UserInfo(player));
- client.sendPacket(new ExBrExtraUserInfo(player));
+ player.sendPacket(new UserInfo(player));
+ player.sendPacket(new ExBrExtraUserInfo(player));
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
index 0ea780c5b4..b47439803f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
@@ -55,7 +55,7 @@ public class BypassUserCmd implements IClientIncomingPacket
}
else
{
- handler.useUserCommand(_command, client.getPlayer());
+ handler.useUserCommand(_command, player);
}
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 505d0f6177..473d7d7ac2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -313,8 +313,8 @@ public class EnterWorld implements IClientIncomingPacket
}
}
- client.sendPacket(new PledgeShowMemberListAll(player.getClan(), player));
- client.sendPacket(new PledgeStatusChanged(player.getClan()));
+ player.sendPacket(new PledgeShowMemberListAll(player.getClan(), player));
+ player.sendPacket(new PledgeStatusChanged(player.getClan()));
// Residential skills support
if (player.getClan().getCastleId() > 0)
@@ -384,13 +384,13 @@ public class EnterWorld implements IClientIncomingPacket
player.getInventory().applyItemSkills();
// Send Item List
- client.sendPacket(new ItemList(player, false));
+ player.sendPacket(new ItemList(player, false));
// Send Teleport Bookmark List
- client.sendPacket(new ExGetBookMarkInfoPacket(player));
+ player.sendPacket(new ExGetBookMarkInfoPacket(player));
// Send Shortcuts
- client.sendPacket(new ShortCutInit(player));
+ player.sendPacket(new ShortCutInit(player));
// Send Action list
player.sendPacket(ExBasicActionList.STATIC_PACKET);
@@ -455,7 +455,7 @@ public class EnterWorld implements IClientIncomingPacket
// Expand Skill
player.sendPacket(new ExStorageMaxCount(player));
- client.sendPacket(new FriendList(player));
+ player.sendPacket(new FriendList(player));
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN);
sm.addString(player.getName());
for (int id : player.getFriendList())
@@ -484,14 +484,14 @@ public class EnterWorld implements IClientIncomingPacket
notice.replace("%clan_name%", player.getClan().getName());
notice.replace("%notice_text%", player.getClan().getNotice().replaceAll("\r\n", "
"));
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));
}
}
@@ -503,17 +503,17 @@ 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));
+ player.sendPacket(new SkillCoolTime(player));
if (Config.NEVIT_ENABLED)
{
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
}
- client.sendPacket(new ExShowContactList(player));
+ player.sendPacket(new ExShowContactList(player));
for (Item i : player.getInventory().getItems())
{
if (i.isTimeLimitedItem())
@@ -579,7 +579,7 @@ public class EnterWorld implements IClientIncomingPacket
if (Config.ALLOW_MAIL && MailManager.getInstance().hasUnreadPost(player))
{
- client.sendPacket(ExNoticePostArrived.valueOf(false));
+ player.sendPacket(ExNoticePostArrived.valueOf(false));
}
if (Config.WELCOME_MESSAGE_ENABLED)
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index ab8d3762f7..ed09c0d5a1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -90,7 +90,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket
case COLLECT:
case TRANSFER:
{
- client.sendPacket(new AcquireSkillInfo(_skillType, s));
+ player.sendPacket(new AcquireSkillInfo(_skillType, s));
break;
}
case CLASS:
@@ -98,7 +98,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket
if (trainer.getTemplate().canTeach(player.getLearningClass()))
{
final int customSp = s.getCalculatedLevelUpSp(player.getClassId(), player.getLearningClass());
- client.sendPacket(new AcquireSkillInfo(_skillType, s, customSp));
+ player.sendPacket(new AcquireSkillInfo(_skillType, s, customSp));
}
break;
}
@@ -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;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 4e38c70fbd..693ab357c5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -104,7 +104,7 @@ public class RequestActionUse implements IClientIncomingPacket
// Don't do anything if player is dead or confused
if ((player.isFakeDeath() && (_actionId != 0)) || player.isDead() || player.isOutOfControl())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -128,7 +128,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().getId());
return;
}
@@ -203,23 +203,23 @@ public class RequestActionUse implements IClientIncomingPacket
}
if (summon.isDead())
{
- client.sendPacket(SystemMessageId.DEAD_PETS_CANNOT_BE_RETURNED_TO_THEIR_SUMMONING_ITEM);
+ player.sendPacket(SystemMessageId.DEAD_PETS_CANNOT_BE_RETURNED_TO_THEIR_SUMMONING_ITEM);
break;
}
if (summon.isAttackingNow() || summon.isInCombat() || summon.isMovementDisabled())
{
- client.sendPacket(SystemMessageId.A_PET_CANNOT_BE_UNSUMMONED_DURING_BATTLE);
+ player.sendPacket(SystemMessageId.A_PET_CANNOT_BE_UNSUMMONED_DURING_BATTLE);
break;
}
if (summon.isHungry())
{
if (summon.isPet() && !((Pet) summon).getPetData().getFood().isEmpty())
{
- client.sendPacket(SystemMessageId.YOU_MAY_NOT_RESTORE_A_HUNGRY_PET);
+ player.sendPacket(SystemMessageId.YOU_MAY_NOT_RESTORE_A_HUNGRY_PET);
}
else
{
- client.sendPacket(SystemMessageId.THE_HUNTING_HELPER_PET_CANNOT_BE_RETURNED_BECAUSE_THERE_IS_NOT_MUCH_TIME_REMAINING_UNTIL_IT_LEAVES);
+ player.sendPacket(SystemMessageId.THE_HUNTING_HELPER_PET_CANNOT_BE_RETURNED_BECAUSE_THERE_IS_NOT_MUCH_TIME_REMAINING_UNTIL_IT_LEAVES);
}
break;
}
@@ -269,7 +269,7 @@ public class RequestActionUse implements IClientIncomingPacket
{
if (player.isAlikeDead() || player.isSellingBuffs())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (player.getPrivateStoreType() != PrivateStoreType.NONE)
@@ -281,7 +281,7 @@ public class RequestActionUse implements IClientIncomingPacket
{
player.standUp();
}
- client.sendPacket(new RecipeShopManageList(player, true));
+ player.sendPacket(new RecipeShopManageList(player, true));
break;
}
case 38: // Mount/Dismount
@@ -304,7 +304,7 @@ public class RequestActionUse implements IClientIncomingPacket
}
else
{
- client.sendPacket(SystemMessageId.INVALID_TARGET);
+ player.sendPacket(SystemMessageId.INVALID_TARGET);
}
}
break;
@@ -349,7 +349,7 @@ 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.getPrivateStoreType() != PrivateStoreType.NONE)
@@ -361,7 +361,7 @@ public class RequestActionUse implements IClientIncomingPacket
{
player.standUp();
}
- client.sendPacket(new RecipeShopManageList(player, false));
+ player.sendPacket(new RecipeShopManageList(player, false));
break;
}
case 52: // Unsummon Servitor
@@ -370,7 +370,7 @@ public class RequestActionUse implements IClientIncomingPacket
{
if (summon.isAttackingNow() || summon.isInCombat())
{
- client.sendPacket(SystemMessageId.A_SERVITOR_WHOM_IS_ENGAGED_IN_BATTLE_CANNOT_BE_DE_ACTIVATED);
+ player.sendPacket(SystemMessageId.A_SERVITOR_WHOM_IS_ENGAGED_IN_BATTLE_CANNOT_BE_DE_ACTIVATED);
break;
}
summon.unSummon(player);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
index d119309567..5788f7b28b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
@@ -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,9 +35,12 @@ public class RequestAllAgitInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- if (client != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- client.sendPacket(new ExShowAgitInfo());
+ return;
}
+
+ player.sendPacket(new ExShowAgitInfo());
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
index 7ddfb434c6..44ceaa0b87 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
@@ -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,9 +35,12 @@ public class RequestAllCastleInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- if (client != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- client.sendPacket(new ExShowCastleInfo());
+ return;
}
+
+ player.sendPacket(new ExShowCastleInfo());
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
index 581e9f8131..beb5024780 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
@@ -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,9 +35,12 @@ public class RequestAllFortressInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- if (client != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- client.sendPacket(ExShowFortressInfo.STATIC_PACKET);
+ return;
}
+
+ player.sendPacket(ExShowFortressInfo.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
index 348bbc7713..9d051a99c3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
@@ -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;
@@ -37,6 +38,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));
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
index 83ffc494d5..4b817c3e70 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index d880d8aae2..7a3a305dd8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
@@ -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.getKarma() > 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.getInstanceId() != target.getInstanceId()))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
merchant = (Creature) target;
@@ -118,7 +118,7 @@ public class RequestBuyItem implements IClientIncomingPacket
double baseTaxRate = 0;
if ((merchant == null) && !player.isGM() && (_listId != CUSTOM_CB_SELL_LIST))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -133,7 +133,7 @@ public class RequestBuyItem implements IClientIncomingPacket
{
if (!buyList.isNpcAllowed(merchant.getId()))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -167,7 +167,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;
}
@@ -180,7 +180,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;
}
@@ -194,7 +194,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;
}
@@ -222,14 +222,14 @@ public class RequestBuyItem implements IClientIncomingPacket
if (!player.isGM() && ((weight > Integer.MAX_VALUE) || (weight < 0) || !player.getInventory().validateWeight((int) weight)))
{
player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!player.isGM() && ((slots > Integer.MAX_VALUE) || (slots < 0) || !player.getInventory().validateCapacity((int) slots)))
{
player.sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -237,7 +237,7 @@ public class RequestBuyItem implements IClientIncomingPacket
if ((subTotal < 0) || !player.reduceAdena("Buy", subTotal, player.getLastFolkNPC(), false))
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
index 715db6bd67..c422667c75 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
@@ -83,35 +83,37 @@ public class RequestBuySeed implements IClientIncomingPacket
{
return;
}
- else if (!client.getFloodProtectors().canPerformTransaction())
+
+ if (!client.getFloodProtectors().canPerformTransaction())
{
player.sendMessage("You are buying seeds too fast!");
return;
}
- else if (_items == null)
+
+ 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.getTemplate().getParameters().getInt("manor_id", -1) != _manorId))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -125,7 +127,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 +136,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;
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
index 7cd80adde7..c3099f275d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
@@ -56,7 +56,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;
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteMacro.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteMacro.java
index 5341737d55..018f1548df 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteMacro.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteMacro.java
@@ -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;
public class RequestDeleteMacro implements IClientIncomingPacket
@@ -33,10 +34,12 @@ public class RequestDeleteMacro implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- if (client.getPlayer() == null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
return;
}
- client.getPlayer().deleteMacro(_id);
+
+ player.deleteMacro(_id);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
index 5a3cf237c2..48148e7c31 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
@@ -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));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
index 5882d1ea46..88fd8b949d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index 5839091933..23e1cd3afc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -204,7 +204,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
}
else
{
- client.sendPacket(new ItemList(player, true));
+ player.sendPacket(new ItemList(player, true));
}
final StatusUpdate su = new StatusUpdate(player);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDominionInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDominionInfo.java
index 16ef9e78f0..0bc11f7724 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDominionInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDominionInfo.java
@@ -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.ExReplyDominionInfo;
import org.l2jmobius.gameserver.network.serverpackets.ExShowOwnthingPos;
@@ -35,7 +36,13 @@ public class RequestDominionInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.sendPacket(ExReplyDominionInfo.STATIC_PACKET);
- client.sendPacket(ExShowOwnthingPos.STATIC_PACKET);
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(ExReplyDominionInfo.STATIC_PACKET);
+ player.sendPacket(ExShowOwnthingPos.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
index ed981b63f7..f5607f7fa5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
@@ -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);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 79427c61ea..7250a1e20a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -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.ExPledgeEmblem;
@@ -38,6 +39,12 @@ public class RequestExPledgeCrestLarge implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.sendPacket(new ExPledgeEmblem(_crestId));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ExPledgeEmblem(_crestId));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
index c55df32ab6..2b1000f445 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
index 0a4522bf64..a2667da070 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
index f98a033967..1355a122ce 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
@@ -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,14 +37,17 @@ public class RequestFortressSiegeInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- if (client != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- for (Fort fort : FortManager.getInstance().getForts())
+ return;
+ }
+
+ for (Fort fort : FortManager.getInstance().getForts())
+ {
+ if ((fort != null) && fort.getSiege().isInProgress())
{
- if ((fort != null) && fort.getSiege().isInProgress())
- {
- client.sendPacket(new ExShowFortressSiegeInfo(fort));
- }
+ player.sendPacket(new ExShowFortressSiegeInfo(fort));
}
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
index 73dd408134..1233ad294b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
@@ -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);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
index f1c10ee605..10070bbbeb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
@@ -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;
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGmList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGmList.java
index 738dc9ae47..af59712311 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGmList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGmList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.xml.AdminData;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
/**
@@ -35,10 +36,12 @@ public class RequestGmList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- if (client.getPlayer() == null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
return;
}
- AdminData.getInstance().sendListToPlayer(client.getPlayer());
+
+ AdminData.getInstance().sendListToPlayer(player);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
index c5f3deafb0..41131e90ce 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
@@ -60,7 +60,7 @@ public class RequestHennaEquip implements IClientIncomingPacket
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;
}
@@ -68,7 +68,7 @@ public class RequestHennaEquip implements IClientIncomingPacket
if (henna == null)
{
PacketLogger.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + player);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -89,7 +89,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);
}
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
index cd17a6c3a8..7253226656 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
@@ -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;
}
+
player.sendPacket(new HennaItemDrawInfo(henna, player));
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
index 703ef39e5e..7c1c9fbf6a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
@@ -52,9 +52,10 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket
if (henna == null)
{
PacketLogger.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + player);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
+
player.sendPacket(new HennaItemRemoveInfo(henna, player));
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
index 89e11ba6a9..f51eec948c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
index 8ee493f30a..0f7a8cc6ee 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
@@ -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.ItemList;
@@ -34,9 +35,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.sendPacket(new ItemList(client.getPlayer(), true));
+ return;
}
+
+ if (player.isInventoryDisabled())
+ {
+ return;
+ }
+
+ player.sendPacket(new ItemList(player, true));
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java
index 7a35a6f4cf..866dfcb72a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java
@@ -49,12 +49,12 @@ public class RequestJoinParty implements IClientIncomingPacket
public void run(GameClient client)
{
final Player requestor = client.getPlayer();
- final Player target = World.getInstance().getPlayer(_name);
if (requestor == null)
{
return;
}
+ final Player target = World.getInstance().getPlayer(_name);
if (target == null)
{
requestor.sendPacket(SystemMessageId.YOU_MUST_FIRST_SELECT_A_USER_TO_INVITE_TO_YOUR_PARTY);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
index c9f27ad24c..b09d18125e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
@@ -43,32 +43,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;
@@ -76,7 +76,7 @@ public class RequestLinkHtml implements IClientIncomingPacket
final String filename = "data/html/" + _link;
final NpcHtmlMessage msg = new NpcHtmlMessage(htmlObjectId);
- msg.setFile(actor, filename);
- client.sendPacket(msg);
+ msg.setFile(player, filename);
+ player.sendPacket(msg);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
index ee7f865f0c..f2bb6c1413 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
@@ -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(new ExSendManorList());
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ExSendManorList());
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java
index d6075cb0ea..9d5da9e660 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java
@@ -204,11 +204,11 @@ public class RequestPackageSend implements IClientIncomingPacket
warehouse.deleteMe();
// Send updated item list to the player
- client.sendPacket(playerIU != null ? playerIU : new ItemList(player, false));
+ player.sendPacket(playerIU != null ? playerIU : new ItemList(player, false));
// Update current load status on player
final StatusUpdate su = new StatusUpdate(player);
su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad());
- client.sendPacket(su);
+ player.sendPacket(su);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
index 787b343137..2dceac3cdf 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.Collection;
import org.l2jmobius.commons.network.PacketReader;
+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.PackageSendableList;
@@ -41,7 +42,13 @@ public class RequestPackageSendableItemList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- final Collection- items = client.getPlayer().getInventory().getAvailableItems(true, true, true);
- client.sendPacket(new PackageSendableList(items, _objectID, client.getPlayer().getAdena()));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ final Collection
- items = player.getInventory().getAvailableItems(true, true, true);
+ player.sendPacket(new PackageSendableList(items, _objectID, player.getAdena()));
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
index 3d8bc6386c..d66206f3eb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
@@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
import org.l2jmobius.gameserver.instancemanager.MercTicketManager;
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.network.GameClient;
@@ -41,37 +42,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 int castleId = MercTicketManager.getInstance().getTicketCastleId(item.getId());
if (castleId > 0)
{
- 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 = (Pet) client.getPlayer().getSummon();
+ final Pet pet = (Pet) player.getSummon();
if (pet.isDead() || pet.isOutOfControl())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (pet.isUncontrollable())
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_ALLOWED_TO_ENTER_THE_PARTY_ROOM);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_ALLOWED_TO_ENTER_THE_PARTY_ROOM);
return;
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
index e5c09a3ad5..5ea033e30b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -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;
@@ -37,6 +38,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));
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
index 489ea28ada..f098b50a98 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
@@ -73,7 +73,7 @@ public class RequestPledgePower implements IClientIncomingPacket
}
else
{
- player.sendPacket(new ManagePledgePower(client.getPlayer().getClan(), _action, _rank));
+ player.sendPacket(new ManagePledgePower(player.getClan(), _action, _rank));
}
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
index d16cb82368..51723e8700 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
@@ -143,7 +143,7 @@ public class RequestPreviewItem implements IClientIncomingPacket
if ((_count < 1) || (_listId >= 4000000))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
index 2b28f271af..caa2639793 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
@@ -79,7 +79,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket
if (_items == null)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -125,21 +125,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());
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
index ac9c4ba6c4..28a5ffff0a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
index 024db347c5..5291e9528c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
@@ -79,7 +79,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
if (_items == null)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -125,13 +125,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;
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
index b390f5db5a..24e526120d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
@@ -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.getTemplate().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;
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
index b64136dc79..21ba9b39af 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
index 891d914e07..e30bee1ac5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
@@ -41,6 +41,6 @@ public class RequestRecipeItemMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeItemMakeInfo(_id, player));
+ player.sendPacket(new RecipeItemMakeInfo(_id, player));
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
index d7f4ab4c7d..07996c5c4a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
@@ -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;
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
index e8b8812aa7..da49fdad3b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
@@ -43,9 +43,10 @@ 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)
{
player.setPrivateStoreType(PrivateStoreType.NONE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
index 85e67c77ed..82f12af318 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
@@ -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;
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
index 9429c64055..4828086556 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
@@ -58,7 +58,7 @@ public class RequestRefineCancel implements IClientIncomingPacket
}
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
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
index 31374e04ae..b3e2507571 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
@@ -82,7 +82,7 @@ public class RequestRefundItem implements IClientIncomingPacket
if ((_items == null) || !player.hasRefund())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -92,7 +92,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 = (Creature) target;
@@ -100,7 +100,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;
}
@@ -113,7 +113,7 @@ public class RequestRefundItem implements IClientIncomingPacket
if ((merchant != null) && !buyList.isNpcAllowed(merchant.getId()))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -171,22 +171,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;
}
@@ -202,7 +202,7 @@ public class RequestRefundItem implements IClientIncomingPacket
// Update current load status on player
final StatusUpdate su = new StatusUpdate(player);
su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad());
- client.sendPacket(su);
- client.sendPacket(new ExBuySellList(player, true));
+ player.sendPacket(su);
+ player.sendPacket(new ExBuySellList(player, true));
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index a6b076f572..267c4c8969 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
@@ -64,7 +64,7 @@ public class RequestRestart implements IClientIncomingPacket
if ((player.getActiveEnchantItemId() != Player.ID_NONE) || (player.getActiveEnchantAttrItemId() != Player.ID_NONE))
{
- client.sendPacket(RestartResponse.valueOf(false));
+ player.sendPacket(RestartResponse.valueOf(false));
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -72,7 +72,7 @@ public class RequestRestart implements IClientIncomingPacket
if (player.isLocked())
{
PacketLogger.warning("Player " + player.getName() + " tried to restart during class change.");
- client.sendPacket(RestartResponse.valueOf(false));
+ player.sendPacket(RestartResponse.valueOf(false));
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -80,14 +80,14 @@ public class RequestRestart implements IClientIncomingPacket
if (player.getPrivateStoreType() != PrivateStoreType.NONE)
{
player.sendMessage("Cannot restart while trading.");
- client.sendPacket(RestartResponse.valueOf(false));
+ player.sendPacket(RestartResponse.valueOf(false));
return;
}
if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player) && !(player.isGM() && Config.GM_RESTART_FIGHTING))
{
player.sendPacket(SystemMessageId.YOU_CANNOT_RESTART_WHILE_IN_COMBAT);
- client.sendPacket(RestartResponse.valueOf(false));
+ player.sendPacket(RestartResponse.valueOf(false));
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -99,7 +99,7 @@ public class RequestRestart implements IClientIncomingPacket
if (SevenSignsFestival.getInstance().isFestivalInitialized())
{
player.sendMessage("You cannot restart while you are a participant in a festival.");
- client.sendPacket(RestartResponse.valueOf(false));
+ player.sendPacket(RestartResponse.valueOf(false));
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -113,7 +113,7 @@ public class RequestRestart implements IClientIncomingPacket
if (!player.canLogout())
{
- client.sendPacket(RestartResponse.valueOf(false));
+ player.sendPacket(RestartResponse.valueOf(false));
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
index 041320aa09..6d7e87a529 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
@@ -91,14 +91,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.getKarma() > 0))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -108,7 +108,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)
@@ -117,14 +117,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;
}
@@ -137,7 +137,7 @@ public class RequestSellItem implements IClientIncomingPacket
if ((merchant != null) && !buyList.isNpcAllowed(merchant.getId()))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
index e5c53c86d0..1cf200da52 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
@@ -58,7 +58,7 @@ public class RequestSentPost 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;
}
@@ -73,6 +73,6 @@ public class RequestSentPost implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExReplySentPost(msg));
+ player.sendPacket(new ExReplySentPost(msg));
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
index 72578e8d22..197ab07190 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
@@ -78,18 +78,23 @@ public class RequestSetCrop implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
index 7e963d44b9..7fbe851664 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
@@ -77,18 +77,23 @@ public class RequestSetSeed implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index 3b3563db4b..a3bb33c912 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
@@ -48,13 +49,19 @@ public class RequestShortCutReg implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- if ((client.getPlayer() == null) || (_page > 10) || (_page < 0))
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ if ((_page > 10) || (_page < 0))
{
return;
}
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _characterType);
- client.getPlayer().registerShortCut(sc);
- client.sendPacket(new ShortCutRegister(sc));
+ player.registerShortCut(sc);
+ player.sendPacket(new ShortCutRegister(sc));
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
index 9c73551f59..541b987e91 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
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;
/**
@@ -40,6 +41,12 @@ public class RequestShowBoard implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, client.getPlayer());
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, player);
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
index 49d28a9a03..c313f65ebf 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
@@ -20,6 +20,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CHSiegeManager;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.clanhalls.SiegableHall;
import org.l2jmobius.gameserver.network.GameClient;
@@ -42,17 +43,23 @@ public class RequestSiegeAttackerList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
if (castle != null)
{
- client.sendPacket(new SiegeAttackerList(castle));
+ player.sendPacket(new SiegeAttackerList(castle));
}
else
{
final SiegableHall hall = CHSiegeManager.getInstance().getSiegableHall(_castleId);
if (hall != null)
{
- client.sendPacket(new SiegeAttackerList(hall));
+ player.sendPacket(new SiegeAttackerList(hall));
}
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
index aaebd94461..57584a89ce 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList;
@@ -45,6 +46,13 @@ public class RequestSiegeDefenderList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new SiegeDefenderList(castle));
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
index 8ae03da07b..51c42f7b7c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
@@ -34,10 +34,12 @@ public class RequestSkillList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- final Player cha = client.getPlayer();
- if (cha != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- cha.sendSkillList();
+ return;
}
+
+ player.sendSkillList();
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
index 0713ef2e07..978fd529b6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
@@ -47,7 +47,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
return;
}
- final Clan playerClan = client.getPlayer().getClan();
+ final Clan playerClan = player.getClan();
if (playerClan == null)
{
return;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
index 204484db56..ebdf32ccc2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
@@ -58,7 +58,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
return;
}
- PacketLogger.info("RequestSurrenderPledgeWar by " + client.getPlayer().getClan().getName() + " with " + _pledgeName);
+ PacketLogger.info("RequestSurrenderPledgeWar by " + player.getClan().getName() + " with " + _pledgeName);
if (!playerClan.isAtWarWith(clan.getId()))
{
player.sendMessage("You aren't at war with this clan.");
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
index 24f08e8e53..1d61bdbf07 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
@@ -96,8 +96,8 @@ public class RequestVoteNew implements IClientIncomingPacket
sm.addPcName(player);
target.sendPacket(sm);
- client.sendPacket(new UserInfo(player));
- client.sendPacket(new ExBrExtraUserInfo(player));
+ player.sendPacket(new UserInfo(player));
+ player.sendPacket(new ExBrExtraUserInfo(player));
target.broadcastUserInfo();
if (Config.NEVIT_ENABLED)
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
index a5462164d1..76e8ac2a68 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket
}
player.getBuyList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgBuy(player));
+ player.sendPacket(new PrivateStoreMsgBuy(player));
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
index ac64c43c5c..d86bfc8f84 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket
}
player.getSellList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgSell(player));
+ player.sendPacket(new PrivateStoreMsgSell(player));
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
index f3078c3e52..2726f99c08 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket
}
player.getSellList().setTitle(_msg);
- client.sendPacket(new ExPrivateStoreSetWholeMsg(player));
+ player.sendPacket(new ExPrivateStoreSetWholeMsg(player));
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
index cc05b215fc..930ba564d6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
@@ -59,7 +59,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!player.getAccessLevel().allowTransaction())
{
player.sendMessage("Transactions are disabled for your current Access Level.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
index 2f44afd3a4..9efc6e7368 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
@@ -320,7 +320,7 @@ public class UseItem implements IClientIncomingPacket
player.getInventory().setPaperdollItem(Inventory.PAPERDOLL_LHAND, item);
player.broadcastUserInfo();
// Send a Server->Client packet ItemList to this Player to update left hand equipment.
- client.sendPacket(new ItemList(player, false));
+ player.sendPacket(new ItemList(player, false));
return;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
index ef3f4acc18..25ba232162 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
@@ -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;
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
index c6ea588540..acab47f316 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
index cdfaa128cb..129d1a52d1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
index ba988591d0..370aeba2c5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
@@ -51,6 +51,6 @@ public class Appearing implements IClientIncomingPacket
player.onTeleported();
}
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
index 0ea780c5b4..b47439803f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
@@ -55,7 +55,7 @@ public class BypassUserCmd implements IClientIncomingPacket
}
else
{
- handler.useUserCommand(_command, client.getPlayer());
+ handler.useUserCommand(_command, player);
}
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
index a3236b0d83..43c0172038 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
@@ -65,12 +65,12 @@ public class CannotMoveAnymore implements IClientIncomingPacket
// PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+
// " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ());
// StopMove smwl = new StopMove(player);
- // client.getPlayer().sendPacket(smwl);
- // client.getPlayer().broadcastPacket(smwl);
+ // cplayer.getPlayer().sendPacket(smwl);
+ // cplayer.getPlayer().broadcastPacket(smwl);
//
- // StopRotation sr = new StopRotation(client.getPlayer(),
+ // StopRotation sr = new StopRotation(cplayer.getPlayer(),
// _heading);
- // client.getPlayer().sendPacket(sr);
- // client.getPlayer().broadcastPacket(sr);
+ // cplayer.getPlayer().sendPacket(sr);
+ // cplayer.getPlayer().broadcastPacket(sr);
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index eadad51b74..52d445c335 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -321,16 +321,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);
@@ -443,7 +443,7 @@ public class EnterWorld implements IClientIncomingPacket
player.sendPacket(new ExStorageMaxCount(player));
// Friend list
- client.sendPacket(new L2FriendList(player));
+ player.sendPacket(new L2FriendList(player));
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN);
sm.addString(player.getName());
for (int id : player.getFriendList())
@@ -471,14 +471,14 @@ public class EnterWorld implements IClientIncomingPacket
notice.replace("%clan_name%", player.getClan().getName());
notice.replace("%notice_text%", player.getClan().getNotice().replaceAll("\r\n", "
"));
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));
}
}
@@ -490,13 +490,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())
@@ -559,7 +559,7 @@ public class EnterWorld implements IClientIncomingPacket
{
if (MailManager.getInstance().hasUnreadPost(player))
{
- client.sendPacket(ExNoticePostArrived.valueOf(false));
+ player.sendPacket(ExNoticePostArrived.valueOf(false));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 4bb789645a..218e629395 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -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;
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 8078d0c10e..6ac4cc7ca0 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -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:
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
index 65c69620a0..94911328a2 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
@@ -41,6 +41,7 @@ public class RequestAlchemySkillList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExAlchemySkillList(player));
+
+ player.sendPacket(new ExAlchemySkillList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
index 49bb9c2285..fb6b18d662 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
index c6f8fe2045..b6f8d4fb9e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
index 5669f5691a..beb5024780 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
index 7ee18d42b3..3e864837f8 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
index 2baf948bc7..4dc52e2648 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
index e1c584d405..3ce51314b3 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
@@ -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_SERVITOR);
+ player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_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_SERVITOR);
+ player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_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_AND_THEREFORE_CANNOT_USE_THE_AUTOMATIC_USE_FUNCTION);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR_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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
index 83ffc494d5..4b817c3e70 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index ce3d851f06..9c2d96e99c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
@@ -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,8 +253,8 @@ 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));
player.sendPacket(SystemMessageId.EXCHANGE_IS_SUCCESSFUL);
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
index d77d8eba6a..f841f306a1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
index 4534c39c18..b65ad7c589 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
index f1ddb94865..5ae334f854 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
index 21710a1eb0..dd69523f80 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
@@ -96,6 +96,6 @@ public class RequestConfirmSiegeWaitingList implements IClientIncomingPacket
}
// Update the defender list
- client.sendPacket(new SiegeDefenderList(castle));
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
index dc81cb23dc..b2f53bed92 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
index 03d610fe78..1491cb1bfb 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
@@ -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();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
index 36d36097c1..5fd67b8759 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
@@ -42,6 +42,6 @@ public class RequestCursedWeaponList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExCursedWeaponList());
+ player.sendPacket(new ExCursedWeaponList());
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
index 573a4f7950..193c436d7e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
index ce21646986..6d59e89936 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
index 5882d1ea46..88fd8b949d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index 71bb657bf9..0984f53c0b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -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();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
index 224a640ef5..5227396561 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
index ed981b63f7..f5607f7fa5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index 7b866345de..fbff78ff4c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -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:
@@ -194,7 +194,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)
@@ -259,8 +259,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)
@@ -294,13 +294,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()))
@@ -320,11 +320,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)
@@ -356,7 +356,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)
@@ -399,7 +399,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))
@@ -409,11 +409,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)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
index 4652f15ddc..22d6a0efa5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
index 9565b3e5ca..f6b8d47c50 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
@@ -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);
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
index 68bb180db1..7b967d8931 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -82,8 +82,8 @@ 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));
+ // cplayer.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
index 35fe136cbd..54a540188c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
@@ -55,6 +55,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket
{
return;
}
+
player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
index 6ec3504089..79088e0c3a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
@@ -47,6 +47,6 @@ public class RequestExFriendListExtended implements IClientIncomingPacket
return;
}
- client.sendPacket(new FriendList(player));
+ player.sendPacket(new FriendList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
index 2e0c2154ac..150caed567 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
@@ -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()));
}
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
index 8851aef463..00bb331778 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
@@ -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 + " !!");
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 16f28d5d04..3ee3f7a9aa 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
index 1b20e2e248..f35c069743 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
index c55df32ab6..2b1000f445 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
index 3842d82eb9..f6b2724012 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
index f868d0e26f..056262b4ab 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
@@ -48,6 +48,6 @@ public class RequestExShowContactList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExShowContactList(player));
+ player.sendPacket(new ExShowContactList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
index 2d9f0456f4..1589ff8175 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
index 0a4522bf64..a2667da070 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
index b2f32527da..1355a122ce 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
index 73dd408134..1233ad294b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
@@ -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);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
index f1c10ee605..10070bbbeb 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
@@ -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;
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
index a6ede07bb0..71e028b3be 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
index 04abcbce46..719d0b6fc8 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
@@ -61,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket
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;
}
@@ -69,7 +69,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;
}
@@ -91,7 +91,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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
index a7c019d65d..7253226656 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
index ff96a400c9..79db1768e6 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
index 89e11ba6a9..f51eec948c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
index 25d004a7b7..2240af9a6e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
@@ -41,6 +41,7 @@ public class RequestHennaRemoveList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new HennaRemoveList(player));
+
+ player.sendPacket(new HennaRemoveList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
index 1c1fc6d8c2..bc9710d465 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
@@ -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()));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
index baeef8fd01..c5e78e39bc 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
@@ -40,6 +40,7 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExInzoneWaiting(player));
+
+ player.sendPacket(new ExInzoneWaiting(player));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
index 12e0b41dda..1597a7ab37 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
index 99965602f9..cb5c08f036 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
@@ -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)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
index 226f085fb0..9793d6e1d8 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
@@ -44,7 +44,7 @@ public class RequestKeyMapping implements IClientIncomingPacket
if (Config.STORE_UI_SETTINGS)
{
- client.sendPacket(new ExUISetting(player));
+ player.sendPacket(new ExUISetting(player));
}
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
index ada67e190c..2cdc066ead 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
index bffa403c8a..96b1664122 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
@@ -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));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
index 7b4703d69c..9fcb5e9736 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index b9c3900403..ec1f903d13 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -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_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_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;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
index 9372163aea..769c2af9e2 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
@@ -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
{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
index 9149ce1284..8e7c3ee9fe 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
@@ -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));
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
index e1f9061af7..2d4de9a500 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
@@ -44,6 +44,7 @@ public class RequestPackageSendableItemList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PackageSendableList(player, _objectId));
+
+ player.sendPacket(new PackageSendableList(player, _objectId));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
index e8d53e1a19..e4ddcee7e8 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
index a9fac87c7e..ff9183a3fe 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
@@ -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_SUPPORT_4GAME_COM);
+ player.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_ON_HTTPS_SUPPORT_4GAME_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);
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
index b7f1ab30a7..7d148f2d91 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
index 77725a6557..3e43762127 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
index e3ec88ca13..34af0251ca 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
@@ -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())));
}
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
index 76d591b14c..a4f9ba1784 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
index 3459b04c80..4c077a4c9e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
@@ -64,6 +64,7 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PledgeReceiveMemberInfo(member));
+
+ player.sendPacket(new PledgeReceiveMemberInfo(member));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
index e380ce68c8..464ad76c9f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
@@ -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)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
index 8fabbb1f4a..beee5121dd 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
@@ -52,6 +52,6 @@ public class RequestPledgeRecruitBoardDetail implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
+ player.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
index 1d0458db08..0d0d86f7db 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
index fe019fe6d6..dde18f32a4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
@@ -44,6 +44,6 @@ public class RequestPledgeWaitingList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeWaitingList(_clanId));
+ player.sendPacket(new ExPledgeWaitingList(_clanId));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
index add0aa2f01..618c787a17 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
@@ -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));
}
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
index d66024cc52..a6bebf3a42 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
index 8668dfbb61..624591a6f3 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
index 44bbd9d34c..a038920c8b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
index 94958bc4fe..2ded12e55d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
@@ -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());
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
index 2d616f2e94..bb2f0e8e6f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
index 8ab3d4962f..243e4a3674 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
@@ -87,7 +87,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
if (_items == null)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -128,13 +128,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;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
index bee0568e03..365e1f598f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
index b64136dc79..21ba9b39af 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
index 8badb24c5f..6ffcc69313 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
@@ -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();
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
index 461f09492a..06d51160dd 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
index 5e7754bcbe..71dc3aa8da 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
index 891d914e07..e30bee1ac5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
@@ -41,6 +41,6 @@ public class RequestRecipeItemMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeItemMakeInfo(_id, player));
+ player.sendPacket(new RecipeItemMakeInfo(_id, player));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
index d8e5ef166c..fd6b816fde 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
index d96459999d..b82a2048c7 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
@@ -54,6 +54,6 @@ public class RequestRecipeShopMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeShopItemInfo(shop, _recipeId));
+ player.sendPacket(new RecipeShopItemInfo(shop, _recipeId));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
index 39546dc93f..afc1ee3ecc 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
index 85e67c77ed..82f12af318 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index 1bb51eff9d..87a0574a9f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -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))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
index 4da834c30d..3d01f1e525 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
@@ -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);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
index 1632df189f..9c0c240bd4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
index b3e709c5db..1a7c1ebc0f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
@@ -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)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index 662058f4d8..dfda7319fc 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
index 7b82b33d56..af5f6876b7 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
index e5c53c86d0..1cf200da52 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
@@ -58,7 +58,7 @@ public class RequestSentPost 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;
}
@@ -73,6 +73,6 @@ public class RequestSentPost implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExReplySentPost(msg));
+ player.sendPacket(new ExReplySentPost(msg));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
index 99aec4ba86..05a414f453 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
@@ -47,6 +47,7 @@ public class RequestSentPostList implements IClientIncomingPacket
// player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
// return;
// }
- client.sendPacket(new ExShowSentPostList(player.getObjectId()));
+
+ player.sendPacket(new ExShowSentPostList(player.getObjectId()));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
index 72578e8d22..197ab07190 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
@@ -78,18 +78,23 @@ public class RequestSetCrop implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
index fe5ea44de4..a3e3ded0a3 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
@@ -77,18 +77,23 @@ public class RequestSetSeed implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index b30eb95f41..bf7d98030a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
@@ -50,13 +51,19 @@ public class RequestShortCutReg implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- if ((client.getPlayer() == null) || (_page > 19) || (_page < 0))
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ if ((_page > 19) || (_page < 0))
{
return;
}
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
- client.getPlayer().registerShortCut(sc);
- client.sendPacket(new ShortCutRegister(sc));
+ player.registerShortCut(sc);
+ player.sendPacket(new ShortCutRegister(sc));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
index 1053bb74c1..fc2725daa7 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
@@ -44,6 +44,6 @@ public class RequestShowBeautyList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExResponseBeautyList(player, _type));
+ player.sendPacket(new ExResponseBeautyList(player, _type));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
index 9c73551f59..541b987e91 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
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;
/**
@@ -40,6 +41,12 @@ public class RequestShowBoard implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, client.getPlayer());
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, player);
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
index 162de17679..f74c3abf4d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
@@ -41,6 +41,7 @@ public class RequestShowMiniMap implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ShowMiniMap(0));
+
+ player.sendPacket(new ShowMiniMap(0));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
index 097e8f5d30..f055ad8a57 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeAttackerList;
@@ -40,9 +41,17 @@ public class RequestSiegeAttackerList implements IClientIncomingPacket
public void run(GameClient client)
{
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
- if (castle != null)
+ if (castle == null)
{
- client.sendPacket(new SiegeAttackerList(castle));
+ return;
}
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeAttackerList(castle));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
index 6df5163c58..a8d4c9f6d0 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList;
@@ -44,6 +45,13 @@ public class RequestSiegeDefenderList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new SiegeDefenderList(castle));
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
index 8ae03da07b..51c42f7b7c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
@@ -34,10 +34,12 @@ public class RequestSkillList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- final Player cha = client.getPlayer();
- if (cha != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- cha.sendSkillList();
+ return;
}
+
+ player.sendSkillList();
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
index ac3c6e1b62..2deae58393 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
@@ -60,52 +60,52 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
if ((clanDeclaringWar.getLevel() < 3) || (clanDeclaringWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaringWar.getWarCount() >= 30)
{
- client.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final Clan clanDeclaredWar = ClanTable.getInstance().getClanByName(_pledgeName);
if (clanDeclaredWar == null)
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar == clanDeclaringWar)
{
- client.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaringWar.getAllyId() == clanDeclaredWar.getAllyId()) && (clanDeclaringWar.getAllyId() != 0))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaredWar.getLevel() < 3) || (clanDeclaredWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis())
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -116,15 +116,15 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_T_DECLARE_A_WAR_BECAUSE_THE_21_DAY_PERIOD_HASN_T_PASSED_AFTER_A_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ALREADY_BEEN_AT_WAR_WITH_THE_S1_CLAN_5_DAYS_MUST_PASS_BEFORE_YOU_CAN_DECLARE_WAR_AGAIN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
index 47c39e2e70..e8c4b1a0e1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
@@ -60,7 +60,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if ((member != null) && member.isOnline() && member.getPlayer().isInCombat())
{
player.sendPacket(SystemMessageId.A_CEASE_FIRE_DURING_A_CLAN_WAR_CAN_NOT_BE_CALLED_WHILE_MEMBERS_OF_YOUR_CLAN_ARE_ENGAGED_IN_BATTLE);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -69,13 +69,13 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if (targetClan == null)
{
player.sendMessage("No such clan.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -85,14 +85,14 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_NOT_DECLARED_A_CLAN_WAR_AGAINST_THE_CLAN_S1);
sm.addString(targetClan.getName());
player.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{
player.sendPacket(SystemMessageId.YOU_CANNOT_DECLARE_DEFEAT_AS_IT_HAS_NOT_BEEN_7_DAYS_SINCE_STARTING_A_CLAN_WAR_WITH_CLAN_S1);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
index d7d4d2b449..c13d46b2bb 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
@@ -65,7 +65,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
// The English system message say weapon, but it's applied to any equipped item.
if (player.isAttackingNow() || player.isCastingNow())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
return;
}
@@ -89,13 +89,13 @@ public class RequestUnEquipItem implements IClientIncomingPacket
if (!player.getInventory().canManipulateWithItemId(item.getId()))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
if (item.isWeapon() && item.getWeaponItem().isForceEquip() && !player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
@@ -117,7 +117,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
}
sm.addItemName(unequippedItem);
- client.sendPacket(sm);
+ player.sendPacket(sm);
final InventoryUpdate iu = new InventoryUpdate();
iu.addItems(unequipped);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
index 0b38bcb67c..9e95fb93e1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
@@ -51,28 +51,28 @@ public class RequestVoteNew implements IClientIncomingPacket
{
if (object == null)
{
- client.sendPacket(SystemMessageId.SELECT_TARGET);
+ player.sendPacket(SystemMessageId.SELECT_TARGET);
}
else if (object.isFakePlayer() && FakePlayerData.getInstance().isTalkable(object.getName()))
{
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addString(FakePlayerData.getInstance().getProperName(object.getName()));
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
player.setRecomLeft(player.getRecomLeft() - 1);
- client.sendPacket(new UserInfo(player));
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new UserInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
}
else
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
}
return;
}
@@ -85,19 +85,19 @@ public class RequestVoteNew implements IClientIncomingPacket
if (target == player)
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
return;
}
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
if (target.getRecomHave() >= 255)
{
- client.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
+ player.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
return;
}
@@ -106,16 +106,16 @@ public class RequestVoteNew implements IClientIncomingPacket
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addPcName(target);
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_BEEN_RECOMMENDED_BY_C1);
sm.addPcName(player);
target.sendPacket(sm);
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
target.broadcastUserInfo();
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
target.sendPacket(new ExVoteSystemInfo(target));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
index 05261ba813..0e3300d03c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
@@ -67,12 +67,12 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
}
else if ((player.getWeightPenalty() >= 3) || !player.isInventoryUnder90(false))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
return;
}
else if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
return;
}
@@ -101,11 +101,11 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
if (player.getPremiumItemList().isEmpty())
{
- client.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
+ player.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
}
else
{
- client.sendPacket(new ExGetPremiumItemList(player));
+ player.sendPacket(new ExGetPremiumItemList(player));
}
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
index c3f29fe9c9..d23918130b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
@@ -48,17 +48,17 @@ public class RequestWithdrawalPledge 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.isClanLeader())
{
- client.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
+ player.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
return;
}
if (player.isInCombat())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
return;
}
@@ -72,7 +72,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
// Remove the Player From the Member list
clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(player.getName()));
clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
- client.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
- client.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
+ player.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
+ player.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
index 7cdde1c7bb..db6358f368 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
@@ -150,14 +150,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
// Item Max Limit Check
if (!warehouse.validateCapacity(slots))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
+ player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
return;
}
// Check if enough adena and charge the fee
if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, manager, false))
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
return;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
index a5462164d1..76e8ac2a68 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket
}
player.getBuyList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgBuy(player));
+ player.sendPacket(new PrivateStoreMsgBuy(player));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
index ac64c43c5c..d86bfc8f84 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket
}
player.getSellList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgSell(player));
+ player.sendPacket(new PrivateStoreMsgSell(player));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
index f3078c3e52..2726f99c08 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket
}
player.getSellList().setTitle(_msg);
- client.sendPacket(new ExPrivateStoreSetWholeMsg(player));
+ player.sendPacket(new ExPrivateStoreSetWholeMsg(player));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
index 8e7e6f9b2d..1022c9061d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
@@ -73,7 +73,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!player.getAccessLevel().allowTransaction())
{
player.sendMessage("Transactions are disabled for your current Access Level.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -84,8 +84,8 @@ public class TradeRequest implements IClientIncomingPacket
{
if (!effect.checkCondition(BotReportTable.TRADE_ACTION_BLOCK_ID))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -104,7 +104,7 @@ public class TradeRequest implements IClientIncomingPacket
// and the following system message is sent to acting player.
if (target.getObjectId() == player.getObjectId())
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
return;
}
@@ -141,7 +141,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!target.isPlayer())
{
- client.sendPacket(SystemMessageId.INVALID_TARGET);
+ player.sendPacket(SystemMessageId.INVALID_TARGET);
return;
}
@@ -161,8 +161,8 @@ public class TradeRequest implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_IS_CURRENTLY_BEING_INVESTIGATED);
sm.addString(partner.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -189,13 +189,13 @@ public class TradeRequest implements IClientIncomingPacket
if ((player.getPrivateStoreType() != PrivateStoreType.NONE) || (partner.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;
}
if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
+ player.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
return;
}
@@ -204,7 +204,7 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
@@ -218,13 +218,13 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
if (player.calculateDistance3D(partner) > 150)
{
- client.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
+ player.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
return;
}
@@ -232,6 +232,6 @@ public class TradeRequest implements IClientIncomingPacket
partner.sendPacket(new SendTradeRequest(player.getObjectId()));
sm = new SystemMessage(SystemMessageId.YOU_HAVE_REQUESTED_A_TRADE_WITH_C1);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
index afbd8b0b76..3ccf45b47f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
@@ -44,6 +44,6 @@ public class RequestExCancelShape_Shifting_Item implements IClientIncomingPacket
}
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
index 055dc2dd1e..6d286b4894 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
@@ -60,7 +60,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -83,7 +83,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (!extractItem.getItem().isAppearanceable())
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -113,15 +113,15 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,20 +129,20 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -154,6 +154,6 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
}
request.setAppearanceExtractItem(extractItem);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
index f7aa0f3047..1c8eaa09c2 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
@@ -55,8 +55,8 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -65,35 +65,35 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -101,7 +101,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -112,6 +112,6 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
return;
}
- client.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
+ player.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 1de9056bda..2a6d3e9bb9 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -64,8 +64,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -74,36 +74,36 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -111,14 +111,14 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!appearanceStone.checkConditions(player, targetItem))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,56 +129,56 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
{
if (extractItem == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getOwnerId() != player.getObjectId())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!extractItem.getItem().isAppearanceable())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -189,21 +189,21 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final long cost = appearanceStone.getCost();
if (cost > player.getAdena())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (stone.getCount() < 1L)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((appearanceStone.getType() == AppearanceType.NORMAL) && (inventory.destroyItem(getClass().getSimpleName(), extractItem, 1, player, this) == null))
{
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -276,7 +276,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
player.sendInventoryUpdate(iu);
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
+ player.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
if (targetItem.isEquipped())
{
player.broadcastUserInfo();
@@ -288,8 +288,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
slots.addComponentType(slot);
}
}
- client.sendPacket(slots);
+ player.sendPacket(slots);
}
- client.sendPacket(new ExAdenaInvenCount(player));
+ player.sendPacket(new ExAdenaInvenCount(player));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
index b1da943024..1747f88e01 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
@@ -65,8 +65,8 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket
// attempting to destroy item
if (player.getInventory().destroyItemByItemId("ChangeAttribute", _consumeItemId, 1, player, item) == null)
{
- client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
- client.sendPacket(ExChangeAttributeFail.STATIC);
+ player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
+ player.sendPacket(ExChangeAttributeFail.STATIC);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH);
return;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
index a5001f4346..e79211ec85 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
@@ -52,26 +52,26 @@ public class RequestCommissionBuyInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
if (!player.isInventoryUnder80(false) || (player.getWeightPenalty() >= 3))
{
- client.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
return;
}
final CommissionItem commissionItem = ItemCommissionManager.getInstance().getCommissionItem(_commissionId);
if (commissionItem != null)
{
- client.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
+ player.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
}
else
{
- client.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
}
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
index aa794d2d96..16dec35e6f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
@@ -49,7 +49,7 @@ public class RequestCommissionBuyItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
index 4f7141c09d..8a3ff5c955 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
@@ -50,7 +50,7 @@ public class RequestCommissionDelete implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
index 1a7edbbaac..01005d24c1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
@@ -50,18 +50,18 @@ public class RequestCommissionInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
final Item itemInstance = player.getInventory().getItemByObjectId(_itemObjectId);
if (itemInstance != null)
{
- client.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
+ player.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
}
else
{
- client.sendPacket(ExResponseCommissionInfo.EMPTY);
+ player.sendPacket(ExResponseCommissionInfo.EMPTY);
}
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
index 1ad79b9031..57fd69ec8d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
@@ -62,7 +62,7 @@ public class RequestCommissionList implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
index 6b2f96e87d..7eb252c475 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
@@ -95,7 +95,7 @@ public class RequestCommissionRegister implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
index 1e826566da..b19aefac8d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
@@ -45,7 +45,7 @@ public class RequestCommissionRegisteredItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
index 5c587137cb..a0b4c518d2 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
@@ -46,10 +46,10 @@ public class RequestCommissionRegistrableItemList implements IClientIncomingPack
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
- client.sendPacket(new ExResponseCommissionItemList(player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(player.getInventory().getAvailableItems(false, false, false)));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
index 670f9a29ed..398352c0f7 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = new CompoundRequest(player);
if (!player.addRequest(request))
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
@@ -77,7 +79,7 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
final Item itemOne = request.getItemOne();
if (itemOne == null)
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -87,11 +89,11 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItems.isEmpty())
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
- client.sendPacket(ExEnchantOneOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
index 315704e4e5..b8f98ff7ba 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
@@ -51,23 +51,25 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -77,14 +79,14 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -93,10 +95,10 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
- client.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
index 0dbe123787..72a0b34bfc 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemOne();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
request.setItemOne(0);
- client.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
index 5743927fa1..4a05f6c92b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemTwo();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
request.setItemTwo(0);
- client.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
index c0eb970566..70e94532db 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
return;
}
@@ -78,7 +80,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -86,7 +88,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -96,7 +98,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -113,11 +115,11 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item item = player.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true);
if (success)
{
- client.sendPacket(new ExEnchantSucess(item.getId()));
+ player.sendPacket(new ExEnchantSucess(item.getId()));
}
else
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
index e4e46a5271..d5165c28ec 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
@@ -65,6 +65,7 @@ public class RequestCrystallizeEstimate 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);
@@ -73,28 +74,28 @@ public class RequestCrystallizeEstimate 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);
return;
}
final Item item = player.getInventory().getItemByObjectId(_objectId);
if ((item == null) || item.isShadowItem() || item.isTimeLimitedItem() || item.isHeroItem() || (!Config.ALT_ALLOW_AUGMENT_DESTROY && item.isAugmented()))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
PacketLogger.warning(player + ": tried to crystallize " + item.getItem());
return;
}
@@ -167,8 +168,8 @@ public class RequestCrystallizeEstimate 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;
}
@@ -177,11 +178,11 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket
if ((crystallizationRewards != null) && !crystallizationRewards.isEmpty())
{
player.setInCrystallize(true);
- client.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
+ player.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
}
else
{
- client.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
+ player.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
}
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
index 584b6e3e4e..a0b7c23c20 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
@@ -40,9 +40,11 @@ public class RequestFriendDetailInfo implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExFriendDetailInfo(player, _name));
+ return;
}
+
+ player.sendPacket(new ExFriendDetailInfo(player, _name));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
index 82fa3a651a..e9e5d90e84 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
@@ -48,6 +48,7 @@ public class RequestMenteeWaitingList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
+
+ player.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
index 7c22e266ca..20ec347a77 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
@@ -41,6 +41,7 @@ public class RequestMentorList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExMentorList(player));
+
+ player.sendPacket(new ExMentorList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
index 4023b0cff0..618f6dc7ed 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
@@ -37,9 +37,11 @@ public class RequestBRGamePoint implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExBRGamePoint(player));
+ return;
}
+
+ player.sendPacket(new ExBRGamePoint(player));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
index de0446cfd8..7ac78cfe4f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
@@ -34,7 +34,7 @@ public class RequestBRRecentProductList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- // Player player = client.getPlayer();
+ // Player player = cplayer.getPlayer();
// TODO: Implement it.
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
index d248722d3d..8cb6a581bc 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.vip;
import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.vip.ReceiveVipLuckyGameInfo;
@@ -32,6 +33,12 @@ public class RequestVipLuckGameInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.sendPacket(new ReceiveVipLuckyGameInfo(client.getPlayer()));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ReceiveVipLuckyGameInfo(player));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipProductList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipProductList.java
index b2b90dd2ae..0636bc6b36 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipProductList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipProductList.java
@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.vip;
import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.vip.ReceiveVipProductList;
@@ -32,6 +33,12 @@ public class RequestVipProductList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.sendPacket(new ReceiveVipProductList(client.getPlayer()));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ReceiveVipProductList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
index 6813c75ed2..f8d602624b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
@@ -34,7 +34,6 @@ public class ExRestartClient implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.EX_RESTART_CLIENT.writeId(packet);
-
return true;
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
index 89678c1836..4378479707 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
- * A packet used to draw points and lines on client.
+ * A packet used to draw points and lines on cplayer.
* Note: Names in points and lines are bugged they will appear even when not looking at them.
* @author NosBit
*/
@@ -62,7 +62,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -76,7 +76,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -88,7 +88,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -100,7 +100,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
@@ -110,7 +110,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -124,7 +124,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -136,7 +136,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -148,7 +148,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
index ef3f4acc18..25ba232162 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
@@ -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;
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
index c6ea588540..acab47f316 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
index cdfaa128cb..129d1a52d1 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
index ba988591d0..370aeba2c5 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
@@ -51,6 +51,6 @@ public class Appearing implements IClientIncomingPacket
player.onTeleported();
}
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
index 0ea780c5b4..b47439803f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
@@ -55,7 +55,7 @@ public class BypassUserCmd implements IClientIncomingPacket
}
else
{
- handler.useUserCommand(_command, client.getPlayer());
+ handler.useUserCommand(_command, player);
}
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
index a3236b0d83..43c0172038 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
@@ -65,12 +65,12 @@ public class CannotMoveAnymore implements IClientIncomingPacket
// PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+
// " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ());
// StopMove smwl = new StopMove(player);
- // client.getPlayer().sendPacket(smwl);
- // client.getPlayer().broadcastPacket(smwl);
+ // cplayer.getPlayer().sendPacket(smwl);
+ // cplayer.getPlayer().broadcastPacket(smwl);
//
- // StopRotation sr = new StopRotation(client.getPlayer(),
+ // StopRotation sr = new StopRotation(cplayer.getPlayer(),
// _heading);
- // client.getPlayer().sendPacket(sr);
- // client.getPlayer().broadcastPacket(sr);
+ // cplayer.getPlayer().sendPacket(sr);
+ // cplayer.getPlayer().broadcastPacket(sr);
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 69fd802a87..4cb7516ea4 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -321,16 +321,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);
@@ -443,7 +443,7 @@ public class EnterWorld implements IClientIncomingPacket
player.sendPacket(new ExStorageMaxCount(player));
// Friend list
- client.sendPacket(new L2FriendList(player));
+ player.sendPacket(new L2FriendList(player));
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN);
sm.addString(player.getName());
for (int id : player.getFriendList())
@@ -471,14 +471,14 @@ public class EnterWorld implements IClientIncomingPacket
notice.replace("%clan_name%", player.getClan().getName());
notice.replace("%notice_text%", player.getClan().getNotice().replaceAll("\r\n", "
"));
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));
}
}
@@ -490,13 +490,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())
@@ -559,7 +559,7 @@ public class EnterWorld implements IClientIncomingPacket
{
if (MailManager.getInstance().hasUnreadPost(player))
{
- client.sendPacket(ExNoticePostArrived.valueOf(false));
+ player.sendPacket(ExNoticePostArrived.valueOf(false));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 4bb789645a..218e629395 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -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;
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 8078d0c10e..6ac4cc7ca0 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -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:
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
index 65c69620a0..94911328a2 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
@@ -41,6 +41,7 @@ public class RequestAlchemySkillList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExAlchemySkillList(player));
+
+ player.sendPacket(new ExAlchemySkillList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
index 49bb9c2285..fb6b18d662 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
index c6f8fe2045..b6f8d4fb9e 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
index 5669f5691a..beb5024780 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
index 7ee18d42b3..3e864837f8 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
index 2baf948bc7..4dc52e2648 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
index e1c584d405..3ce51314b3 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
@@ -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_SERVITOR);
+ player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_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_SERVITOR);
+ player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_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_AND_THEREFORE_CANNOT_USE_THE_AUTOMATIC_USE_FUNCTION);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR_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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
index 83ffc494d5..4b817c3e70 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index ce3d851f06..9c2d96e99c 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
@@ -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,8 +253,8 @@ 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));
player.sendPacket(SystemMessageId.EXCHANGE_IS_SUCCESSFUL);
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
index d77d8eba6a..f841f306a1 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
index 4534c39c18..b65ad7c589 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
index f1ddb94865..5ae334f854 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
index 21710a1eb0..dd69523f80 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
@@ -96,6 +96,6 @@ public class RequestConfirmSiegeWaitingList implements IClientIncomingPacket
}
// Update the defender list
- client.sendPacket(new SiegeDefenderList(castle));
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
index dc81cb23dc..b2f53bed92 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
index 03d610fe78..1491cb1bfb 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
@@ -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();
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
index 36d36097c1..5fd67b8759 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
@@ -42,6 +42,6 @@ public class RequestCursedWeaponList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExCursedWeaponList());
+ player.sendPacket(new ExCursedWeaponList());
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
index 573a4f7950..193c436d7e 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
index ce21646986..6d59e89936 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
index 5882d1ea46..88fd8b949d 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index 71bb657bf9..0984f53c0b 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -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();
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
index 224a640ef5..5227396561 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
index ed981b63f7..f5607f7fa5 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index 7b866345de..fbff78ff4c 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -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:
@@ -194,7 +194,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)
@@ -259,8 +259,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)
@@ -294,13 +294,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()))
@@ -320,11 +320,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)
@@ -356,7 +356,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)
@@ -399,7 +399,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))
@@ -409,11 +409,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)
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
index 4652f15ddc..22d6a0efa5 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
index 9565b3e5ca..f6b8d47c50 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
@@ -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);
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
index 68bb180db1..7b967d8931 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -82,8 +82,8 @@ 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));
+ // cplayer.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
index 35fe136cbd..54a540188c 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
@@ -55,6 +55,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket
{
return;
}
+
player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
index 6ec3504089..79088e0c3a 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
@@ -47,6 +47,6 @@ public class RequestExFriendListExtended implements IClientIncomingPacket
return;
}
- client.sendPacket(new FriendList(player));
+ player.sendPacket(new FriendList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
index 2e0c2154ac..150caed567 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
@@ -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()));
}
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
index 8851aef463..00bb331778 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
@@ -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 + " !!");
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 16f28d5d04..3ee3f7a9aa 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
index 1b20e2e248..f35c069743 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
index c55df32ab6..2b1000f445 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
index 3842d82eb9..f6b2724012 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
index f868d0e26f..056262b4ab 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
@@ -48,6 +48,6 @@ public class RequestExShowContactList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExShowContactList(player));
+ player.sendPacket(new ExShowContactList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
index 2d9f0456f4..1589ff8175 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
index 0a4522bf64..a2667da070 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
index b2f32527da..1355a122ce 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
index 73dd408134..1233ad294b 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
@@ -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);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
index f1c10ee605..10070bbbeb 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
@@ -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;
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
index a6ede07bb0..71e028b3be 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
index 04abcbce46..719d0b6fc8 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
@@ -61,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket
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;
}
@@ -69,7 +69,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;
}
@@ -91,7 +91,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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
index a7c019d65d..7253226656 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
index ff96a400c9..79db1768e6 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
index 89e11ba6a9..f51eec948c 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
index 25d004a7b7..2240af9a6e 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
@@ -41,6 +41,7 @@ public class RequestHennaRemoveList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new HennaRemoveList(player));
+
+ player.sendPacket(new HennaRemoveList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
index 1c1fc6d8c2..bc9710d465 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
@@ -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()));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
index d46ef778d4..f9e67ea1ed 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
@@ -43,6 +43,7 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExInzoneWaiting(player, _hide));
+
+ player.sendPacket(new ExInzoneWaiting(player, _hide));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
index 12e0b41dda..1597a7ab37 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
index 99965602f9..cb5c08f036 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
@@ -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)
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
index 226f085fb0..9793d6e1d8 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
@@ -44,7 +44,7 @@ public class RequestKeyMapping implements IClientIncomingPacket
if (Config.STORE_UI_SETTINGS)
{
- client.sendPacket(new ExUISetting(player));
+ player.sendPacket(new ExUISetting(player));
}
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
index ada67e190c..2cdc066ead 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
index bffa403c8a..96b1664122 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
@@ -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));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
index 7b4703d69c..9fcb5e9736 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index b9c3900403..ec1f903d13 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -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_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_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;
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
index 9372163aea..769c2af9e2 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
@@ -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
{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
index 9149ce1284..8e7c3ee9fe 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
@@ -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));
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
index e1f9061af7..2d4de9a500 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
@@ -44,6 +44,7 @@ public class RequestPackageSendableItemList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PackageSendableList(player, _objectId));
+
+ player.sendPacket(new PackageSendableList(player, _objectId));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
index e8d53e1a19..e4ddcee7e8 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
index a9fac87c7e..ff9183a3fe 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
@@ -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_SUPPORT_4GAME_COM);
+ player.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_ON_HTTPS_SUPPORT_4GAME_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);
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
index b7f1ab30a7..7d148f2d91 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
index 77725a6557..3e43762127 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
index e3ec88ca13..34af0251ca 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
@@ -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())));
}
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
index 76d591b14c..a4f9ba1784 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
index 3459b04c80..4c077a4c9e 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
@@ -64,6 +64,7 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PledgeReceiveMemberInfo(member));
+
+ player.sendPacket(new PledgeReceiveMemberInfo(member));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
index e380ce68c8..464ad76c9f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
@@ -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)
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
index 8fabbb1f4a..beee5121dd 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
@@ -52,6 +52,6 @@ public class RequestPledgeRecruitBoardDetail implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
+ player.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
index 1d0458db08..0d0d86f7db 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
index fe019fe6d6..dde18f32a4 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
@@ -44,6 +44,6 @@ public class RequestPledgeWaitingList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeWaitingList(_clanId));
+ player.sendPacket(new ExPledgeWaitingList(_clanId));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
index add0aa2f01..618c787a17 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
@@ -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));
}
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
index d66024cc52..a6bebf3a42 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
index 8668dfbb61..624591a6f3 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
index 44bbd9d34c..a038920c8b 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
index 94958bc4fe..2ded12e55d 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
@@ -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());
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
index 2d616f2e94..bb2f0e8e6f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
index 8ab3d4962f..243e4a3674 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
@@ -87,7 +87,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
if (_items == null)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -128,13 +128,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;
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
index bee0568e03..365e1f598f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
index b64136dc79..21ba9b39af 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
index 8badb24c5f..6ffcc69313 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
@@ -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();
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
index 461f09492a..06d51160dd 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
index 5e7754bcbe..71dc3aa8da 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
index 891d914e07..e30bee1ac5 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
@@ -41,6 +41,6 @@ public class RequestRecipeItemMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeItemMakeInfo(_id, player));
+ player.sendPacket(new RecipeItemMakeInfo(_id, player));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
index d8e5ef166c..fd6b816fde 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
index d96459999d..b82a2048c7 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
@@ -54,6 +54,6 @@ public class RequestRecipeShopMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeShopItemInfo(shop, _recipeId));
+ player.sendPacket(new RecipeShopItemInfo(shop, _recipeId));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
index 39546dc93f..afc1ee3ecc 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
index 85e67c77ed..82f12af318 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index 1bb51eff9d..87a0574a9f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -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))
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
index 4da834c30d..3d01f1e525 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
@@ -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);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
index 1632df189f..9c0c240bd4 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
index b3e709c5db..1a7c1ebc0f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
@@ -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)
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index 662058f4d8..dfda7319fc 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
index 7b82b33d56..af5f6876b7 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
index e5c53c86d0..1cf200da52 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
@@ -58,7 +58,7 @@ public class RequestSentPost 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;
}
@@ -73,6 +73,6 @@ public class RequestSentPost implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExReplySentPost(msg));
+ player.sendPacket(new ExReplySentPost(msg));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
index 99aec4ba86..05a414f453 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
@@ -47,6 +47,7 @@ public class RequestSentPostList implements IClientIncomingPacket
// player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
// return;
// }
- client.sendPacket(new ExShowSentPostList(player.getObjectId()));
+
+ player.sendPacket(new ExShowSentPostList(player.getObjectId()));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
index 72578e8d22..197ab07190 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
@@ -78,18 +78,23 @@ public class RequestSetCrop implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
index fe5ea44de4..a3e3ded0a3 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
@@ -77,18 +77,23 @@ public class RequestSetSeed implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index b30eb95f41..bf7d98030a 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
@@ -50,13 +51,19 @@ public class RequestShortCutReg implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- if ((client.getPlayer() == null) || (_page > 19) || (_page < 0))
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ if ((_page > 19) || (_page < 0))
{
return;
}
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
- client.getPlayer().registerShortCut(sc);
- client.sendPacket(new ShortCutRegister(sc));
+ player.registerShortCut(sc);
+ player.sendPacket(new ShortCutRegister(sc));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
index 1053bb74c1..fc2725daa7 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
@@ -44,6 +44,6 @@ public class RequestShowBeautyList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExResponseBeautyList(player, _type));
+ player.sendPacket(new ExResponseBeautyList(player, _type));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
index 9c73551f59..541b987e91 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
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;
/**
@@ -40,6 +41,12 @@ public class RequestShowBoard implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, client.getPlayer());
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, player);
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
index 162de17679..f74c3abf4d 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
@@ -41,6 +41,7 @@ public class RequestShowMiniMap implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ShowMiniMap(0));
+
+ player.sendPacket(new ShowMiniMap(0));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
index 097e8f5d30..f055ad8a57 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeAttackerList;
@@ -40,9 +41,17 @@ public class RequestSiegeAttackerList implements IClientIncomingPacket
public void run(GameClient client)
{
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
- if (castle != null)
+ if (castle == null)
{
- client.sendPacket(new SiegeAttackerList(castle));
+ return;
}
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeAttackerList(castle));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
index 6df5163c58..a8d4c9f6d0 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList;
@@ -44,6 +45,13 @@ public class RequestSiegeDefenderList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new SiegeDefenderList(castle));
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
index 8ae03da07b..51c42f7b7c 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
@@ -34,10 +34,12 @@ public class RequestSkillList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- final Player cha = client.getPlayer();
- if (cha != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- cha.sendSkillList();
+ return;
}
+
+ player.sendSkillList();
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
index ac3c6e1b62..2deae58393 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
@@ -60,52 +60,52 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
if ((clanDeclaringWar.getLevel() < 3) || (clanDeclaringWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaringWar.getWarCount() >= 30)
{
- client.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final Clan clanDeclaredWar = ClanTable.getInstance().getClanByName(_pledgeName);
if (clanDeclaredWar == null)
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar == clanDeclaringWar)
{
- client.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaringWar.getAllyId() == clanDeclaredWar.getAllyId()) && (clanDeclaringWar.getAllyId() != 0))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaredWar.getLevel() < 3) || (clanDeclaredWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis())
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -116,15 +116,15 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_T_DECLARE_A_WAR_BECAUSE_THE_21_DAY_PERIOD_HASN_T_PASSED_AFTER_A_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ALREADY_BEEN_AT_WAR_WITH_THE_S1_CLAN_5_DAYS_MUST_PASS_BEFORE_YOU_CAN_DECLARE_WAR_AGAIN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
index 47c39e2e70..e8c4b1a0e1 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
@@ -60,7 +60,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if ((member != null) && member.isOnline() && member.getPlayer().isInCombat())
{
player.sendPacket(SystemMessageId.A_CEASE_FIRE_DURING_A_CLAN_WAR_CAN_NOT_BE_CALLED_WHILE_MEMBERS_OF_YOUR_CLAN_ARE_ENGAGED_IN_BATTLE);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -69,13 +69,13 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if (targetClan == null)
{
player.sendMessage("No such clan.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -85,14 +85,14 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_NOT_DECLARED_A_CLAN_WAR_AGAINST_THE_CLAN_S1);
sm.addString(targetClan.getName());
player.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{
player.sendPacket(SystemMessageId.YOU_CANNOT_DECLARE_DEFEAT_AS_IT_HAS_NOT_BEEN_7_DAYS_SINCE_STARTING_A_CLAN_WAR_WITH_CLAN_S1);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
index d7d4d2b449..c13d46b2bb 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
@@ -65,7 +65,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
// The English system message say weapon, but it's applied to any equipped item.
if (player.isAttackingNow() || player.isCastingNow())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
return;
}
@@ -89,13 +89,13 @@ public class RequestUnEquipItem implements IClientIncomingPacket
if (!player.getInventory().canManipulateWithItemId(item.getId()))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
if (item.isWeapon() && item.getWeaponItem().isForceEquip() && !player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
@@ -117,7 +117,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
}
sm.addItemName(unequippedItem);
- client.sendPacket(sm);
+ player.sendPacket(sm);
final InventoryUpdate iu = new InventoryUpdate();
iu.addItems(unequipped);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
index 0b38bcb67c..9e95fb93e1 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
@@ -51,28 +51,28 @@ public class RequestVoteNew implements IClientIncomingPacket
{
if (object == null)
{
- client.sendPacket(SystemMessageId.SELECT_TARGET);
+ player.sendPacket(SystemMessageId.SELECT_TARGET);
}
else if (object.isFakePlayer() && FakePlayerData.getInstance().isTalkable(object.getName()))
{
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addString(FakePlayerData.getInstance().getProperName(object.getName()));
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
player.setRecomLeft(player.getRecomLeft() - 1);
- client.sendPacket(new UserInfo(player));
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new UserInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
}
else
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
}
return;
}
@@ -85,19 +85,19 @@ public class RequestVoteNew implements IClientIncomingPacket
if (target == player)
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
return;
}
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
if (target.getRecomHave() >= 255)
{
- client.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
+ player.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
return;
}
@@ -106,16 +106,16 @@ public class RequestVoteNew implements IClientIncomingPacket
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addPcName(target);
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_BEEN_RECOMMENDED_BY_C1);
sm.addPcName(player);
target.sendPacket(sm);
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
target.broadcastUserInfo();
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
target.sendPacket(new ExVoteSystemInfo(target));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
index 05261ba813..0e3300d03c 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
@@ -67,12 +67,12 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
}
else if ((player.getWeightPenalty() >= 3) || !player.isInventoryUnder90(false))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
return;
}
else if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
return;
}
@@ -101,11 +101,11 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
if (player.getPremiumItemList().isEmpty())
{
- client.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
+ player.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
}
else
{
- client.sendPacket(new ExGetPremiumItemList(player));
+ player.sendPacket(new ExGetPremiumItemList(player));
}
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
index c3f29fe9c9..d23918130b 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
@@ -48,17 +48,17 @@ public class RequestWithdrawalPledge 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.isClanLeader())
{
- client.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
+ player.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
return;
}
if (player.isInCombat())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
return;
}
@@ -72,7 +72,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
// Remove the Player From the Member list
clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(player.getName()));
clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
- client.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
- client.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
+ player.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
+ player.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
index 7cdde1c7bb..db6358f368 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
@@ -150,14 +150,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
// Item Max Limit Check
if (!warehouse.validateCapacity(slots))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
+ player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
return;
}
// Check if enough adena and charge the fee
if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, manager, false))
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
return;
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
index a5462164d1..76e8ac2a68 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket
}
player.getBuyList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgBuy(player));
+ player.sendPacket(new PrivateStoreMsgBuy(player));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
index ac64c43c5c..d86bfc8f84 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket
}
player.getSellList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgSell(player));
+ player.sendPacket(new PrivateStoreMsgSell(player));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
index f3078c3e52..2726f99c08 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket
}
player.getSellList().setTitle(_msg);
- client.sendPacket(new ExPrivateStoreSetWholeMsg(player));
+ player.sendPacket(new ExPrivateStoreSetWholeMsg(player));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
index 8e7e6f9b2d..1022c9061d 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
@@ -73,7 +73,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!player.getAccessLevel().allowTransaction())
{
player.sendMessage("Transactions are disabled for your current Access Level.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -84,8 +84,8 @@ public class TradeRequest implements IClientIncomingPacket
{
if (!effect.checkCondition(BotReportTable.TRADE_ACTION_BLOCK_ID))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -104,7 +104,7 @@ public class TradeRequest implements IClientIncomingPacket
// and the following system message is sent to acting player.
if (target.getObjectId() == player.getObjectId())
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
return;
}
@@ -141,7 +141,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!target.isPlayer())
{
- client.sendPacket(SystemMessageId.INVALID_TARGET);
+ player.sendPacket(SystemMessageId.INVALID_TARGET);
return;
}
@@ -161,8 +161,8 @@ public class TradeRequest implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_IS_CURRENTLY_BEING_INVESTIGATED);
sm.addString(partner.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -189,13 +189,13 @@ public class TradeRequest implements IClientIncomingPacket
if ((player.getPrivateStoreType() != PrivateStoreType.NONE) || (partner.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;
}
if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
+ player.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
return;
}
@@ -204,7 +204,7 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
@@ -218,13 +218,13 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
if (player.calculateDistance3D(partner) > 150)
{
- client.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
+ player.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
return;
}
@@ -232,6 +232,6 @@ public class TradeRequest implements IClientIncomingPacket
partner.sendPacket(new SendTradeRequest(player.getObjectId()));
sm = new SystemMessage(SystemMessageId.YOU_HAVE_REQUESTED_A_TRADE_WITH_C1);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
index afbd8b0b76..3ccf45b47f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
@@ -44,6 +44,6 @@ public class RequestExCancelShape_Shifting_Item implements IClientIncomingPacket
}
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
index 055dc2dd1e..6d286b4894 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
@@ -60,7 +60,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -83,7 +83,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (!extractItem.getItem().isAppearanceable())
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -113,15 +113,15 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,20 +129,20 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -154,6 +154,6 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
}
request.setAppearanceExtractItem(extractItem);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
index f7aa0f3047..1c8eaa09c2 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
@@ -55,8 +55,8 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -65,35 +65,35 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -101,7 +101,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -112,6 +112,6 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
return;
}
- client.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
+ player.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 1de9056bda..2a6d3e9bb9 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -64,8 +64,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -74,36 +74,36 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -111,14 +111,14 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!appearanceStone.checkConditions(player, targetItem))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,56 +129,56 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
{
if (extractItem == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getOwnerId() != player.getObjectId())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!extractItem.getItem().isAppearanceable())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -189,21 +189,21 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final long cost = appearanceStone.getCost();
if (cost > player.getAdena())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (stone.getCount() < 1L)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((appearanceStone.getType() == AppearanceType.NORMAL) && (inventory.destroyItem(getClass().getSimpleName(), extractItem, 1, player, this) == null))
{
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -276,7 +276,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
player.sendInventoryUpdate(iu);
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
+ player.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
if (targetItem.isEquipped())
{
player.broadcastUserInfo();
@@ -288,8 +288,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
slots.addComponentType(slot);
}
}
- client.sendPacket(slots);
+ player.sendPacket(slots);
}
- client.sendPacket(new ExAdenaInvenCount(player));
+ player.sendPacket(new ExAdenaInvenCount(player));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
index abea70c48a..bf64e21529 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
@@ -65,8 +65,8 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket
// attempting to destroy item
if (player.getInventory().destroyItemByItemId("ChangeAttribute", _consumeItemId, 1, player, item) == null)
{
- client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
- client.sendPacket(ExChangeAttributeFail.STATIC);
+ player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
+ player.sendPacket(ExChangeAttributeFail.STATIC);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH);
return;
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
index a5001f4346..e79211ec85 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
@@ -52,26 +52,26 @@ public class RequestCommissionBuyInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
if (!player.isInventoryUnder80(false) || (player.getWeightPenalty() >= 3))
{
- client.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
return;
}
final CommissionItem commissionItem = ItemCommissionManager.getInstance().getCommissionItem(_commissionId);
if (commissionItem != null)
{
- client.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
+ player.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
}
else
{
- client.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
}
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
index aa794d2d96..16dec35e6f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
@@ -49,7 +49,7 @@ public class RequestCommissionBuyItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
index 4f7141c09d..8a3ff5c955 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
@@ -50,7 +50,7 @@ public class RequestCommissionDelete implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
index 1a7edbbaac..01005d24c1 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
@@ -50,18 +50,18 @@ public class RequestCommissionInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
final Item itemInstance = player.getInventory().getItemByObjectId(_itemObjectId);
if (itemInstance != null)
{
- client.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
+ player.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
}
else
{
- client.sendPacket(ExResponseCommissionInfo.EMPTY);
+ player.sendPacket(ExResponseCommissionInfo.EMPTY);
}
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
index 1ad79b9031..57fd69ec8d 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
@@ -62,7 +62,7 @@ public class RequestCommissionList implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
index 6b2f96e87d..7eb252c475 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
@@ -95,7 +95,7 @@ public class RequestCommissionRegister implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
index 1e826566da..b19aefac8d 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
@@ -45,7 +45,7 @@ public class RequestCommissionRegisteredItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
index 5c587137cb..a0b4c518d2 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
@@ -46,10 +46,10 @@ public class RequestCommissionRegistrableItemList implements IClientIncomingPack
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
- client.sendPacket(new ExResponseCommissionItemList(player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(player.getInventory().getAvailableItems(false, false, false)));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
index 670f9a29ed..398352c0f7 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = new CompoundRequest(player);
if (!player.addRequest(request))
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
@@ -77,7 +79,7 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
final Item itemOne = request.getItemOne();
if (itemOne == null)
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -87,11 +89,11 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItems.isEmpty())
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
- client.sendPacket(ExEnchantOneOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
index 315704e4e5..b8f98ff7ba 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
@@ -51,23 +51,25 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -77,14 +79,14 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -93,10 +95,10 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
- client.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
index 0dbe123787..72a0b34bfc 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemOne();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
request.setItemOne(0);
- client.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
index 5743927fa1..4a05f6c92b 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemTwo();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
request.setItemTwo(0);
- client.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
index c0eb970566..70e94532db 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
return;
}
@@ -78,7 +80,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -86,7 +88,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -96,7 +98,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -113,11 +115,11 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item item = player.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true);
if (success)
{
- client.sendPacket(new ExEnchantSucess(item.getId()));
+ player.sendPacket(new ExEnchantSucess(item.getId()));
}
else
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
index e4e46a5271..d5165c28ec 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
@@ -65,6 +65,7 @@ public class RequestCrystallizeEstimate 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);
@@ -73,28 +74,28 @@ public class RequestCrystallizeEstimate 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);
return;
}
final Item item = player.getInventory().getItemByObjectId(_objectId);
if ((item == null) || item.isShadowItem() || item.isTimeLimitedItem() || item.isHeroItem() || (!Config.ALT_ALLOW_AUGMENT_DESTROY && item.isAugmented()))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
PacketLogger.warning(player + ": tried to crystallize " + item.getItem());
return;
}
@@ -167,8 +168,8 @@ public class RequestCrystallizeEstimate 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;
}
@@ -177,11 +178,11 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket
if ((crystallizationRewards != null) && !crystallizationRewards.isEmpty())
{
player.setInCrystallize(true);
- client.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
+ player.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
}
else
{
- client.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
+ player.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
}
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
index 584b6e3e4e..a0b7c23c20 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
@@ -40,9 +40,11 @@ public class RequestFriendDetailInfo implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExFriendDetailInfo(player, _name));
+ return;
}
+
+ player.sendPacket(new ExFriendDetailInfo(player, _name));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
index 82fa3a651a..e9e5d90e84 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
@@ -48,6 +48,7 @@ public class RequestMenteeWaitingList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
+
+ player.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
index 7c22e266ca..20ec347a77 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
@@ -41,6 +41,7 @@ public class RequestMentorList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExMentorList(player));
+
+ player.sendPacket(new ExMentorList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
index 4023b0cff0..618f6dc7ed 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
@@ -37,9 +37,11 @@ public class RequestBRGamePoint implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExBRGamePoint(player));
+ return;
}
+
+ player.sendPacket(new ExBRGamePoint(player));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
index de0446cfd8..7ac78cfe4f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
@@ -34,7 +34,7 @@ public class RequestBRRecentProductList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- // Player player = client.getPlayer();
+ // Player player = cplayer.getPlayer();
// TODO: Implement it.
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
index d248722d3d..8cb6a581bc 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.vip;
import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.vip.ReceiveVipLuckyGameInfo;
@@ -32,6 +33,12 @@ public class RequestVipLuckGameInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.sendPacket(new ReceiveVipLuckyGameInfo(client.getPlayer()));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ReceiveVipLuckyGameInfo(player));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipProductList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipProductList.java
index b2b90dd2ae..0636bc6b36 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipProductList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipProductList.java
@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.vip;
import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.vip.ReceiveVipProductList;
@@ -32,6 +33,12 @@ public class RequestVipProductList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.sendPacket(new ReceiveVipProductList(client.getPlayer()));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ReceiveVipProductList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
index 6813c75ed2..f8d602624b 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
@@ -34,7 +34,6 @@ public class ExRestartClient implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.EX_RESTART_CLIENT.writeId(packet);
-
return true;
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
index 89678c1836..4378479707 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
- * A packet used to draw points and lines on client.
+ * A packet used to draw points and lines on cplayer.
* Note: Names in points and lines are bugged they will appear even when not looking at them.
* @author NosBit
*/
@@ -62,7 +62,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -76,7 +76,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -88,7 +88,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -100,7 +100,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
@@ -110,7 +110,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -124,7 +124,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -136,7 +136,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -148,7 +148,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
index ef3f4acc18..25ba232162 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
@@ -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;
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
index c6ea588540..acab47f316 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
index cdfaa128cb..129d1a52d1 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
index ba988591d0..370aeba2c5 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
@@ -51,6 +51,6 @@ public class Appearing implements IClientIncomingPacket
player.onTeleported();
}
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
index 0ea780c5b4..b47439803f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
@@ -55,7 +55,7 @@ public class BypassUserCmd implements IClientIncomingPacket
}
else
{
- handler.useUserCommand(_command, client.getPlayer());
+ handler.useUserCommand(_command, player);
}
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
index a3236b0d83..43c0172038 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
@@ -65,12 +65,12 @@ public class CannotMoveAnymore implements IClientIncomingPacket
// PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+
// " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ());
// StopMove smwl = new StopMove(player);
- // client.getPlayer().sendPacket(smwl);
- // client.getPlayer().broadcastPacket(smwl);
+ // cplayer.getPlayer().sendPacket(smwl);
+ // cplayer.getPlayer().broadcastPacket(smwl);
//
- // StopRotation sr = new StopRotation(client.getPlayer(),
+ // StopRotation sr = new StopRotation(cplayer.getPlayer(),
// _heading);
- // client.getPlayer().sendPacket(sr);
- // client.getPlayer().broadcastPacket(sr);
+ // cplayer.getPlayer().sendPacket(sr);
+ // cplayer.getPlayer().broadcastPacket(sr);
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index e640f6074d..02e4946353 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -322,18 +322,18 @@ 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(1, player));
- client.sendPacket(new ItemList(2, player));
+ player.sendPacket(new ItemList(1, player));
+ player.sendPacket(new ItemList(2, player));
// Send Quest Item List
- client.sendPacket(new ExQuestItemList(1, player));
- client.sendPacket(new ExQuestItemList(2, player));
+ player.sendPacket(new ExQuestItemList(1, player));
+ player.sendPacket(new ExQuestItemList(2, player));
// Send Shortcuts
- client.sendPacket(new ShortCutInit(player));
+ player.sendPacket(new ShortCutInit(player));
// Send Action list
player.sendPacket(ExBasicActionList.STATIC_PACKET);
@@ -446,7 +446,7 @@ public class EnterWorld implements IClientIncomingPacket
player.sendPacket(new ExStorageMaxCount(player));
// Friend list
- client.sendPacket(new L2FriendList(player));
+ player.sendPacket(new L2FriendList(player));
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN);
sm.addString(player.getName());
for (int id : player.getFriendList())
@@ -474,14 +474,14 @@ public class EnterWorld implements IClientIncomingPacket
notice.replace("%clan_name%", player.getClan().getName());
notice.replace("%notice_text%", player.getClan().getNotice().replaceAll("\r\n", "
"));
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));
}
}
@@ -493,13 +493,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())
@@ -562,7 +562,7 @@ public class EnterWorld implements IClientIncomingPacket
{
if (MailManager.getInstance().hasUnreadPost(player))
{
- client.sendPacket(ExNoticePostArrived.valueOf(false));
+ player.sendPacket(ExNoticePostArrived.valueOf(false));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 4bb789645a..218e629395 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -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;
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 8078d0c10e..6ac4cc7ca0 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -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:
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
index 65c69620a0..94911328a2 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
@@ -41,6 +41,7 @@ public class RequestAlchemySkillList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExAlchemySkillList(player));
+
+ player.sendPacket(new ExAlchemySkillList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
index 49bb9c2285..fb6b18d662 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
index c6f8fe2045..b6f8d4fb9e 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
index 5669f5691a..beb5024780 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
index 7ee18d42b3..3e864837f8 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
index 2baf948bc7..4dc52e2648 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
index e1c584d405..3ce51314b3 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
@@ -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_SERVITOR);
+ player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_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_SERVITOR);
+ player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_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_AND_THEREFORE_CANNOT_USE_THE_AUTOMATIC_USE_FUNCTION);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR_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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
index 83ffc494d5..4b817c3e70 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index ce3d851f06..9c2d96e99c 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
@@ -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,8 +253,8 @@ 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));
player.sendPacket(SystemMessageId.EXCHANGE_IS_SUCCESSFUL);
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
index d77d8eba6a..f841f306a1 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
index 4534c39c18..b65ad7c589 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
index f1ddb94865..5ae334f854 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
index 21710a1eb0..dd69523f80 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
@@ -96,6 +96,6 @@ public class RequestConfirmSiegeWaitingList implements IClientIncomingPacket
}
// Update the defender list
- client.sendPacket(new SiegeDefenderList(castle));
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
index dc81cb23dc..b2f53bed92 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
index 03d610fe78..1491cb1bfb 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
@@ -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();
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
index 36d36097c1..5fd67b8759 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
@@ -42,6 +42,6 @@ public class RequestCursedWeaponList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExCursedWeaponList());
+ player.sendPacket(new ExCursedWeaponList());
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
index 573a4f7950..193c436d7e 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
index ce21646986..6d59e89936 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
index 5882d1ea46..88fd8b949d 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index 1e735c8742..30020854d8 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -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();
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
index 224a640ef5..5227396561 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
index ed981b63f7..f5607f7fa5 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index a9e330cde4..9b3522967a 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -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:
@@ -194,7 +194,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)
@@ -259,8 +259,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)
@@ -294,13 +294,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()))
@@ -320,11 +320,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)
@@ -356,7 +356,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)
@@ -399,7 +399,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))
@@ -409,11 +409,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)
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
index 4652f15ddc..22d6a0efa5 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
index 9565b3e5ca..f6b8d47c50 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
@@ -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);
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
index 68bb180db1..7b967d8931 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -82,8 +82,8 @@ 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));
+ // cplayer.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
index 35fe136cbd..54a540188c 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
@@ -55,6 +55,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket
{
return;
}
+
player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
index 6ec3504089..79088e0c3a 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
@@ -47,6 +47,6 @@ public class RequestExFriendListExtended implements IClientIncomingPacket
return;
}
- client.sendPacket(new FriendList(player));
+ player.sendPacket(new FriendList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
index 2e0c2154ac..150caed567 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
@@ -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()));
}
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
index 8851aef463..00bb331778 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
@@ -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 + " !!");
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 16f28d5d04..3ee3f7a9aa 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
index 1b20e2e248..f35c069743 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
index c55df32ab6..2b1000f445 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
index 3842d82eb9..f6b2724012 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
index f868d0e26f..056262b4ab 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
@@ -48,6 +48,6 @@ public class RequestExShowContactList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExShowContactList(player));
+ player.sendPacket(new ExShowContactList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
index 2d9f0456f4..1589ff8175 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
index 0a4522bf64..a2667da070 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
index b2f32527da..1355a122ce 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
index 73dd408134..1233ad294b 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
@@ -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);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
index f1c10ee605..10070bbbeb 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
@@ -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;
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
index a6ede07bb0..71e028b3be 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
index 04abcbce46..719d0b6fc8 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
@@ -61,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket
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;
}
@@ -69,7 +69,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;
}
@@ -91,7 +91,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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
index a7c019d65d..7253226656 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
index ff96a400c9..79db1768e6 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
index 89e11ba6a9..f51eec948c 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
index 25d004a7b7..2240af9a6e 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
@@ -41,6 +41,7 @@ public class RequestHennaRemoveList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new HennaRemoveList(player));
+
+ player.sendPacket(new HennaRemoveList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
index 1c1fc6d8c2..bc9710d465 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
@@ -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()));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
index d46ef778d4..f9e67ea1ed 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
@@ -43,6 +43,7 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExInzoneWaiting(player, _hide));
+
+ player.sendPacket(new ExInzoneWaiting(player, _hide));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
index 6551e7d0c4..42404bdd99 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
@@ -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();
+ return;
}
+
+ if (player.isInventoryDisabled())
+ {
+ return;
+ }
+
+ player.sendItemList();
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
index 99965602f9..cb5c08f036 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
@@ -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)
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
index 226f085fb0..9793d6e1d8 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
@@ -44,7 +44,7 @@ public class RequestKeyMapping implements IClientIncomingPacket
if (Config.STORE_UI_SETTINGS)
{
- client.sendPacket(new ExUISetting(player));
+ player.sendPacket(new ExUISetting(player));
}
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
index ada67e190c..2cdc066ead 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
index bffa403c8a..96b1664122 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
@@ -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));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
index 7b4703d69c..9fcb5e9736 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index b9c3900403..ec1f903d13 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -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_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_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;
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
index 9372163aea..769c2af9e2 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
@@ -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
{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
index 9149ce1284..8e7c3ee9fe 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
@@ -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));
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
index e670b165cd..de3adf72c3 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
@@ -43,7 +43,7 @@ public class RequestPackageSendableItemList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PackageSendableList(1, player, _objectId));
- client.sendPacket(new PackageSendableList(2, player, _objectId));
+ player.sendPacket(new PackageSendableList(1, player, _objectId));
+ player.sendPacket(new PackageSendableList(2, player, _objectId));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
index e8d53e1a19..e4ddcee7e8 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
index a9fac87c7e..ff9183a3fe 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
@@ -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_SUPPORT_4GAME_COM);
+ player.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_ON_HTTPS_SUPPORT_4GAME_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);
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
index b7f1ab30a7..7d148f2d91 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
index 77725a6557..3e43762127 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
index e3ec88ca13..34af0251ca 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
@@ -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())));
}
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
index 76d591b14c..a4f9ba1784 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
index 3459b04c80..4c077a4c9e 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
@@ -64,6 +64,7 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PledgeReceiveMemberInfo(member));
+
+ player.sendPacket(new PledgeReceiveMemberInfo(member));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
index e380ce68c8..464ad76c9f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
@@ -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)
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
index 8fabbb1f4a..beee5121dd 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
@@ -52,6 +52,6 @@ public class RequestPledgeRecruitBoardDetail implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
+ player.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
index 1d0458db08..0d0d86f7db 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
index fe019fe6d6..dde18f32a4 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
@@ -44,6 +44,6 @@ public class RequestPledgeWaitingList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeWaitingList(_clanId));
+ player.sendPacket(new ExPledgeWaitingList(_clanId));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
index add0aa2f01..618c787a17 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
@@ -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));
}
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
index 4468b67642..500800df57 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
index 086f76c512..2a75d35297 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
@@ -51,11 +51,11 @@ 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(1, player));
- client.sendPacket(new ExReplyPostItemList(2, player));
+ player.sendPacket(new ExReplyPostItemList(1, player));
+ player.sendPacket(new ExReplyPostItemList(2, player));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
index 44bbd9d34c..a038920c8b 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
index 94958bc4fe..2ded12e55d 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
@@ -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());
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
index 2d616f2e94..bb2f0e8e6f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
index 8ab3d4962f..243e4a3674 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
@@ -87,7 +87,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
if (_items == null)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -128,13 +128,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;
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
index bee0568e03..365e1f598f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
index b64136dc79..21ba9b39af 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
index 8badb24c5f..6ffcc69313 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
@@ -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();
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
index 461f09492a..06d51160dd 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
index 5e7754bcbe..71dc3aa8da 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
index 891d914e07..e30bee1ac5 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
@@ -41,6 +41,6 @@ public class RequestRecipeItemMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeItemMakeInfo(_id, player));
+ player.sendPacket(new RecipeItemMakeInfo(_id, player));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
index d8e5ef166c..fd6b816fde 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
index d96459999d..b82a2048c7 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
@@ -54,6 +54,6 @@ public class RequestRecipeShopMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeShopItemInfo(shop, _recipeId));
+ player.sendPacket(new RecipeShopItemInfo(shop, _recipeId));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
index 39546dc93f..afc1ee3ecc 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
index 85e67c77ed..82f12af318 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index 1bb51eff9d..87a0574a9f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -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))
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
index 4da834c30d..3d01f1e525 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
@@ -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);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
index 1632df189f..9c0c240bd4 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
index b3e709c5db..1a7c1ebc0f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
@@ -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)
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index 662058f4d8..dfda7319fc 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
index 7b82b33d56..af5f6876b7 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
index e5c53c86d0..1cf200da52 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
@@ -58,7 +58,7 @@ public class RequestSentPost 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;
}
@@ -73,6 +73,6 @@ public class RequestSentPost implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExReplySentPost(msg));
+ player.sendPacket(new ExReplySentPost(msg));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
index 99aec4ba86..05a414f453 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
@@ -47,6 +47,7 @@ public class RequestSentPostList implements IClientIncomingPacket
// player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
// return;
// }
- client.sendPacket(new ExShowSentPostList(player.getObjectId()));
+
+ player.sendPacket(new ExShowSentPostList(player.getObjectId()));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
index 72578e8d22..197ab07190 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
@@ -78,18 +78,23 @@ public class RequestSetCrop implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
index fe5ea44de4..a3e3ded0a3 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
@@ -77,18 +77,23 @@ public class RequestSetSeed implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index b30eb95f41..bf7d98030a 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
@@ -50,13 +51,19 @@ public class RequestShortCutReg implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- if ((client.getPlayer() == null) || (_page > 19) || (_page < 0))
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ if ((_page > 19) || (_page < 0))
{
return;
}
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
- client.getPlayer().registerShortCut(sc);
- client.sendPacket(new ShortCutRegister(sc));
+ player.registerShortCut(sc);
+ player.sendPacket(new ShortCutRegister(sc));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
index 1053bb74c1..fc2725daa7 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
@@ -44,6 +44,6 @@ public class RequestShowBeautyList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExResponseBeautyList(player, _type));
+ player.sendPacket(new ExResponseBeautyList(player, _type));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
index 9c73551f59..541b987e91 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
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;
/**
@@ -40,6 +41,12 @@ public class RequestShowBoard implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, client.getPlayer());
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, player);
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
index 162de17679..f74c3abf4d 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
@@ -41,6 +41,7 @@ public class RequestShowMiniMap implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ShowMiniMap(0));
+
+ player.sendPacket(new ShowMiniMap(0));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
index 097e8f5d30..f055ad8a57 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeAttackerList;
@@ -40,9 +41,17 @@ public class RequestSiegeAttackerList implements IClientIncomingPacket
public void run(GameClient client)
{
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
- if (castle != null)
+ if (castle == null)
{
- client.sendPacket(new SiegeAttackerList(castle));
+ return;
}
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeAttackerList(castle));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
index 6df5163c58..a8d4c9f6d0 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList;
@@ -44,6 +45,13 @@ public class RequestSiegeDefenderList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new SiegeDefenderList(castle));
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
index 8ae03da07b..51c42f7b7c 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
@@ -34,10 +34,12 @@ public class RequestSkillList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- final Player cha = client.getPlayer();
- if (cha != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- cha.sendSkillList();
+ return;
}
+
+ player.sendSkillList();
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
index ac3c6e1b62..2deae58393 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
@@ -60,52 +60,52 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
if ((clanDeclaringWar.getLevel() < 3) || (clanDeclaringWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaringWar.getWarCount() >= 30)
{
- client.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final Clan clanDeclaredWar = ClanTable.getInstance().getClanByName(_pledgeName);
if (clanDeclaredWar == null)
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar == clanDeclaringWar)
{
- client.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaringWar.getAllyId() == clanDeclaredWar.getAllyId()) && (clanDeclaringWar.getAllyId() != 0))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaredWar.getLevel() < 3) || (clanDeclaredWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis())
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -116,15 +116,15 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_T_DECLARE_A_WAR_BECAUSE_THE_21_DAY_PERIOD_HASN_T_PASSED_AFTER_A_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ALREADY_BEEN_AT_WAR_WITH_THE_S1_CLAN_5_DAYS_MUST_PASS_BEFORE_YOU_CAN_DECLARE_WAR_AGAIN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
index 47c39e2e70..e8c4b1a0e1 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
@@ -60,7 +60,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if ((member != null) && member.isOnline() && member.getPlayer().isInCombat())
{
player.sendPacket(SystemMessageId.A_CEASE_FIRE_DURING_A_CLAN_WAR_CAN_NOT_BE_CALLED_WHILE_MEMBERS_OF_YOUR_CLAN_ARE_ENGAGED_IN_BATTLE);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -69,13 +69,13 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if (targetClan == null)
{
player.sendMessage("No such clan.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -85,14 +85,14 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_NOT_DECLARED_A_CLAN_WAR_AGAINST_THE_CLAN_S1);
sm.addString(targetClan.getName());
player.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{
player.sendPacket(SystemMessageId.YOU_CANNOT_DECLARE_DEFEAT_AS_IT_HAS_NOT_BEEN_7_DAYS_SINCE_STARTING_A_CLAN_WAR_WITH_CLAN_S1);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
index d7d4d2b449..c13d46b2bb 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
@@ -65,7 +65,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
// The English system message say weapon, but it's applied to any equipped item.
if (player.isAttackingNow() || player.isCastingNow())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
return;
}
@@ -89,13 +89,13 @@ public class RequestUnEquipItem implements IClientIncomingPacket
if (!player.getInventory().canManipulateWithItemId(item.getId()))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
if (item.isWeapon() && item.getWeaponItem().isForceEquip() && !player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
@@ -117,7 +117,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
}
sm.addItemName(unequippedItem);
- client.sendPacket(sm);
+ player.sendPacket(sm);
final InventoryUpdate iu = new InventoryUpdate();
iu.addItems(unequipped);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
index 0b38bcb67c..9e95fb93e1 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
@@ -51,28 +51,28 @@ public class RequestVoteNew implements IClientIncomingPacket
{
if (object == null)
{
- client.sendPacket(SystemMessageId.SELECT_TARGET);
+ player.sendPacket(SystemMessageId.SELECT_TARGET);
}
else if (object.isFakePlayer() && FakePlayerData.getInstance().isTalkable(object.getName()))
{
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addString(FakePlayerData.getInstance().getProperName(object.getName()));
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
player.setRecomLeft(player.getRecomLeft() - 1);
- client.sendPacket(new UserInfo(player));
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new UserInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
}
else
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
}
return;
}
@@ -85,19 +85,19 @@ public class RequestVoteNew implements IClientIncomingPacket
if (target == player)
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
return;
}
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
if (target.getRecomHave() >= 255)
{
- client.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
+ player.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
return;
}
@@ -106,16 +106,16 @@ public class RequestVoteNew implements IClientIncomingPacket
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addPcName(target);
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_BEEN_RECOMMENDED_BY_C1);
sm.addPcName(player);
target.sendPacket(sm);
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
target.broadcastUserInfo();
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
target.sendPacket(new ExVoteSystemInfo(target));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
index 05261ba813..0e3300d03c 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
@@ -67,12 +67,12 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
}
else if ((player.getWeightPenalty() >= 3) || !player.isInventoryUnder90(false))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
return;
}
else if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
return;
}
@@ -101,11 +101,11 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
if (player.getPremiumItemList().isEmpty())
{
- client.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
+ player.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
}
else
{
- client.sendPacket(new ExGetPremiumItemList(player));
+ player.sendPacket(new ExGetPremiumItemList(player));
}
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
index c3f29fe9c9..d23918130b 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
@@ -48,17 +48,17 @@ public class RequestWithdrawalPledge 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.isClanLeader())
{
- client.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
+ player.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
return;
}
if (player.isInCombat())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
return;
}
@@ -72,7 +72,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
// Remove the Player From the Member list
clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(player.getName()));
clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
- client.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
- client.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
+ player.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
+ player.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
index 84b879e0f7..13ecd08a96 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
@@ -150,14 +150,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
// Item Max Limit Check
if (!warehouse.validateCapacity(slots))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
+ player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
return;
}
// Check if enough adena and charge the fee
if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, manager, false))
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
return;
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
index a5462164d1..76e8ac2a68 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket
}
player.getBuyList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgBuy(player));
+ player.sendPacket(new PrivateStoreMsgBuy(player));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
index ac64c43c5c..d86bfc8f84 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket
}
player.getSellList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgSell(player));
+ player.sendPacket(new PrivateStoreMsgSell(player));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
index f3078c3e52..2726f99c08 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket
}
player.getSellList().setTitle(_msg);
- client.sendPacket(new ExPrivateStoreSetWholeMsg(player));
+ player.sendPacket(new ExPrivateStoreSetWholeMsg(player));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
index 8e7e6f9b2d..1022c9061d 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
@@ -73,7 +73,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!player.getAccessLevel().allowTransaction())
{
player.sendMessage("Transactions are disabled for your current Access Level.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -84,8 +84,8 @@ public class TradeRequest implements IClientIncomingPacket
{
if (!effect.checkCondition(BotReportTable.TRADE_ACTION_BLOCK_ID))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -104,7 +104,7 @@ public class TradeRequest implements IClientIncomingPacket
// and the following system message is sent to acting player.
if (target.getObjectId() == player.getObjectId())
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
return;
}
@@ -141,7 +141,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!target.isPlayer())
{
- client.sendPacket(SystemMessageId.INVALID_TARGET);
+ player.sendPacket(SystemMessageId.INVALID_TARGET);
return;
}
@@ -161,8 +161,8 @@ public class TradeRequest implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_IS_CURRENTLY_BEING_INVESTIGATED);
sm.addString(partner.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -189,13 +189,13 @@ public class TradeRequest implements IClientIncomingPacket
if ((player.getPrivateStoreType() != PrivateStoreType.NONE) || (partner.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;
}
if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
+ player.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
return;
}
@@ -204,7 +204,7 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
@@ -218,13 +218,13 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
if (player.calculateDistance3D(partner) > 150)
{
- client.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
+ player.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
return;
}
@@ -232,6 +232,6 @@ public class TradeRequest implements IClientIncomingPacket
partner.sendPacket(new SendTradeRequest(player.getObjectId()));
sm = new SystemMessage(SystemMessageId.YOU_HAVE_REQUESTED_A_TRADE_WITH_C1);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
index afbd8b0b76..3ccf45b47f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
@@ -44,6 +44,6 @@ public class RequestExCancelShape_Shifting_Item implements IClientIncomingPacket
}
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
index 055dc2dd1e..6d286b4894 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
@@ -60,7 +60,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -83,7 +83,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (!extractItem.getItem().isAppearanceable())
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -113,15 +113,15 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,20 +129,20 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -154,6 +154,6 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
}
request.setAppearanceExtractItem(extractItem);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
index f7aa0f3047..1c8eaa09c2 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
@@ -55,8 +55,8 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -65,35 +65,35 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -101,7 +101,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -112,6 +112,6 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
return;
}
- client.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
+ player.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 1de9056bda..2a6d3e9bb9 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -64,8 +64,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -74,36 +74,36 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -111,14 +111,14 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!appearanceStone.checkConditions(player, targetItem))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,56 +129,56 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
{
if (extractItem == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getOwnerId() != player.getObjectId())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!extractItem.getItem().isAppearanceable())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -189,21 +189,21 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final long cost = appearanceStone.getCost();
if (cost > player.getAdena())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (stone.getCount() < 1L)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((appearanceStone.getType() == AppearanceType.NORMAL) && (inventory.destroyItem(getClass().getSimpleName(), extractItem, 1, player, this) == null))
{
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -276,7 +276,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
player.sendInventoryUpdate(iu);
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
+ player.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
if (targetItem.isEquipped())
{
player.broadcastUserInfo();
@@ -288,8 +288,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
slots.addComponentType(slot);
}
}
- client.sendPacket(slots);
+ player.sendPacket(slots);
}
- client.sendPacket(new ExAdenaInvenCount(player));
+ player.sendPacket(new ExAdenaInvenCount(player));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
index abea70c48a..bf64e21529 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
@@ -65,8 +65,8 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket
// attempting to destroy item
if (player.getInventory().destroyItemByItemId("ChangeAttribute", _consumeItemId, 1, player, item) == null)
{
- client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
- client.sendPacket(ExChangeAttributeFail.STATIC);
+ player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
+ player.sendPacket(ExChangeAttributeFail.STATIC);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH);
return;
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
index a5001f4346..e79211ec85 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
@@ -52,26 +52,26 @@ public class RequestCommissionBuyInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
if (!player.isInventoryUnder80(false) || (player.getWeightPenalty() >= 3))
{
- client.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
return;
}
final CommissionItem commissionItem = ItemCommissionManager.getInstance().getCommissionItem(_commissionId);
if (commissionItem != null)
{
- client.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
+ player.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
}
else
{
- client.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
}
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
index aa794d2d96..16dec35e6f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
@@ -49,7 +49,7 @@ public class RequestCommissionBuyItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
index 4f7141c09d..8a3ff5c955 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
@@ -50,7 +50,7 @@ public class RequestCommissionDelete implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
index 1a7edbbaac..01005d24c1 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
@@ -50,18 +50,18 @@ public class RequestCommissionInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
final Item itemInstance = player.getInventory().getItemByObjectId(_itemObjectId);
if (itemInstance != null)
{
- client.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
+ player.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
}
else
{
- client.sendPacket(ExResponseCommissionInfo.EMPTY);
+ player.sendPacket(ExResponseCommissionInfo.EMPTY);
}
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
index 1ad79b9031..57fd69ec8d 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
@@ -62,7 +62,7 @@ public class RequestCommissionList implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
index 6b2f96e87d..7eb252c475 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
@@ -95,7 +95,7 @@ public class RequestCommissionRegister implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
index 1e826566da..b19aefac8d 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
@@ -45,7 +45,7 @@ public class RequestCommissionRegisteredItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
index 532c2496c2..75a5a816f0 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
@@ -46,11 +46,11 @@ public class RequestCommissionRegistrableItemList implements IClientIncomingPack
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
- client.sendPacket(new ExResponseCommissionItemList(1, player.getInventory().getAvailableItems(false, false, false)));
- client.sendPacket(new ExResponseCommissionItemList(2, player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(1, player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(2, player.getInventory().getAvailableItems(false, false, false)));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
index 670f9a29ed..398352c0f7 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = new CompoundRequest(player);
if (!player.addRequest(request))
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
@@ -77,7 +79,7 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
final Item itemOne = request.getItemOne();
if (itemOne == null)
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -87,11 +89,11 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItems.isEmpty())
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
- client.sendPacket(ExEnchantOneOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
index 315704e4e5..b8f98ff7ba 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
@@ -51,23 +51,25 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -77,14 +79,14 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -93,10 +95,10 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
- client.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
index 0dbe123787..72a0b34bfc 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemOne();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
request.setItemOne(0);
- client.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
index 5743927fa1..4a05f6c92b 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemTwo();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
request.setItemTwo(0);
- client.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
index c0eb970566..70e94532db 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
return;
}
@@ -78,7 +80,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -86,7 +88,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -96,7 +98,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -113,11 +115,11 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item item = player.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true);
if (success)
{
- client.sendPacket(new ExEnchantSucess(item.getId()));
+ player.sendPacket(new ExEnchantSucess(item.getId()));
}
else
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
index e4e46a5271..d5165c28ec 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
@@ -65,6 +65,7 @@ public class RequestCrystallizeEstimate 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);
@@ -73,28 +74,28 @@ public class RequestCrystallizeEstimate 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);
return;
}
final Item item = player.getInventory().getItemByObjectId(_objectId);
if ((item == null) || item.isShadowItem() || item.isTimeLimitedItem() || item.isHeroItem() || (!Config.ALT_ALLOW_AUGMENT_DESTROY && item.isAugmented()))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
PacketLogger.warning(player + ": tried to crystallize " + item.getItem());
return;
}
@@ -167,8 +168,8 @@ public class RequestCrystallizeEstimate 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;
}
@@ -177,11 +178,11 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket
if ((crystallizationRewards != null) && !crystallizationRewards.isEmpty())
{
player.setInCrystallize(true);
- client.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
+ player.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
}
else
{
- client.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
+ player.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
}
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
index 584b6e3e4e..a0b7c23c20 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
@@ -40,9 +40,11 @@ public class RequestFriendDetailInfo implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExFriendDetailInfo(player, _name));
+ return;
}
+
+ player.sendPacket(new ExFriendDetailInfo(player, _name));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
index 82fa3a651a..e9e5d90e84 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
@@ -48,6 +48,7 @@ public class RequestMenteeWaitingList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
+
+ player.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
index 7c22e266ca..20ec347a77 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
@@ -41,6 +41,7 @@ public class RequestMentorList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExMentorList(player));
+
+ player.sendPacket(new ExMentorList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
index 4023b0cff0..618f6dc7ed 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
@@ -37,9 +37,11 @@ public class RequestBRGamePoint implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExBRGamePoint(player));
+ return;
}
+
+ player.sendPacket(new ExBRGamePoint(player));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
index de0446cfd8..7ac78cfe4f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
@@ -34,7 +34,7 @@ public class RequestBRRecentProductList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- // Player player = client.getPlayer();
+ // Player player = cplayer.getPlayer();
// TODO: Implement it.
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
index d248722d3d..8cb6a581bc 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.vip;
import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.vip.ReceiveVipLuckyGameInfo;
@@ -32,6 +33,12 @@ public class RequestVipLuckGameInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.sendPacket(new ReceiveVipLuckyGameInfo(client.getPlayer()));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ReceiveVipLuckyGameInfo(player));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipProductList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipProductList.java
index b2b90dd2ae..0636bc6b36 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipProductList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipProductList.java
@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.vip;
import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.vip.ReceiveVipProductList;
@@ -32,6 +33,12 @@ public class RequestVipProductList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.sendPacket(new ReceiveVipProductList(client.getPlayer()));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ReceiveVipProductList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
index 6813c75ed2..f8d602624b 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
@@ -34,7 +34,6 @@ public class ExRestartClient implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.EX_RESTART_CLIENT.writeId(packet);
-
return true;
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
index 89678c1836..4378479707 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
- * A packet used to draw points and lines on client.
+ * A packet used to draw points and lines on cplayer.
* Note: Names in points and lines are bugged they will appear even when not looking at them.
* @author NosBit
*/
@@ -62,7 +62,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -76,7 +76,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -88,7 +88,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -100,7 +100,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
@@ -110,7 +110,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -124,7 +124,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -136,7 +136,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -148,7 +148,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
index ef3f4acc18..25ba232162 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
@@ -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;
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
index c6ea588540..acab47f316 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
index cdfaa128cb..129d1a52d1 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
index ba988591d0..370aeba2c5 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
@@ -51,6 +51,6 @@ public class Appearing implements IClientIncomingPacket
player.onTeleported();
}
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
index 0ea780c5b4..b47439803f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
@@ -55,7 +55,7 @@ public class BypassUserCmd implements IClientIncomingPacket
}
else
{
- handler.useUserCommand(_command, client.getPlayer());
+ handler.useUserCommand(_command, player);
}
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
index a3236b0d83..43c0172038 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
@@ -65,12 +65,12 @@ public class CannotMoveAnymore implements IClientIncomingPacket
// PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+
// " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ());
// StopMove smwl = new StopMove(player);
- // client.getPlayer().sendPacket(smwl);
- // client.getPlayer().broadcastPacket(smwl);
+ // cplayer.getPlayer().sendPacket(smwl);
+ // cplayer.getPlayer().broadcastPacket(smwl);
//
- // StopRotation sr = new StopRotation(client.getPlayer(),
+ // StopRotation sr = new StopRotation(cplayer.getPlayer(),
// _heading);
- // client.getPlayer().sendPacket(sr);
- // client.getPlayer().broadcastPacket(sr);
+ // cplayer.getPlayer().sendPacket(sr);
+ // cplayer.getPlayer().broadcastPacket(sr);
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index e640f6074d..02e4946353 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -322,18 +322,18 @@ 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(1, player));
- client.sendPacket(new ItemList(2, player));
+ player.sendPacket(new ItemList(1, player));
+ player.sendPacket(new ItemList(2, player));
// Send Quest Item List
- client.sendPacket(new ExQuestItemList(1, player));
- client.sendPacket(new ExQuestItemList(2, player));
+ player.sendPacket(new ExQuestItemList(1, player));
+ player.sendPacket(new ExQuestItemList(2, player));
// Send Shortcuts
- client.sendPacket(new ShortCutInit(player));
+ player.sendPacket(new ShortCutInit(player));
// Send Action list
player.sendPacket(ExBasicActionList.STATIC_PACKET);
@@ -446,7 +446,7 @@ public class EnterWorld implements IClientIncomingPacket
player.sendPacket(new ExStorageMaxCount(player));
// Friend list
- client.sendPacket(new L2FriendList(player));
+ player.sendPacket(new L2FriendList(player));
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN);
sm.addString(player.getName());
for (int id : player.getFriendList())
@@ -474,14 +474,14 @@ public class EnterWorld implements IClientIncomingPacket
notice.replace("%clan_name%", player.getClan().getName());
notice.replace("%notice_text%", player.getClan().getNotice().replaceAll("\r\n", "
"));
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));
}
}
@@ -493,13 +493,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())
@@ -562,7 +562,7 @@ public class EnterWorld implements IClientIncomingPacket
{
if (MailManager.getInstance().hasUnreadPost(player))
{
- client.sendPacket(ExNoticePostArrived.valueOf(false));
+ player.sendPacket(ExNoticePostArrived.valueOf(false));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 4bb789645a..218e629395 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -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;
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 8078d0c10e..6ac4cc7ca0 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -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:
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
index 65c69620a0..94911328a2 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
@@ -41,6 +41,7 @@ public class RequestAlchemySkillList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExAlchemySkillList(player));
+
+ player.sendPacket(new ExAlchemySkillList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
index 49bb9c2285..fb6b18d662 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
index c6f8fe2045..b6f8d4fb9e 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
index 5669f5691a..beb5024780 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
index 7ee18d42b3..3e864837f8 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
index 2baf948bc7..4dc52e2648 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
index e1c584d405..3ce51314b3 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
@@ -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_SERVITOR);
+ player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_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_SERVITOR);
+ player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_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_AND_THEREFORE_CANNOT_USE_THE_AUTOMATIC_USE_FUNCTION);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR_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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
index 83ffc494d5..4b817c3e70 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index ce3d851f06..9c2d96e99c 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
@@ -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,8 +253,8 @@ 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));
player.sendPacket(SystemMessageId.EXCHANGE_IS_SUCCESSFUL);
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
index d77d8eba6a..f841f306a1 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
index 4534c39c18..b65ad7c589 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
index f1ddb94865..5ae334f854 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
index 21710a1eb0..dd69523f80 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
@@ -96,6 +96,6 @@ public class RequestConfirmSiegeWaitingList implements IClientIncomingPacket
}
// Update the defender list
- client.sendPacket(new SiegeDefenderList(castle));
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
index dc81cb23dc..b2f53bed92 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
index 03d610fe78..1491cb1bfb 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
@@ -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();
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
index 36d36097c1..5fd67b8759 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
@@ -42,6 +42,6 @@ public class RequestCursedWeaponList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExCursedWeaponList());
+ player.sendPacket(new ExCursedWeaponList());
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
index 573a4f7950..193c436d7e 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
index ce21646986..6d59e89936 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
index 5882d1ea46..88fd8b949d 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index 1e735c8742..30020854d8 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -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();
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
index 224a640ef5..5227396561 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
index ed981b63f7..f5607f7fa5 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index a9e330cde4..9b3522967a 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -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:
@@ -194,7 +194,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)
@@ -259,8 +259,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)
@@ -294,13 +294,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()))
@@ -320,11 +320,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)
@@ -356,7 +356,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)
@@ -399,7 +399,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))
@@ -409,11 +409,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)
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
index 4652f15ddc..22d6a0efa5 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
index 9565b3e5ca..f6b8d47c50 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
@@ -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);
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
index 68bb180db1..7b967d8931 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -82,8 +82,8 @@ 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));
+ // cplayer.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
index 35fe136cbd..54a540188c 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
@@ -55,6 +55,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket
{
return;
}
+
player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
index 6ec3504089..79088e0c3a 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
@@ -47,6 +47,6 @@ public class RequestExFriendListExtended implements IClientIncomingPacket
return;
}
- client.sendPacket(new FriendList(player));
+ player.sendPacket(new FriendList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
index 2e0c2154ac..150caed567 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
@@ -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()));
}
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
index 8851aef463..00bb331778 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
@@ -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 + " !!");
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 16f28d5d04..3ee3f7a9aa 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
index 1b20e2e248..f35c069743 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
index c55df32ab6..2b1000f445 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
index 3842d82eb9..f6b2724012 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
index f868d0e26f..056262b4ab 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
@@ -48,6 +48,6 @@ public class RequestExShowContactList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExShowContactList(player));
+ player.sendPacket(new ExShowContactList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
index 2d9f0456f4..1589ff8175 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
index 0a4522bf64..a2667da070 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
index b2f32527da..1355a122ce 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
index 73dd408134..1233ad294b 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
@@ -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);
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
index f1c10ee605..10070bbbeb 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
@@ -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;
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
index a6ede07bb0..71e028b3be 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
index 04abcbce46..719d0b6fc8 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
@@ -61,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket
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;
}
@@ -69,7 +69,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;
}
@@ -91,7 +91,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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
index a7c019d65d..7253226656 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
index ff96a400c9..79db1768e6 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
index 89e11ba6a9..f51eec948c 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
index 25d004a7b7..2240af9a6e 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
@@ -41,6 +41,7 @@ public class RequestHennaRemoveList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new HennaRemoveList(player));
+
+ player.sendPacket(new HennaRemoveList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
index 1c1fc6d8c2..bc9710d465 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
@@ -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()));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
index d46ef778d4..f9e67ea1ed 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
@@ -43,6 +43,7 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExInzoneWaiting(player, _hide));
+
+ player.sendPacket(new ExInzoneWaiting(player, _hide));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
index 6551e7d0c4..42404bdd99 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
@@ -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();
+ return;
}
+
+ if (player.isInventoryDisabled())
+ {
+ return;
+ }
+
+ player.sendItemList();
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
index 99965602f9..cb5c08f036 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
@@ -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)
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
index 226f085fb0..9793d6e1d8 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
@@ -44,7 +44,7 @@ public class RequestKeyMapping implements IClientIncomingPacket
if (Config.STORE_UI_SETTINGS)
{
- client.sendPacket(new ExUISetting(player));
+ player.sendPacket(new ExUISetting(player));
}
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
index ada67e190c..2cdc066ead 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
index bffa403c8a..96b1664122 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
@@ -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));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
index 7b4703d69c..9fcb5e9736 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index b9c3900403..ec1f903d13 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -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_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_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;
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
index 9372163aea..769c2af9e2 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
@@ -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
{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
index 9149ce1284..8e7c3ee9fe 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
@@ -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));
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
index e670b165cd..de3adf72c3 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
@@ -43,7 +43,7 @@ public class RequestPackageSendableItemList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PackageSendableList(1, player, _objectId));
- client.sendPacket(new PackageSendableList(2, player, _objectId));
+ player.sendPacket(new PackageSendableList(1, player, _objectId));
+ player.sendPacket(new PackageSendableList(2, player, _objectId));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
index e8d53e1a19..e4ddcee7e8 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
index a9fac87c7e..ff9183a3fe 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
@@ -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_SUPPORT_4GAME_COM);
+ player.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_ON_HTTPS_SUPPORT_4GAME_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);
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
index b7f1ab30a7..7d148f2d91 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
index 713ffdd087..3fa5cede77 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
@@ -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.YOU_HAVE_JOINED_THE_WAITING_LIST_CHARACTERS_ARE_AUTOMATICALLY_DELETED_FROM_THE_LIST_AFTER_30_DAYS_IF_EXIT_WAITING_LIST_IS_USED_YOU_CANNOT_JOIN_THE_WAITING_LIST_FOR_5_MINUTES);
+ player.sendPacket(SystemMessageId.YOU_HAVE_JOINED_THE_WAITING_LIST_CHARACTERS_ARE_AUTOMATICALLY_DELETED_FROM_THE_LIST_AFTER_30_DAYS_IF_EXIT_WAITING_LIST_IS_USED_YOU_CANNOT_JOIN_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;
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
index e3ec88ca13..34af0251ca 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
@@ -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())));
}
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
index 76d591b14c..a4f9ba1784 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
index 3459b04c80..4c077a4c9e 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
@@ -64,6 +64,7 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PledgeReceiveMemberInfo(member));
+
+ player.sendPacket(new PledgeReceiveMemberInfo(member));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
index e380ce68c8..464ad76c9f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
@@ -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)
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
index 8fabbb1f4a..beee5121dd 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
@@ -52,6 +52,6 @@ public class RequestPledgeRecruitBoardDetail implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
+ player.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
index 1d0458db08..0d0d86f7db 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
index fe019fe6d6..dde18f32a4 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
@@ -44,6 +44,6 @@ public class RequestPledgeWaitingList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeWaitingList(_clanId));
+ player.sendPacket(new ExPledgeWaitingList(_clanId));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
index add0aa2f01..618c787a17 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
@@ -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));
}
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
index 4468b67642..500800df57 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
index 086f76c512..2a75d35297 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
@@ -51,11 +51,11 @@ 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(1, player));
- client.sendPacket(new ExReplyPostItemList(2, player));
+ player.sendPacket(new ExReplyPostItemList(1, player));
+ player.sendPacket(new ExReplyPostItemList(2, player));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
index 44bbd9d34c..a038920c8b 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
index 94958bc4fe..2ded12e55d 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
@@ -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());
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
index 2d616f2e94..bb2f0e8e6f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
index 8ab3d4962f..243e4a3674 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
@@ -87,7 +87,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
if (_items == null)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -128,13 +128,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;
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
index bee0568e03..365e1f598f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
index b64136dc79..21ba9b39af 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
index 8badb24c5f..6ffcc69313 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
@@ -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();
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
index 461f09492a..06d51160dd 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
index 5e7754bcbe..71dc3aa8da 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
index 891d914e07..e30bee1ac5 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
@@ -41,6 +41,6 @@ public class RequestRecipeItemMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeItemMakeInfo(_id, player));
+ player.sendPacket(new RecipeItemMakeInfo(_id, player));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
index d8e5ef166c..fd6b816fde 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
index d96459999d..b82a2048c7 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
@@ -54,6 +54,6 @@ public class RequestRecipeShopMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeShopItemInfo(shop, _recipeId));
+ player.sendPacket(new RecipeShopItemInfo(shop, _recipeId));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
index 39546dc93f..afc1ee3ecc 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
index 85e67c77ed..82f12af318 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index 1bb51eff9d..87a0574a9f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -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))
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
index 4da834c30d..3d01f1e525 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
@@ -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);
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
index 1632df189f..9c0c240bd4 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
index b3e709c5db..1a7c1ebc0f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
@@ -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)
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index 662058f4d8..dfda7319fc 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
index 7b82b33d56..af5f6876b7 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
index e5c53c86d0..1cf200da52 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
@@ -58,7 +58,7 @@ public class RequestSentPost 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;
}
@@ -73,6 +73,6 @@ public class RequestSentPost implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExReplySentPost(msg));
+ player.sendPacket(new ExReplySentPost(msg));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
index 99aec4ba86..05a414f453 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
@@ -47,6 +47,7 @@ public class RequestSentPostList implements IClientIncomingPacket
// player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
// return;
// }
- client.sendPacket(new ExShowSentPostList(player.getObjectId()));
+
+ player.sendPacket(new ExShowSentPostList(player.getObjectId()));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
index 72578e8d22..197ab07190 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
@@ -78,18 +78,23 @@ public class RequestSetCrop implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
index fe5ea44de4..a3e3ded0a3 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
@@ -77,18 +77,23 @@ public class RequestSetSeed implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index b30eb95f41..bf7d98030a 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
@@ -50,13 +51,19 @@ public class RequestShortCutReg implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- if ((client.getPlayer() == null) || (_page > 19) || (_page < 0))
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ if ((_page > 19) || (_page < 0))
{
return;
}
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
- client.getPlayer().registerShortCut(sc);
- client.sendPacket(new ShortCutRegister(sc));
+ player.registerShortCut(sc);
+ player.sendPacket(new ShortCutRegister(sc));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
index 1053bb74c1..fc2725daa7 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
@@ -44,6 +44,6 @@ public class RequestShowBeautyList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExResponseBeautyList(player, _type));
+ player.sendPacket(new ExResponseBeautyList(player, _type));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
index 9c73551f59..541b987e91 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
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;
/**
@@ -40,6 +41,12 @@ public class RequestShowBoard implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, client.getPlayer());
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, player);
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
index 162de17679..f74c3abf4d 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
@@ -41,6 +41,7 @@ public class RequestShowMiniMap implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ShowMiniMap(0));
+
+ player.sendPacket(new ShowMiniMap(0));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
index 097e8f5d30..f055ad8a57 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeAttackerList;
@@ -40,9 +41,17 @@ public class RequestSiegeAttackerList implements IClientIncomingPacket
public void run(GameClient client)
{
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
- if (castle != null)
+ if (castle == null)
{
- client.sendPacket(new SiegeAttackerList(castle));
+ return;
}
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeAttackerList(castle));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
index 6df5163c58..a8d4c9f6d0 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList;
@@ -44,6 +45,13 @@ public class RequestSiegeDefenderList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new SiegeDefenderList(castle));
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
index 8ae03da07b..51c42f7b7c 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
@@ -34,10 +34,12 @@ public class RequestSkillList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- final Player cha = client.getPlayer();
- if (cha != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- cha.sendSkillList();
+ return;
}
+
+ player.sendSkillList();
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
index ac3c6e1b62..2deae58393 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
@@ -60,52 +60,52 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
if ((clanDeclaringWar.getLevel() < 3) || (clanDeclaringWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaringWar.getWarCount() >= 30)
{
- client.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final Clan clanDeclaredWar = ClanTable.getInstance().getClanByName(_pledgeName);
if (clanDeclaredWar == null)
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar == clanDeclaringWar)
{
- client.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaringWar.getAllyId() == clanDeclaredWar.getAllyId()) && (clanDeclaringWar.getAllyId() != 0))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaredWar.getLevel() < 3) || (clanDeclaredWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis())
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -116,15 +116,15 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_T_DECLARE_A_WAR_BECAUSE_THE_21_DAY_PERIOD_HASN_T_PASSED_AFTER_A_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ALREADY_BEEN_AT_WAR_WITH_THE_S1_CLAN_5_DAYS_MUST_PASS_BEFORE_YOU_CAN_DECLARE_WAR_AGAIN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
index 47c39e2e70..e8c4b1a0e1 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
@@ -60,7 +60,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if ((member != null) && member.isOnline() && member.getPlayer().isInCombat())
{
player.sendPacket(SystemMessageId.A_CEASE_FIRE_DURING_A_CLAN_WAR_CAN_NOT_BE_CALLED_WHILE_MEMBERS_OF_YOUR_CLAN_ARE_ENGAGED_IN_BATTLE);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -69,13 +69,13 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if (targetClan == null)
{
player.sendMessage("No such clan.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -85,14 +85,14 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_NOT_DECLARED_A_CLAN_WAR_AGAINST_THE_CLAN_S1);
sm.addString(targetClan.getName());
player.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{
player.sendPacket(SystemMessageId.YOU_CANNOT_DECLARE_DEFEAT_AS_IT_HAS_NOT_BEEN_7_DAYS_SINCE_STARTING_A_CLAN_WAR_WITH_CLAN_S1);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
index d7d4d2b449..c13d46b2bb 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
@@ -65,7 +65,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
// The English system message say weapon, but it's applied to any equipped item.
if (player.isAttackingNow() || player.isCastingNow())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
return;
}
@@ -89,13 +89,13 @@ public class RequestUnEquipItem implements IClientIncomingPacket
if (!player.getInventory().canManipulateWithItemId(item.getId()))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
if (item.isWeapon() && item.getWeaponItem().isForceEquip() && !player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
@@ -117,7 +117,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
}
sm.addItemName(unequippedItem);
- client.sendPacket(sm);
+ player.sendPacket(sm);
final InventoryUpdate iu = new InventoryUpdate();
iu.addItems(unequipped);
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
index 0b38bcb67c..9e95fb93e1 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
@@ -51,28 +51,28 @@ public class RequestVoteNew implements IClientIncomingPacket
{
if (object == null)
{
- client.sendPacket(SystemMessageId.SELECT_TARGET);
+ player.sendPacket(SystemMessageId.SELECT_TARGET);
}
else if (object.isFakePlayer() && FakePlayerData.getInstance().isTalkable(object.getName()))
{
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addString(FakePlayerData.getInstance().getProperName(object.getName()));
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
player.setRecomLeft(player.getRecomLeft() - 1);
- client.sendPacket(new UserInfo(player));
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new UserInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
}
else
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
}
return;
}
@@ -85,19 +85,19 @@ public class RequestVoteNew implements IClientIncomingPacket
if (target == player)
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
return;
}
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
if (target.getRecomHave() >= 255)
{
- client.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
+ player.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
return;
}
@@ -106,16 +106,16 @@ public class RequestVoteNew implements IClientIncomingPacket
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addPcName(target);
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_BEEN_RECOMMENDED_BY_C1);
sm.addPcName(player);
target.sendPacket(sm);
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
target.broadcastUserInfo();
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
target.sendPacket(new ExVoteSystemInfo(target));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
index 05261ba813..0e3300d03c 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
@@ -67,12 +67,12 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
}
else if ((player.getWeightPenalty() >= 3) || !player.isInventoryUnder90(false))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
return;
}
else if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
return;
}
@@ -101,11 +101,11 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
if (player.getPremiumItemList().isEmpty())
{
- client.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
+ player.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
}
else
{
- client.sendPacket(new ExGetPremiumItemList(player));
+ player.sendPacket(new ExGetPremiumItemList(player));
}
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
index c3f29fe9c9..d23918130b 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
@@ -48,17 +48,17 @@ public class RequestWithdrawalPledge 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.isClanLeader())
{
- client.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
+ player.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
return;
}
if (player.isInCombat())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
return;
}
@@ -72,7 +72,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
// Remove the Player From the Member list
clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(player.getName()));
clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
- client.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
- client.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
+ player.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
+ player.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
index 84b879e0f7..13ecd08a96 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
@@ -150,14 +150,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
// Item Max Limit Check
if (!warehouse.validateCapacity(slots))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
+ player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
return;
}
// Check if enough adena and charge the fee
if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, manager, false))
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
return;
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
index a5462164d1..76e8ac2a68 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket
}
player.getBuyList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgBuy(player));
+ player.sendPacket(new PrivateStoreMsgBuy(player));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
index ac64c43c5c..d86bfc8f84 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket
}
player.getSellList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgSell(player));
+ player.sendPacket(new PrivateStoreMsgSell(player));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
index f3078c3e52..2726f99c08 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket
}
player.getSellList().setTitle(_msg);
- client.sendPacket(new ExPrivateStoreSetWholeMsg(player));
+ player.sendPacket(new ExPrivateStoreSetWholeMsg(player));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
index 8e7e6f9b2d..1022c9061d 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
@@ -73,7 +73,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!player.getAccessLevel().allowTransaction())
{
player.sendMessage("Transactions are disabled for your current Access Level.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -84,8 +84,8 @@ public class TradeRequest implements IClientIncomingPacket
{
if (!effect.checkCondition(BotReportTable.TRADE_ACTION_BLOCK_ID))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -104,7 +104,7 @@ public class TradeRequest implements IClientIncomingPacket
// and the following system message is sent to acting player.
if (target.getObjectId() == player.getObjectId())
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
return;
}
@@ -141,7 +141,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!target.isPlayer())
{
- client.sendPacket(SystemMessageId.INVALID_TARGET);
+ player.sendPacket(SystemMessageId.INVALID_TARGET);
return;
}
@@ -161,8 +161,8 @@ public class TradeRequest implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_IS_CURRENTLY_BEING_INVESTIGATED);
sm.addString(partner.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -189,13 +189,13 @@ public class TradeRequest implements IClientIncomingPacket
if ((player.getPrivateStoreType() != PrivateStoreType.NONE) || (partner.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;
}
if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
+ player.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
return;
}
@@ -204,7 +204,7 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
@@ -218,13 +218,13 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
if (player.calculateDistance3D(partner) > 150)
{
- client.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
+ player.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
return;
}
@@ -232,6 +232,6 @@ public class TradeRequest implements IClientIncomingPacket
partner.sendPacket(new SendTradeRequest(player.getObjectId()));
sm = new SystemMessage(SystemMessageId.YOU_HAVE_REQUESTED_A_TRADE_WITH_C1);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
index afbd8b0b76..3ccf45b47f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
@@ -44,6 +44,6 @@ public class RequestExCancelShape_Shifting_Item implements IClientIncomingPacket
}
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
index 055dc2dd1e..6d286b4894 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
@@ -60,7 +60,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -83,7 +83,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (!extractItem.getItem().isAppearanceable())
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -113,15 +113,15 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,20 +129,20 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -154,6 +154,6 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
}
request.setAppearanceExtractItem(extractItem);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
index f7aa0f3047..1c8eaa09c2 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
@@ -55,8 +55,8 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -65,35 +65,35 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -101,7 +101,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -112,6 +112,6 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
return;
}
- client.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
+ player.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 1de9056bda..2a6d3e9bb9 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -64,8 +64,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -74,36 +74,36 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -111,14 +111,14 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!appearanceStone.checkConditions(player, targetItem))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,56 +129,56 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
{
if (extractItem == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getOwnerId() != player.getObjectId())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!extractItem.getItem().isAppearanceable())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -189,21 +189,21 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final long cost = appearanceStone.getCost();
if (cost > player.getAdena())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (stone.getCount() < 1L)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((appearanceStone.getType() == AppearanceType.NORMAL) && (inventory.destroyItem(getClass().getSimpleName(), extractItem, 1, player, this) == null))
{
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -276,7 +276,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
player.sendInventoryUpdate(iu);
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
+ player.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
if (targetItem.isEquipped())
{
player.broadcastUserInfo();
@@ -288,8 +288,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
slots.addComponentType(slot);
}
}
- client.sendPacket(slots);
+ player.sendPacket(slots);
}
- client.sendPacket(new ExAdenaInvenCount(player));
+ player.sendPacket(new ExAdenaInvenCount(player));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
index abea70c48a..bf64e21529 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
@@ -65,8 +65,8 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket
// attempting to destroy item
if (player.getInventory().destroyItemByItemId("ChangeAttribute", _consumeItemId, 1, player, item) == null)
{
- client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
- client.sendPacket(ExChangeAttributeFail.STATIC);
+ player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
+ player.sendPacket(ExChangeAttributeFail.STATIC);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH);
return;
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
index a5001f4346..e79211ec85 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
@@ -52,26 +52,26 @@ public class RequestCommissionBuyInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
if (!player.isInventoryUnder80(false) || (player.getWeightPenalty() >= 3))
{
- client.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
return;
}
final CommissionItem commissionItem = ItemCommissionManager.getInstance().getCommissionItem(_commissionId);
if (commissionItem != null)
{
- client.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
+ player.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
}
else
{
- client.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
}
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
index aa794d2d96..16dec35e6f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
@@ -49,7 +49,7 @@ public class RequestCommissionBuyItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
index 4f7141c09d..8a3ff5c955 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
@@ -50,7 +50,7 @@ public class RequestCommissionDelete implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
index 1a7edbbaac..01005d24c1 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
@@ -50,18 +50,18 @@ public class RequestCommissionInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
final Item itemInstance = player.getInventory().getItemByObjectId(_itemObjectId);
if (itemInstance != null)
{
- client.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
+ player.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
}
else
{
- client.sendPacket(ExResponseCommissionInfo.EMPTY);
+ player.sendPacket(ExResponseCommissionInfo.EMPTY);
}
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
index 1ad79b9031..57fd69ec8d 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
@@ -62,7 +62,7 @@ public class RequestCommissionList implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
index 6b2f96e87d..7eb252c475 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
@@ -95,7 +95,7 @@ public class RequestCommissionRegister implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
index 1e826566da..b19aefac8d 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
@@ -45,7 +45,7 @@ public class RequestCommissionRegisteredItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
index 532c2496c2..75a5a816f0 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
@@ -46,11 +46,11 @@ public class RequestCommissionRegistrableItemList implements IClientIncomingPack
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
- client.sendPacket(new ExResponseCommissionItemList(1, player.getInventory().getAvailableItems(false, false, false)));
- client.sendPacket(new ExResponseCommissionItemList(2, player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(1, player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(2, player.getInventory().getAvailableItems(false, false, false)));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
index 670f9a29ed..398352c0f7 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = new CompoundRequest(player);
if (!player.addRequest(request))
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
@@ -77,7 +79,7 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
final Item itemOne = request.getItemOne();
if (itemOne == null)
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -87,11 +89,11 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItems.isEmpty())
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
- client.sendPacket(ExEnchantOneOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
index 315704e4e5..b8f98ff7ba 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
@@ -51,23 +51,25 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -77,14 +79,14 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -93,10 +95,10 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
- client.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
index 0dbe123787..72a0b34bfc 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemOne();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
request.setItemOne(0);
- client.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
index 5743927fa1..4a05f6c92b 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemTwo();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
request.setItemTwo(0);
- client.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
index c0eb970566..70e94532db 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
return;
}
@@ -78,7 +80,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -86,7 +88,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -96,7 +98,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -113,11 +115,11 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item item = player.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true);
if (success)
{
- client.sendPacket(new ExEnchantSucess(item.getId()));
+ player.sendPacket(new ExEnchantSucess(item.getId()));
}
else
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
index e4e46a5271..d5165c28ec 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
@@ -65,6 +65,7 @@ public class RequestCrystallizeEstimate 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);
@@ -73,28 +74,28 @@ public class RequestCrystallizeEstimate 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);
return;
}
final Item item = player.getInventory().getItemByObjectId(_objectId);
if ((item == null) || item.isShadowItem() || item.isTimeLimitedItem() || item.isHeroItem() || (!Config.ALT_ALLOW_AUGMENT_DESTROY && item.isAugmented()))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
PacketLogger.warning(player + ": tried to crystallize " + item.getItem());
return;
}
@@ -167,8 +168,8 @@ public class RequestCrystallizeEstimate 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;
}
@@ -177,11 +178,11 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket
if ((crystallizationRewards != null) && !crystallizationRewards.isEmpty())
{
player.setInCrystallize(true);
- client.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
+ player.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
}
else
{
- client.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
+ player.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
}
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
index 584b6e3e4e..a0b7c23c20 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
@@ -40,9 +40,11 @@ public class RequestFriendDetailInfo implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExFriendDetailInfo(player, _name));
+ return;
}
+
+ player.sendPacket(new ExFriendDetailInfo(player, _name));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
index 82fa3a651a..e9e5d90e84 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
@@ -48,6 +48,7 @@ public class RequestMenteeWaitingList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
+
+ player.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
index 7c22e266ca..20ec347a77 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
@@ -41,6 +41,7 @@ public class RequestMentorList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExMentorList(player));
+
+ player.sendPacket(new ExMentorList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
index 4023b0cff0..618f6dc7ed 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
@@ -37,9 +37,11 @@ public class RequestBRGamePoint implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExBRGamePoint(player));
+ return;
}
+
+ player.sendPacket(new ExBRGamePoint(player));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
index de0446cfd8..7ac78cfe4f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
@@ -34,7 +34,7 @@ public class RequestBRRecentProductList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- // Player player = client.getPlayer();
+ // Player player = cplayer.getPlayer();
// TODO: Implement it.
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
index d248722d3d..8cb6a581bc 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.vip;
import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.vip.ReceiveVipLuckyGameInfo;
@@ -32,6 +33,12 @@ public class RequestVipLuckGameInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.sendPacket(new ReceiveVipLuckyGameInfo(client.getPlayer()));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ReceiveVipLuckyGameInfo(player));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipProductList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipProductList.java
index b2b90dd2ae..0636bc6b36 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipProductList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipProductList.java
@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.vip;
import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.vip.ReceiveVipProductList;
@@ -32,6 +33,12 @@ public class RequestVipProductList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.sendPacket(new ReceiveVipProductList(client.getPlayer()));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ReceiveVipProductList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
index 6813c75ed2..f8d602624b 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
@@ -34,7 +34,6 @@ public class ExRestartClient implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.EX_RESTART_CLIENT.writeId(packet);
-
return true;
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
index 89678c1836..4378479707 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
- * A packet used to draw points and lines on client.
+ * A packet used to draw points and lines on cplayer.
* Note: Names in points and lines are bugged they will appear even when not looking at them.
* @author NosBit
*/
@@ -62,7 +62,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -76,7 +76,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -88,7 +88,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -100,7 +100,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
@@ -110,7 +110,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -124,7 +124,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -136,7 +136,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -148,7 +148,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
index ef3f4acc18..25ba232162 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
@@ -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;
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
index c6ea588540..acab47f316 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
index cdfaa128cb..129d1a52d1 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
index ba988591d0..370aeba2c5 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
@@ -51,6 +51,6 @@ public class Appearing implements IClientIncomingPacket
player.onTeleported();
}
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
index 0ea780c5b4..b47439803f 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
@@ -55,7 +55,7 @@ public class BypassUserCmd implements IClientIncomingPacket
}
else
{
- handler.useUserCommand(_command, client.getPlayer());
+ handler.useUserCommand(_command, player);
}
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
index a3236b0d83..43c0172038 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
@@ -65,12 +65,12 @@ public class CannotMoveAnymore implements IClientIncomingPacket
// PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+
// " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ());
// StopMove smwl = new StopMove(player);
- // client.getPlayer().sendPacket(smwl);
- // client.getPlayer().broadcastPacket(smwl);
+ // cplayer.getPlayer().sendPacket(smwl);
+ // cplayer.getPlayer().broadcastPacket(smwl);
//
- // StopRotation sr = new StopRotation(client.getPlayer(),
+ // StopRotation sr = new StopRotation(cplayer.getPlayer(),
// _heading);
- // client.getPlayer().sendPacket(sr);
- // client.getPlayer().broadcastPacket(sr);
+ // cplayer.getPlayer().sendPacket(sr);
+ // cplayer.getPlayer().broadcastPacket(sr);
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index e640f6074d..02e4946353 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -322,18 +322,18 @@ 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(1, player));
- client.sendPacket(new ItemList(2, player));
+ player.sendPacket(new ItemList(1, player));
+ player.sendPacket(new ItemList(2, player));
// Send Quest Item List
- client.sendPacket(new ExQuestItemList(1, player));
- client.sendPacket(new ExQuestItemList(2, player));
+ player.sendPacket(new ExQuestItemList(1, player));
+ player.sendPacket(new ExQuestItemList(2, player));
// Send Shortcuts
- client.sendPacket(new ShortCutInit(player));
+ player.sendPacket(new ShortCutInit(player));
// Send Action list
player.sendPacket(ExBasicActionList.STATIC_PACKET);
@@ -446,7 +446,7 @@ public class EnterWorld implements IClientIncomingPacket
player.sendPacket(new ExStorageMaxCount(player));
// Friend list
- client.sendPacket(new L2FriendList(player));
+ player.sendPacket(new L2FriendList(player));
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN);
sm.addString(player.getName());
for (int id : player.getFriendList())
@@ -474,14 +474,14 @@ public class EnterWorld implements IClientIncomingPacket
notice.replace("%clan_name%", player.getClan().getName());
notice.replace("%notice_text%", player.getClan().getNotice().replaceAll("\r\n", "
"));
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));
}
}
@@ -493,13 +493,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())
@@ -562,7 +562,7 @@ public class EnterWorld implements IClientIncomingPacket
{
if (MailManager.getInstance().hasUnreadPost(player))
{
- client.sendPacket(ExNoticePostArrived.valueOf(false));
+ player.sendPacket(ExNoticePostArrived.valueOf(false));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 4bb789645a..218e629395 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -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;
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 8078d0c10e..6ac4cc7ca0 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -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:
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
index 65c69620a0..94911328a2 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
@@ -41,6 +41,7 @@ public class RequestAlchemySkillList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExAlchemySkillList(player));
+
+ player.sendPacket(new ExAlchemySkillList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
index 49bb9c2285..fb6b18d662 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
index c6f8fe2045..b6f8d4fb9e 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
index 5669f5691a..beb5024780 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
index 7ee18d42b3..3e864837f8 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
index 2baf948bc7..4dc52e2648 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
index e1c584d405..3ce51314b3 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
@@ -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_SERVITOR);
+ player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_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_SERVITOR);
+ player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_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_AND_THEREFORE_CANNOT_USE_THE_AUTOMATIC_USE_FUNCTION);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR_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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
index 83ffc494d5..4b817c3e70 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index ce3d851f06..9c2d96e99c 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
@@ -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,8 +253,8 @@ 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));
player.sendPacket(SystemMessageId.EXCHANGE_IS_SUCCESSFUL);
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
index d77d8eba6a..f841f306a1 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
index 4534c39c18..b65ad7c589 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
index f1ddb94865..5ae334f854 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
index 21710a1eb0..dd69523f80 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
@@ -96,6 +96,6 @@ public class RequestConfirmSiegeWaitingList implements IClientIncomingPacket
}
// Update the defender list
- client.sendPacket(new SiegeDefenderList(castle));
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
index dc81cb23dc..b2f53bed92 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
index be08d7f35d..d76760750a 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
@@ -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();
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
index 36d36097c1..5fd67b8759 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
@@ -42,6 +42,6 @@ public class RequestCursedWeaponList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExCursedWeaponList());
+ player.sendPacket(new ExCursedWeaponList());
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
index 573a4f7950..193c436d7e 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
index ce21646986..6d59e89936 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
index 5882d1ea46..88fd8b949d 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index cb90d581c8..d8f319bf1f 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -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.S1_S2_HAS_BEEN_UNEQUIPPED);
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();
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
index 224a640ef5..5227396561 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
index ed981b63f7..f5607f7fa5 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index 2dce900339..bccd4d9235 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -86,7 +86,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;
}
@@ -122,9 +122,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;
}
@@ -133,27 +133,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;
}
@@ -163,9 +163,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;
}
@@ -174,9 +174,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:
@@ -196,7 +196,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)
@@ -261,8 +261,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)
@@ -296,13 +296,13 @@ public class RequestEnchantItem implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED);
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()))
@@ -322,11 +322,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)
@@ -358,7 +358,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)
@@ -401,7 +401,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))
@@ -411,11 +411,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)
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
index 4652f15ddc..22d6a0efa5 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
index 9565b3e5ca..f6b8d47c50 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
@@ -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);
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
index 68bb180db1..7b967d8931 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -82,8 +82,8 @@ 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));
+ // cplayer.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
index 35fe136cbd..54a540188c 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
@@ -55,6 +55,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket
{
return;
}
+
player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
index 6ec3504089..79088e0c3a 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
@@ -47,6 +47,6 @@ public class RequestExFriendListExtended implements IClientIncomingPacket
return;
}
- client.sendPacket(new FriendList(player));
+ player.sendPacket(new FriendList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
index 2e0c2154ac..150caed567 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
@@ -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()));
}
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
index 8851aef463..00bb331778 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
@@ -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 + " !!");
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 16f28d5d04..3ee3f7a9aa 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
index 1b20e2e248..f35c069743 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
index c55df32ab6..2b1000f445 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
index 3842d82eb9..f6b2724012 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
index f868d0e26f..056262b4ab 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
@@ -48,6 +48,6 @@ public class RequestExShowContactList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExShowContactList(player));
+ player.sendPacket(new ExShowContactList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
index 2d9f0456f4..1589ff8175 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
index 0a4522bf64..a2667da070 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
index b2f32527da..1355a122ce 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
index 73dd408134..1233ad294b 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
@@ -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);
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
index f1c10ee605..10070bbbeb 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
@@ -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;
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
index a6ede07bb0..71e028b3be 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
index 04abcbce46..719d0b6fc8 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
@@ -61,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket
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;
}
@@ -69,7 +69,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;
}
@@ -91,7 +91,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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
index a7c019d65d..7253226656 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
index ff96a400c9..79db1768e6 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
index 89e11ba6a9..f51eec948c 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
index 25d004a7b7..2240af9a6e 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
@@ -41,6 +41,7 @@ public class RequestHennaRemoveList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new HennaRemoveList(player));
+
+ player.sendPacket(new HennaRemoveList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
index 1c1fc6d8c2..bc9710d465 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
@@ -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()));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
index d46ef778d4..f9e67ea1ed 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
@@ -43,6 +43,7 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExInzoneWaiting(player, _hide));
+
+ player.sendPacket(new ExInzoneWaiting(player, _hide));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
index 6551e7d0c4..42404bdd99 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
@@ -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();
+ return;
}
+
+ if (player.isInventoryDisabled())
+ {
+ return;
+ }
+
+ player.sendItemList();
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
index 99965602f9..cb5c08f036 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
@@ -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)
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
index 226f085fb0..9793d6e1d8 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
@@ -44,7 +44,7 @@ public class RequestKeyMapping implements IClientIncomingPacket
if (Config.STORE_UI_SETTINGS)
{
- client.sendPacket(new ExUISetting(player));
+ player.sendPacket(new ExUISetting(player));
}
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
index ada67e190c..2cdc066ead 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
index bffa403c8a..96b1664122 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
@@ -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));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
index 7b4703d69c..9fcb5e9736 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index b9c3900403..ec1f903d13 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -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_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_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;
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
index 9372163aea..769c2af9e2 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
@@ -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
{
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
index 9149ce1284..8e7c3ee9fe 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
@@ -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));
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
index e670b165cd..de3adf72c3 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
@@ -43,7 +43,7 @@ public class RequestPackageSendableItemList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PackageSendableList(1, player, _objectId));
- client.sendPacket(new PackageSendableList(2, player, _objectId));
+ player.sendPacket(new PackageSendableList(1, player, _objectId));
+ player.sendPacket(new PackageSendableList(2, player, _objectId));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
index e8d53e1a19..e4ddcee7e8 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
index a9fac87c7e..ff9183a3fe 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
@@ -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_SUPPORT_4GAME_COM);
+ player.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_ON_HTTPS_SUPPORT_4GAME_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);
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
index b7f1ab30a7..7d148f2d91 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
index 713ffdd087..3fa5cede77 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
@@ -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.YOU_HAVE_JOINED_THE_WAITING_LIST_CHARACTERS_ARE_AUTOMATICALLY_DELETED_FROM_THE_LIST_AFTER_30_DAYS_IF_EXIT_WAITING_LIST_IS_USED_YOU_CANNOT_JOIN_THE_WAITING_LIST_FOR_5_MINUTES);
+ player.sendPacket(SystemMessageId.YOU_HAVE_JOINED_THE_WAITING_LIST_CHARACTERS_ARE_AUTOMATICALLY_DELETED_FROM_THE_LIST_AFTER_30_DAYS_IF_EXIT_WAITING_LIST_IS_USED_YOU_CANNOT_JOIN_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;
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
index e3ec88ca13..34af0251ca 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
@@ -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())));
}
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
index 76d591b14c..a4f9ba1784 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
index 3459b04c80..4c077a4c9e 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
@@ -64,6 +64,7 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PledgeReceiveMemberInfo(member));
+
+ player.sendPacket(new PledgeReceiveMemberInfo(member));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
index e380ce68c8..464ad76c9f 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
@@ -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)
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
index 8fabbb1f4a..beee5121dd 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
@@ -52,6 +52,6 @@ public class RequestPledgeRecruitBoardDetail implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
+ player.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
index 1d0458db08..0d0d86f7db 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
index fe019fe6d6..dde18f32a4 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
@@ -44,6 +44,6 @@ public class RequestPledgeWaitingList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeWaitingList(_clanId));
+ player.sendPacket(new ExPledgeWaitingList(_clanId));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
index add0aa2f01..618c787a17 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
@@ -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));
}
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
index 4468b67642..500800df57 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
index 086f76c512..2a75d35297 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
@@ -51,11 +51,11 @@ 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(1, player));
- client.sendPacket(new ExReplyPostItemList(2, player));
+ player.sendPacket(new ExReplyPostItemList(1, player));
+ player.sendPacket(new ExReplyPostItemList(2, player));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
index 44bbd9d34c..a038920c8b 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
index 94958bc4fe..2ded12e55d 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
@@ -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());
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
index 2d616f2e94..bb2f0e8e6f 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
index 8ab3d4962f..243e4a3674 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
@@ -87,7 +87,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
if (_items == null)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -128,13 +128,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;
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
index bee0568e03..365e1f598f 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
index b64136dc79..21ba9b39af 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
index 8badb24c5f..6ffcc69313 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
@@ -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();
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
index 461f09492a..06d51160dd 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
index 5e7754bcbe..71dc3aa8da 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
index 891d914e07..e30bee1ac5 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
@@ -41,6 +41,6 @@ public class RequestRecipeItemMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeItemMakeInfo(_id, player));
+ player.sendPacket(new RecipeItemMakeInfo(_id, player));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
index d8e5ef166c..fd6b816fde 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
index d96459999d..b82a2048c7 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
@@ -54,6 +54,6 @@ public class RequestRecipeShopMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeShopItemInfo(shop, _recipeId));
+ player.sendPacket(new RecipeShopItemInfo(shop, _recipeId));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
index 39546dc93f..afc1ee3ecc 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
index 85e67c77ed..82f12af318 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index 1bb51eff9d..87a0574a9f 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -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))
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
index 4da834c30d..3d01f1e525 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
@@ -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);
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
index 1632df189f..9c0c240bd4 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
index b3e709c5db..1a7c1ebc0f 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
@@ -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)
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index 662058f4d8..dfda7319fc 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
index 7b82b33d56..af5f6876b7 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
index e5c53c86d0..1cf200da52 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
@@ -58,7 +58,7 @@ public class RequestSentPost 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;
}
@@ -73,6 +73,6 @@ public class RequestSentPost implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExReplySentPost(msg));
+ player.sendPacket(new ExReplySentPost(msg));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
index 99aec4ba86..05a414f453 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
@@ -47,6 +47,7 @@ public class RequestSentPostList implements IClientIncomingPacket
// player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
// return;
// }
- client.sendPacket(new ExShowSentPostList(player.getObjectId()));
+
+ player.sendPacket(new ExShowSentPostList(player.getObjectId()));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
index 72578e8d22..197ab07190 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
@@ -78,18 +78,23 @@ public class RequestSetCrop implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
index fe5ea44de4..a3e3ded0a3 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
@@ -77,18 +77,23 @@ public class RequestSetSeed implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index b30eb95f41..bf7d98030a 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
@@ -50,13 +51,19 @@ public class RequestShortCutReg implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- if ((client.getPlayer() == null) || (_page > 19) || (_page < 0))
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ if ((_page > 19) || (_page < 0))
{
return;
}
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
- client.getPlayer().registerShortCut(sc);
- client.sendPacket(new ShortCutRegister(sc));
+ player.registerShortCut(sc);
+ player.sendPacket(new ShortCutRegister(sc));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
index 1053bb74c1..fc2725daa7 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
@@ -44,6 +44,6 @@ public class RequestShowBeautyList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExResponseBeautyList(player, _type));
+ player.sendPacket(new ExResponseBeautyList(player, _type));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
index 9c73551f59..541b987e91 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
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;
/**
@@ -40,6 +41,12 @@ public class RequestShowBoard implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, client.getPlayer());
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, player);
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
index 162de17679..f74c3abf4d 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
@@ -41,6 +41,7 @@ public class RequestShowMiniMap implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ShowMiniMap(0));
+
+ player.sendPacket(new ShowMiniMap(0));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
index 097e8f5d30..f055ad8a57 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeAttackerList;
@@ -40,9 +41,17 @@ public class RequestSiegeAttackerList implements IClientIncomingPacket
public void run(GameClient client)
{
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
- if (castle != null)
+ if (castle == null)
{
- client.sendPacket(new SiegeAttackerList(castle));
+ return;
}
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeAttackerList(castle));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
index 6df5163c58..a8d4c9f6d0 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList;
@@ -44,6 +45,13 @@ public class RequestSiegeDefenderList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new SiegeDefenderList(castle));
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
index 8ae03da07b..51c42f7b7c 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
@@ -34,10 +34,12 @@ public class RequestSkillList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- final Player cha = client.getPlayer();
- if (cha != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- cha.sendSkillList();
+ return;
}
+
+ player.sendSkillList();
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
index ac3c6e1b62..2deae58393 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
@@ -60,52 +60,52 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
if ((clanDeclaringWar.getLevel() < 3) || (clanDeclaringWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaringWar.getWarCount() >= 30)
{
- client.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final Clan clanDeclaredWar = ClanTable.getInstance().getClanByName(_pledgeName);
if (clanDeclaredWar == null)
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar == clanDeclaringWar)
{
- client.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaringWar.getAllyId() == clanDeclaredWar.getAllyId()) && (clanDeclaringWar.getAllyId() != 0))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaredWar.getLevel() < 3) || (clanDeclaredWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis())
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -116,15 +116,15 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_T_DECLARE_A_WAR_BECAUSE_THE_21_DAY_PERIOD_HASN_T_PASSED_AFTER_A_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ALREADY_BEEN_AT_WAR_WITH_THE_S1_CLAN_5_DAYS_MUST_PASS_BEFORE_YOU_CAN_DECLARE_WAR_AGAIN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
index 47c39e2e70..e8c4b1a0e1 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
@@ -60,7 +60,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if ((member != null) && member.isOnline() && member.getPlayer().isInCombat())
{
player.sendPacket(SystemMessageId.A_CEASE_FIRE_DURING_A_CLAN_WAR_CAN_NOT_BE_CALLED_WHILE_MEMBERS_OF_YOUR_CLAN_ARE_ENGAGED_IN_BATTLE);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -69,13 +69,13 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if (targetClan == null)
{
player.sendMessage("No such clan.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -85,14 +85,14 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_NOT_DECLARED_A_CLAN_WAR_AGAINST_THE_CLAN_S1);
sm.addString(targetClan.getName());
player.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{
player.sendPacket(SystemMessageId.YOU_CANNOT_DECLARE_DEFEAT_AS_IT_HAS_NOT_BEEN_7_DAYS_SINCE_STARTING_A_CLAN_WAR_WITH_CLAN_S1);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
index db5981de3d..32d110951d 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
@@ -65,7 +65,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
// The English system message say weapon, but it's applied to any equipped item.
if (player.isAttackingNow() || player.isCastingNow())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
return;
}
@@ -89,13 +89,13 @@ public class RequestUnEquipItem implements IClientIncomingPacket
if (!player.getInventory().canManipulateWithItemId(item.getId()))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
if (item.isWeapon() && item.getWeaponItem().isForceEquip() && !player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
@@ -117,7 +117,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
}
sm.addItemName(unequippedItem);
- client.sendPacket(sm);
+ player.sendPacket(sm);
final InventoryUpdate iu = new InventoryUpdate();
iu.addItems(unequipped);
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
index 0b38bcb67c..9e95fb93e1 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
@@ -51,28 +51,28 @@ public class RequestVoteNew implements IClientIncomingPacket
{
if (object == null)
{
- client.sendPacket(SystemMessageId.SELECT_TARGET);
+ player.sendPacket(SystemMessageId.SELECT_TARGET);
}
else if (object.isFakePlayer() && FakePlayerData.getInstance().isTalkable(object.getName()))
{
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addString(FakePlayerData.getInstance().getProperName(object.getName()));
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
player.setRecomLeft(player.getRecomLeft() - 1);
- client.sendPacket(new UserInfo(player));
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new UserInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
}
else
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
}
return;
}
@@ -85,19 +85,19 @@ public class RequestVoteNew implements IClientIncomingPacket
if (target == player)
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
return;
}
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
if (target.getRecomHave() >= 255)
{
- client.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
+ player.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
return;
}
@@ -106,16 +106,16 @@ public class RequestVoteNew implements IClientIncomingPacket
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addPcName(target);
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_BEEN_RECOMMENDED_BY_C1);
sm.addPcName(player);
target.sendPacket(sm);
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
target.broadcastUserInfo();
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
target.sendPacket(new ExVoteSystemInfo(target));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
index 05261ba813..0e3300d03c 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
@@ -67,12 +67,12 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
}
else if ((player.getWeightPenalty() >= 3) || !player.isInventoryUnder90(false))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
return;
}
else if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
return;
}
@@ -101,11 +101,11 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
if (player.getPremiumItemList().isEmpty())
{
- client.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
+ player.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
}
else
{
- client.sendPacket(new ExGetPremiumItemList(player));
+ player.sendPacket(new ExGetPremiumItemList(player));
}
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
index c3f29fe9c9..d23918130b 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
@@ -48,17 +48,17 @@ public class RequestWithdrawalPledge 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.isClanLeader())
{
- client.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
+ player.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
return;
}
if (player.isInCombat())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
return;
}
@@ -72,7 +72,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
// Remove the Player From the Member list
clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(player.getName()));
clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
- client.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
- client.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
+ player.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
+ player.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
index 84b879e0f7..13ecd08a96 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
@@ -150,14 +150,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
// Item Max Limit Check
if (!warehouse.validateCapacity(slots))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
+ player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
return;
}
// Check if enough adena and charge the fee
if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, manager, false))
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
return;
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
index a5462164d1..76e8ac2a68 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket
}
player.getBuyList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgBuy(player));
+ player.sendPacket(new PrivateStoreMsgBuy(player));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
index ac64c43c5c..d86bfc8f84 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket
}
player.getSellList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgSell(player));
+ player.sendPacket(new PrivateStoreMsgSell(player));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
index f3078c3e52..2726f99c08 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket
}
player.getSellList().setTitle(_msg);
- client.sendPacket(new ExPrivateStoreSetWholeMsg(player));
+ player.sendPacket(new ExPrivateStoreSetWholeMsg(player));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
index 8e7e6f9b2d..1022c9061d 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
@@ -73,7 +73,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!player.getAccessLevel().allowTransaction())
{
player.sendMessage("Transactions are disabled for your current Access Level.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -84,8 +84,8 @@ public class TradeRequest implements IClientIncomingPacket
{
if (!effect.checkCondition(BotReportTable.TRADE_ACTION_BLOCK_ID))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -104,7 +104,7 @@ public class TradeRequest implements IClientIncomingPacket
// and the following system message is sent to acting player.
if (target.getObjectId() == player.getObjectId())
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
return;
}
@@ -141,7 +141,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!target.isPlayer())
{
- client.sendPacket(SystemMessageId.INVALID_TARGET);
+ player.sendPacket(SystemMessageId.INVALID_TARGET);
return;
}
@@ -161,8 +161,8 @@ public class TradeRequest implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_IS_CURRENTLY_BEING_INVESTIGATED);
sm.addString(partner.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -189,13 +189,13 @@ public class TradeRequest implements IClientIncomingPacket
if ((player.getPrivateStoreType() != PrivateStoreType.NONE) || (partner.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;
}
if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
+ player.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
return;
}
@@ -204,7 +204,7 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
@@ -218,13 +218,13 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
if (player.calculateDistance3D(partner) > 150)
{
- client.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
+ player.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
return;
}
@@ -232,6 +232,6 @@ public class TradeRequest implements IClientIncomingPacket
partner.sendPacket(new SendTradeRequest(player.getObjectId()));
sm = new SystemMessage(SystemMessageId.YOU_HAVE_REQUESTED_A_TRADE_WITH_C1);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
index afbd8b0b76..3ccf45b47f 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
@@ -44,6 +44,6 @@ public class RequestExCancelShape_Shifting_Item implements IClientIncomingPacket
}
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
index 055dc2dd1e..6d286b4894 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
@@ -60,7 +60,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -83,7 +83,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (!extractItem.getItem().isAppearanceable())
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -113,15 +113,15 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,20 +129,20 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -154,6 +154,6 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
}
request.setAppearanceExtractItem(extractItem);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
index f7aa0f3047..1c8eaa09c2 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
@@ -55,8 +55,8 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -65,35 +65,35 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -101,7 +101,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -112,6 +112,6 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
return;
}
- client.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
+ player.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 1de9056bda..2a6d3e9bb9 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -64,8 +64,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -74,36 +74,36 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -111,14 +111,14 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!appearanceStone.checkConditions(player, targetItem))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,56 +129,56 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
{
if (extractItem == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getOwnerId() != player.getObjectId())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!extractItem.getItem().isAppearanceable())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -189,21 +189,21 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final long cost = appearanceStone.getCost();
if (cost > player.getAdena())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (stone.getCount() < 1L)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((appearanceStone.getType() == AppearanceType.NORMAL) && (inventory.destroyItem(getClass().getSimpleName(), extractItem, 1, player, this) == null))
{
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -276,7 +276,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
player.sendInventoryUpdate(iu);
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
+ player.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
if (targetItem.isEquipped())
{
player.broadcastUserInfo();
@@ -288,8 +288,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
slots.addComponentType(slot);
}
}
- client.sendPacket(slots);
+ player.sendPacket(slots);
}
- client.sendPacket(new ExAdenaInvenCount(player));
+ player.sendPacket(new ExAdenaInvenCount(player));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
index abea70c48a..bf64e21529 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
@@ -65,8 +65,8 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket
// attempting to destroy item
if (player.getInventory().destroyItemByItemId("ChangeAttribute", _consumeItemId, 1, player, item) == null)
{
- client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
- client.sendPacket(ExChangeAttributeFail.STATIC);
+ player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
+ player.sendPacket(ExChangeAttributeFail.STATIC);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH);
return;
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
index a5001f4346..e79211ec85 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
@@ -52,26 +52,26 @@ public class RequestCommissionBuyInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
if (!player.isInventoryUnder80(false) || (player.getWeightPenalty() >= 3))
{
- client.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
return;
}
final CommissionItem commissionItem = ItemCommissionManager.getInstance().getCommissionItem(_commissionId);
if (commissionItem != null)
{
- client.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
+ player.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
}
else
{
- client.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
}
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
index aa794d2d96..16dec35e6f 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
@@ -49,7 +49,7 @@ public class RequestCommissionBuyItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
index 4f7141c09d..8a3ff5c955 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
@@ -50,7 +50,7 @@ public class RequestCommissionDelete implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
index 1a7edbbaac..01005d24c1 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
@@ -50,18 +50,18 @@ public class RequestCommissionInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
final Item itemInstance = player.getInventory().getItemByObjectId(_itemObjectId);
if (itemInstance != null)
{
- client.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
+ player.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
}
else
{
- client.sendPacket(ExResponseCommissionInfo.EMPTY);
+ player.sendPacket(ExResponseCommissionInfo.EMPTY);
}
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
index 1ad79b9031..57fd69ec8d 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
@@ -62,7 +62,7 @@ public class RequestCommissionList implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
index 6b2f96e87d..7eb252c475 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
@@ -95,7 +95,7 @@ public class RequestCommissionRegister implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
index 1e826566da..b19aefac8d 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
@@ -45,7 +45,7 @@ public class RequestCommissionRegisteredItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
index 532c2496c2..75a5a816f0 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
@@ -46,11 +46,11 @@ public class RequestCommissionRegistrableItemList implements IClientIncomingPack
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
- client.sendPacket(new ExResponseCommissionItemList(1, player.getInventory().getAvailableItems(false, false, false)));
- client.sendPacket(new ExResponseCommissionItemList(2, player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(1, player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(2, player.getInventory().getAvailableItems(false, false, false)));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
index 670f9a29ed..398352c0f7 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = new CompoundRequest(player);
if (!player.addRequest(request))
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
@@ -77,7 +79,7 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
final Item itemOne = request.getItemOne();
if (itemOne == null)
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -87,11 +89,11 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItems.isEmpty())
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
- client.sendPacket(ExEnchantOneOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
index 315704e4e5..b8f98ff7ba 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
@@ -51,23 +51,25 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -77,14 +79,14 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -93,10 +95,10 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
- client.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
index 0dbe123787..72a0b34bfc 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemOne();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
request.setItemOne(0);
- client.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
index 5743927fa1..4a05f6c92b 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemTwo();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
request.setItemTwo(0);
- client.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
index c0eb970566..70e94532db 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
return;
}
@@ -78,7 +80,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -86,7 +88,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -96,7 +98,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -113,11 +115,11 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item item = player.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true);
if (success)
{
- client.sendPacket(new ExEnchantSucess(item.getId()));
+ player.sendPacket(new ExEnchantSucess(item.getId()));
}
else
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
index e4e46a5271..d5165c28ec 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
@@ -65,6 +65,7 @@ public class RequestCrystallizeEstimate 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);
@@ -73,28 +74,28 @@ public class RequestCrystallizeEstimate 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);
return;
}
final Item item = player.getInventory().getItemByObjectId(_objectId);
if ((item == null) || item.isShadowItem() || item.isTimeLimitedItem() || item.isHeroItem() || (!Config.ALT_ALLOW_AUGMENT_DESTROY && item.isAugmented()))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
PacketLogger.warning(player + ": tried to crystallize " + item.getItem());
return;
}
@@ -167,8 +168,8 @@ public class RequestCrystallizeEstimate 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;
}
@@ -177,11 +178,11 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket
if ((crystallizationRewards != null) && !crystallizationRewards.isEmpty())
{
player.setInCrystallize(true);
- client.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
+ player.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
}
else
{
- client.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
+ player.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
}
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
index 584b6e3e4e..a0b7c23c20 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
@@ -40,9 +40,11 @@ public class RequestFriendDetailInfo implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExFriendDetailInfo(player, _name));
+ return;
}
+
+ player.sendPacket(new ExFriendDetailInfo(player, _name));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
index 82fa3a651a..e9e5d90e84 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
@@ -48,6 +48,7 @@ public class RequestMenteeWaitingList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
+
+ player.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
index 7c22e266ca..20ec347a77 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
@@ -41,6 +41,7 @@ public class RequestMentorList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExMentorList(player));
+
+ player.sendPacket(new ExMentorList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
index 4023b0cff0..618f6dc7ed 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
@@ -37,9 +37,11 @@ public class RequestBRGamePoint implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExBRGamePoint(player));
+ return;
}
+
+ player.sendPacket(new ExBRGamePoint(player));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
index de0446cfd8..7ac78cfe4f 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
@@ -34,7 +34,7 @@ public class RequestBRRecentProductList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- // Player player = client.getPlayer();
+ // Player player = cplayer.getPlayer();
// TODO: Implement it.
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
index d248722d3d..8cb6a581bc 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.vip;
import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.vip.ReceiveVipLuckyGameInfo;
@@ -32,6 +33,12 @@ public class RequestVipLuckGameInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.sendPacket(new ReceiveVipLuckyGameInfo(client.getPlayer()));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ReceiveVipLuckyGameInfo(player));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipProductList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipProductList.java
index b2b90dd2ae..0636bc6b36 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipProductList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipProductList.java
@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.vip;
import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.vip.ReceiveVipProductList;
@@ -32,6 +33,12 @@ public class RequestVipProductList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.sendPacket(new ReceiveVipProductList(client.getPlayer()));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ReceiveVipProductList(player));
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
index 6813c75ed2..f8d602624b 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
@@ -34,7 +34,6 @@ public class ExRestartClient implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.EX_RESTART_CLIENT.writeId(packet);
-
return true;
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
index 89678c1836..4378479707 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
- * A packet used to draw points and lines on client.
+ * A packet used to draw points and lines on cplayer.
* Note: Names in points and lines are bugged they will appear even when not looking at them.
* @author NosBit
*/
@@ -62,7 +62,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -76,7 +76,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -88,7 +88,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -100,7 +100,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
@@ -110,7 +110,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -124,7 +124,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -136,7 +136,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -148,7 +148,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
index ef3f4acc18..25ba232162 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
@@ -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;
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
index c6ea588540..acab47f316 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
index cdfaa128cb..129d1a52d1 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
index ba988591d0..370aeba2c5 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
@@ -51,6 +51,6 @@ public class Appearing implements IClientIncomingPacket
player.onTeleported();
}
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
index 0ea780c5b4..b47439803f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
@@ -55,7 +55,7 @@ public class BypassUserCmd implements IClientIncomingPacket
}
else
{
- handler.useUserCommand(_command, client.getPlayer());
+ handler.useUserCommand(_command, player);
}
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
index a3236b0d83..43c0172038 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
@@ -65,12 +65,12 @@ public class CannotMoveAnymore implements IClientIncomingPacket
// PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+
// " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ());
// StopMove smwl = new StopMove(player);
- // client.getPlayer().sendPacket(smwl);
- // client.getPlayer().broadcastPacket(smwl);
+ // cplayer.getPlayer().sendPacket(smwl);
+ // cplayer.getPlayer().broadcastPacket(smwl);
//
- // StopRotation sr = new StopRotation(client.getPlayer(),
+ // StopRotation sr = new StopRotation(cplayer.getPlayer(),
// _heading);
- // client.getPlayer().sendPacket(sr);
- // client.getPlayer().broadcastPacket(sr);
+ // cplayer.getPlayer().sendPacket(sr);
+ // cplayer.getPlayer().broadcastPacket(sr);
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index c884e1df3c..326b6050c3 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -326,18 +326,18 @@ 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(1, player));
- client.sendPacket(new ItemList(2, player));
+ player.sendPacket(new ItemList(1, player));
+ player.sendPacket(new ItemList(2, player));
// Send Quest Item List
- client.sendPacket(new ExQuestItemList(1, player));
- client.sendPacket(new ExQuestItemList(2, player));
+ player.sendPacket(new ExQuestItemList(1, player));
+ player.sendPacket(new ExQuestItemList(2, player));
// Send Shortcuts
- client.sendPacket(new ShortCutInit(player));
+ player.sendPacket(new ShortCutInit(player));
// Send Action list
player.sendPacket(ExBasicActionList.STATIC_PACKET);
@@ -450,7 +450,7 @@ public class EnterWorld implements IClientIncomingPacket
player.sendPacket(new ExStorageMaxCount(player));
// Friend list
- client.sendPacket(new L2FriendList(player));
+ player.sendPacket(new L2FriendList(player));
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN);
sm.addString(player.getName());
for (int id : player.getFriendList())
@@ -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", "
"));
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));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 550735eb12..beeceb0a96 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -93,12 +93,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:
@@ -107,7 +107,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new AcquireSkillInfo(_skillType, s));
+ player.sendPacket(new AcquireSkillInfo(_skillType, s));
break;
}
case SUBPLEDGE:
@@ -116,7 +116,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new AcquireSkillInfo(_skillType, s));
+ player.sendPacket(new AcquireSkillInfo(_skillType, s));
break;
}
case ALCHEMY:
@@ -125,7 +125,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new AcquireSkillInfo(_skillType, s));
+ player.sendPacket(new AcquireSkillInfo(_skillType, s));
break;
}
case REVELATION:
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 8078d0c10e..6ac4cc7ca0 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -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:
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
index 65c69620a0..94911328a2 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
@@ -41,6 +41,7 @@ public class RequestAlchemySkillList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExAlchemySkillList(player));
+
+ player.sendPacket(new ExAlchemySkillList(player));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
index 49bb9c2285..fb6b18d662 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
index c6f8fe2045..b6f8d4fb9e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
index 5669f5691a..beb5024780 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
index 7ee18d42b3..3e864837f8 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
index 2baf948bc7..4dc52e2648 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
index 04cf0eb4aa..90eb5edf27 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
@@ -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_SERVITOR);
+ player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_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_SERVITOR);
+ player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_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_AND_THEREFORE_CANNOT_USE_THE_AUTOMATIC_USE_FUNCTION);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR_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())
{
- 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);
}
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
index 83ffc494d5..4b817c3e70 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index ce3d851f06..9c2d96e99c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
@@ -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,8 +253,8 @@ 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));
player.sendPacket(SystemMessageId.EXCHANGE_IS_SUCCESSFUL);
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
index d77d8eba6a..f841f306a1 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
index 4534c39c18..b65ad7c589 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
index f1ddb94865..5ae334f854 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
index 21710a1eb0..dd69523f80 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
@@ -96,6 +96,6 @@ public class RequestConfirmSiegeWaitingList implements IClientIncomingPacket
}
// Update the defender list
- client.sendPacket(new SiegeDefenderList(castle));
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
index dc81cb23dc..b2f53bed92 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
index be08d7f35d..d76760750a 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
@@ -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();
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
index 36d36097c1..5fd67b8759 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
@@ -42,6 +42,6 @@ public class RequestCursedWeaponList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExCursedWeaponList());
+ player.sendPacket(new ExCursedWeaponList());
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
index 573a4f7950..193c436d7e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
index ce21646986..6d59e89936 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
index 5882d1ea46..88fd8b949d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index cb90d581c8..d8f319bf1f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -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.S1_S2_HAS_BEEN_UNEQUIPPED);
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();
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
index 224a640ef5..5227396561 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
index ed981b63f7..f5607f7fa5 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index 2dce900339..bccd4d9235 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -86,7 +86,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;
}
@@ -122,9 +122,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;
}
@@ -133,27 +133,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;
}
@@ -163,9 +163,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;
}
@@ -174,9 +174,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:
@@ -196,7 +196,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)
@@ -261,8 +261,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)
@@ -296,13 +296,13 @@ public class RequestEnchantItem implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED);
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()))
@@ -322,11 +322,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)
@@ -358,7 +358,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)
@@ -401,7 +401,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))
@@ -411,11 +411,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)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
index 4652f15ddc..22d6a0efa5 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
index 9565b3e5ca..f6b8d47c50 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
@@ -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);
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
index 98f0487428..959361f9a3 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -81,8 +81,8 @@ 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));
+ // cplayer.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
index 35fe136cbd..54a540188c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
@@ -55,6 +55,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket
{
return;
}
+
player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
index 6ec3504089..79088e0c3a 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
@@ -47,6 +47,6 @@ public class RequestExFriendListExtended implements IClientIncomingPacket
return;
}
- client.sendPacket(new FriendList(player));
+ player.sendPacket(new FriendList(player));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
index 2e0c2154ac..150caed567 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
@@ -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()));
}
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
index 8851aef463..00bb331778 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
@@ -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 + " !!");
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 16f28d5d04..3ee3f7a9aa 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
index 1b20e2e248..f35c069743 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
index c55df32ab6..2b1000f445 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
index 3842d82eb9..f6b2724012 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
index f868d0e26f..056262b4ab 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
@@ -48,6 +48,6 @@ public class RequestExShowContactList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExShowContactList(player));
+ player.sendPacket(new ExShowContactList(player));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
index 2d9f0456f4..1589ff8175 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
index 0a4522bf64..a2667da070 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
index b2f32527da..1355a122ce 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
index 73dd408134..1233ad294b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
@@ -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);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
index f1c10ee605..10070bbbeb 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
@@ -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;
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
index a6ede07bb0..71e028b3be 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
index 04abcbce46..719d0b6fc8 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
@@ -61,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket
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;
}
@@ -69,7 +69,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;
}
@@ -91,7 +91,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);
}
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
index a7c019d65d..7253226656 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
index ff96a400c9..79db1768e6 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
index 89e11ba6a9..f51eec948c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
index 25d004a7b7..2240af9a6e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
@@ -41,6 +41,7 @@ public class RequestHennaRemoveList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new HennaRemoveList(player));
+
+ player.sendPacket(new HennaRemoveList(player));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
index 1c1fc6d8c2..bc9710d465 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
@@ -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()));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
index d46ef778d4..f9e67ea1ed 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
@@ -43,6 +43,7 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExInzoneWaiting(player, _hide));
+
+ player.sendPacket(new ExInzoneWaiting(player, _hide));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
index 6551e7d0c4..42404bdd99 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
@@ -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();
+ return;
}
+
+ if (player.isInventoryDisabled())
+ {
+ return;
+ }
+
+ player.sendItemList();
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
index 99965602f9..cb5c08f036 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
@@ -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)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
index 226f085fb0..9793d6e1d8 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
@@ -44,7 +44,7 @@ public class RequestKeyMapping implements IClientIncomingPacket
if (Config.STORE_UI_SETTINGS)
{
- client.sendPacket(new ExUISetting(player));
+ player.sendPacket(new ExUISetting(player));
}
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
index ada67e190c..2cdc066ead 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
index bffa403c8a..96b1664122 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
@@ -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));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
index 7b4703d69c..9fcb5e9736 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index b9c3900403..ec1f903d13 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -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_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_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;
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
index 9372163aea..769c2af9e2 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
@@ -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
{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
index 9149ce1284..8e7c3ee9fe 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
@@ -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));
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
index e670b165cd..de3adf72c3 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
@@ -43,7 +43,7 @@ public class RequestPackageSendableItemList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PackageSendableList(1, player, _objectId));
- client.sendPacket(new PackageSendableList(2, player, _objectId));
+ player.sendPacket(new PackageSendableList(1, player, _objectId));
+ player.sendPacket(new PackageSendableList(2, player, _objectId));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
index e8d53e1a19..e4ddcee7e8 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
index a9fac87c7e..ff9183a3fe 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
@@ -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_SUPPORT_4GAME_COM);
+ player.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_ON_HTTPS_SUPPORT_4GAME_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);
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
index b7f1ab30a7..7d148f2d91 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
index 713ffdd087..3fa5cede77 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
@@ -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.YOU_HAVE_JOINED_THE_WAITING_LIST_CHARACTERS_ARE_AUTOMATICALLY_DELETED_FROM_THE_LIST_AFTER_30_DAYS_IF_EXIT_WAITING_LIST_IS_USED_YOU_CANNOT_JOIN_THE_WAITING_LIST_FOR_5_MINUTES);
+ player.sendPacket(SystemMessageId.YOU_HAVE_JOINED_THE_WAITING_LIST_CHARACTERS_ARE_AUTOMATICALLY_DELETED_FROM_THE_LIST_AFTER_30_DAYS_IF_EXIT_WAITING_LIST_IS_USED_YOU_CANNOT_JOIN_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;
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
index e3ec88ca13..34af0251ca 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
@@ -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())));
}
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
index 76d591b14c..a4f9ba1784 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
index 3459b04c80..4c077a4c9e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
@@ -64,6 +64,7 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PledgeReceiveMemberInfo(member));
+
+ player.sendPacket(new PledgeReceiveMemberInfo(member));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
index e380ce68c8..464ad76c9f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
@@ -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)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
index 8fabbb1f4a..beee5121dd 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
@@ -52,6 +52,6 @@ public class RequestPledgeRecruitBoardDetail implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
+ player.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
index 1d0458db08..0d0d86f7db 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
index fe019fe6d6..dde18f32a4 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
@@ -44,6 +44,6 @@ public class RequestPledgeWaitingList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeWaitingList(_clanId));
+ player.sendPacket(new ExPledgeWaitingList(_clanId));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
index add0aa2f01..618c787a17 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
@@ -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));
}
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
index 4468b67642..500800df57 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
index 086f76c512..2a75d35297 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
@@ -51,11 +51,11 @@ 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(1, player));
- client.sendPacket(new ExReplyPostItemList(2, player));
+ player.sendPacket(new ExReplyPostItemList(1, player));
+ player.sendPacket(new ExReplyPostItemList(2, player));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
index 44bbd9d34c..a038920c8b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
index 94958bc4fe..2ded12e55d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
@@ -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());
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
index 2d616f2e94..bb2f0e8e6f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
index 8ab3d4962f..243e4a3674 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
@@ -87,7 +87,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
if (_items == null)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -128,13 +128,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;
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
index bee0568e03..365e1f598f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
index b64136dc79..21ba9b39af 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
index 8badb24c5f..6ffcc69313 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
@@ -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();
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
index 461f09492a..06d51160dd 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
index 5e7754bcbe..71dc3aa8da 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
index 891d914e07..e30bee1ac5 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
@@ -41,6 +41,6 @@ public class RequestRecipeItemMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeItemMakeInfo(_id, player));
+ player.sendPacket(new RecipeItemMakeInfo(_id, player));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
index d8e5ef166c..fd6b816fde 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
index d96459999d..b82a2048c7 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
@@ -54,6 +54,6 @@ public class RequestRecipeShopMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeShopItemInfo(shop, _recipeId));
+ player.sendPacket(new RecipeShopItemInfo(shop, _recipeId));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
index 39546dc93f..afc1ee3ecc 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
index 85e67c77ed..82f12af318 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index 1bb51eff9d..87a0574a9f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -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))
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
index 4da834c30d..3d01f1e525 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
@@ -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);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
index 1632df189f..9c0c240bd4 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
index b3e709c5db..1a7c1ebc0f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
@@ -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)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index 662058f4d8..dfda7319fc 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
index 7b82b33d56..af5f6876b7 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
index e5c53c86d0..1cf200da52 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
@@ -58,7 +58,7 @@ public class RequestSentPost 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;
}
@@ -73,6 +73,6 @@ public class RequestSentPost implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExReplySentPost(msg));
+ player.sendPacket(new ExReplySentPost(msg));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
index 99aec4ba86..05a414f453 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
@@ -47,6 +47,7 @@ public class RequestSentPostList implements IClientIncomingPacket
// player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
// return;
// }
- client.sendPacket(new ExShowSentPostList(player.getObjectId()));
+
+ player.sendPacket(new ExShowSentPostList(player.getObjectId()));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
index 72578e8d22..197ab07190 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
@@ -78,18 +78,23 @@ public class RequestSetCrop implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
index fe5ea44de4..a3e3ded0a3 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
@@ -77,18 +77,23 @@ public class RequestSetSeed implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index a175a9d052..a6ad0c3e9a 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -72,7 +72,7 @@ public class RequestShortCutReg implements IClientIncomingPacket
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
sc.setAutoUse(_active);
player.registerShortCut(sc);
- client.sendPacket(new ShortCutRegister(sc));
+ player.sendPacket(new ShortCutRegister(sc));
player.sendPacket(new ExActivateAutoShortcut(sc, _active));
// When id is not auto used, deactivate auto shortcuts.
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
index 1053bb74c1..fc2725daa7 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
@@ -44,6 +44,6 @@ public class RequestShowBeautyList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExResponseBeautyList(player, _type));
+ player.sendPacket(new ExResponseBeautyList(player, _type));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
index 9c73551f59..541b987e91 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
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;
/**
@@ -40,6 +41,12 @@ public class RequestShowBoard implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, client.getPlayer());
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, player);
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
index 162de17679..f74c3abf4d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
@@ -41,6 +41,7 @@ public class RequestShowMiniMap implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ShowMiniMap(0));
+
+ player.sendPacket(new ShowMiniMap(0));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
index 097e8f5d30..f055ad8a57 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeAttackerList;
@@ -40,9 +41,17 @@ public class RequestSiegeAttackerList implements IClientIncomingPacket
public void run(GameClient client)
{
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
- if (castle != null)
+ if (castle == null)
{
- client.sendPacket(new SiegeAttackerList(castle));
+ return;
}
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeAttackerList(castle));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
index 6df5163c58..a8d4c9f6d0 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList;
@@ -44,6 +45,13 @@ public class RequestSiegeDefenderList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new SiegeDefenderList(castle));
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
index 8ae03da07b..51c42f7b7c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
@@ -34,10 +34,12 @@ public class RequestSkillList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- final Player cha = client.getPlayer();
- if (cha != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- cha.sendSkillList();
+ return;
}
+
+ player.sendSkillList();
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
index ac3c6e1b62..2deae58393 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
@@ -60,52 +60,52 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
if ((clanDeclaringWar.getLevel() < 3) || (clanDeclaringWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaringWar.getWarCount() >= 30)
{
- client.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final Clan clanDeclaredWar = ClanTable.getInstance().getClanByName(_pledgeName);
if (clanDeclaredWar == null)
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar == clanDeclaringWar)
{
- client.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaringWar.getAllyId() == clanDeclaredWar.getAllyId()) && (clanDeclaringWar.getAllyId() != 0))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaredWar.getLevel() < 3) || (clanDeclaredWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis())
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -116,15 +116,15 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_T_DECLARE_A_WAR_BECAUSE_THE_21_DAY_PERIOD_HASN_T_PASSED_AFTER_A_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ALREADY_BEEN_AT_WAR_WITH_THE_S1_CLAN_5_DAYS_MUST_PASS_BEFORE_YOU_CAN_DECLARE_WAR_AGAIN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
index 47c39e2e70..e8c4b1a0e1 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
@@ -60,7 +60,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if ((member != null) && member.isOnline() && member.getPlayer().isInCombat())
{
player.sendPacket(SystemMessageId.A_CEASE_FIRE_DURING_A_CLAN_WAR_CAN_NOT_BE_CALLED_WHILE_MEMBERS_OF_YOUR_CLAN_ARE_ENGAGED_IN_BATTLE);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -69,13 +69,13 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if (targetClan == null)
{
player.sendMessage("No such clan.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -85,14 +85,14 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_NOT_DECLARED_A_CLAN_WAR_AGAINST_THE_CLAN_S1);
sm.addString(targetClan.getName());
player.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{
player.sendPacket(SystemMessageId.YOU_CANNOT_DECLARE_DEFEAT_AS_IT_HAS_NOT_BEEN_7_DAYS_SINCE_STARTING_A_CLAN_WAR_WITH_CLAN_S1);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
index db5981de3d..32d110951d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
@@ -65,7 +65,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
// The English system message say weapon, but it's applied to any equipped item.
if (player.isAttackingNow() || player.isCastingNow())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
return;
}
@@ -89,13 +89,13 @@ public class RequestUnEquipItem implements IClientIncomingPacket
if (!player.getInventory().canManipulateWithItemId(item.getId()))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
if (item.isWeapon() && item.getWeaponItem().isForceEquip() && !player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
@@ -117,7 +117,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
}
sm.addItemName(unequippedItem);
- client.sendPacket(sm);
+ player.sendPacket(sm);
final InventoryUpdate iu = new InventoryUpdate();
iu.addItems(unequipped);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
index 0b38bcb67c..9e95fb93e1 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
@@ -51,28 +51,28 @@ public class RequestVoteNew implements IClientIncomingPacket
{
if (object == null)
{
- client.sendPacket(SystemMessageId.SELECT_TARGET);
+ player.sendPacket(SystemMessageId.SELECT_TARGET);
}
else if (object.isFakePlayer() && FakePlayerData.getInstance().isTalkable(object.getName()))
{
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addString(FakePlayerData.getInstance().getProperName(object.getName()));
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
player.setRecomLeft(player.getRecomLeft() - 1);
- client.sendPacket(new UserInfo(player));
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new UserInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
}
else
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
}
return;
}
@@ -85,19 +85,19 @@ public class RequestVoteNew implements IClientIncomingPacket
if (target == player)
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
return;
}
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
if (target.getRecomHave() >= 255)
{
- client.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
+ player.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
return;
}
@@ -106,16 +106,16 @@ public class RequestVoteNew implements IClientIncomingPacket
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addPcName(target);
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_BEEN_RECOMMENDED_BY_C1);
sm.addPcName(player);
target.sendPacket(sm);
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
target.broadcastUserInfo();
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
target.sendPacket(new ExVoteSystemInfo(target));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
index 05261ba813..0e3300d03c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
@@ -67,12 +67,12 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
}
else if ((player.getWeightPenalty() >= 3) || !player.isInventoryUnder90(false))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
return;
}
else if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
return;
}
@@ -101,11 +101,11 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
if (player.getPremiumItemList().isEmpty())
{
- client.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
+ player.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
}
else
{
- client.sendPacket(new ExGetPremiumItemList(player));
+ player.sendPacket(new ExGetPremiumItemList(player));
}
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
index c3f29fe9c9..d23918130b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
@@ -48,17 +48,17 @@ public class RequestWithdrawalPledge 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.isClanLeader())
{
- client.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
+ player.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
return;
}
if (player.isInCombat())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
return;
}
@@ -72,7 +72,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
// Remove the Player From the Member list
clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(player.getName()));
clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
- client.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
- client.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
+ player.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
+ player.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
index 84b879e0f7..13ecd08a96 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
@@ -150,14 +150,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
// Item Max Limit Check
if (!warehouse.validateCapacity(slots))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
+ player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
return;
}
// Check if enough adena and charge the fee
if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, manager, false))
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
return;
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
index a5462164d1..76e8ac2a68 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket
}
player.getBuyList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgBuy(player));
+ player.sendPacket(new PrivateStoreMsgBuy(player));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
index ac64c43c5c..d86bfc8f84 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket
}
player.getSellList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgSell(player));
+ player.sendPacket(new PrivateStoreMsgSell(player));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
index f3078c3e52..2726f99c08 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket
}
player.getSellList().setTitle(_msg);
- client.sendPacket(new ExPrivateStoreSetWholeMsg(player));
+ player.sendPacket(new ExPrivateStoreSetWholeMsg(player));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
index 8e7e6f9b2d..1022c9061d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
@@ -73,7 +73,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!player.getAccessLevel().allowTransaction())
{
player.sendMessage("Transactions are disabled for your current Access Level.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -84,8 +84,8 @@ public class TradeRequest implements IClientIncomingPacket
{
if (!effect.checkCondition(BotReportTable.TRADE_ACTION_BLOCK_ID))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -104,7 +104,7 @@ public class TradeRequest implements IClientIncomingPacket
// and the following system message is sent to acting player.
if (target.getObjectId() == player.getObjectId())
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
return;
}
@@ -141,7 +141,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!target.isPlayer())
{
- client.sendPacket(SystemMessageId.INVALID_TARGET);
+ player.sendPacket(SystemMessageId.INVALID_TARGET);
return;
}
@@ -161,8 +161,8 @@ public class TradeRequest implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_IS_CURRENTLY_BEING_INVESTIGATED);
sm.addString(partner.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -189,13 +189,13 @@ public class TradeRequest implements IClientIncomingPacket
if ((player.getPrivateStoreType() != PrivateStoreType.NONE) || (partner.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;
}
if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
+ player.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
return;
}
@@ -204,7 +204,7 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
@@ -218,13 +218,13 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
if (player.calculateDistance3D(partner) > 150)
{
- client.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
+ player.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
return;
}
@@ -232,6 +232,6 @@ public class TradeRequest implements IClientIncomingPacket
partner.sendPacket(new SendTradeRequest(player.getObjectId()));
sm = new SystemMessage(SystemMessageId.YOU_HAVE_REQUESTED_A_TRADE_WITH_C1);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
index afbd8b0b76..3ccf45b47f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
@@ -44,6 +44,6 @@ public class RequestExCancelShape_Shifting_Item implements IClientIncomingPacket
}
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
index 055dc2dd1e..6d286b4894 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
@@ -60,7 +60,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -83,7 +83,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (!extractItem.getItem().isAppearanceable())
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -113,15 +113,15 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,20 +129,20 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -154,6 +154,6 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
}
request.setAppearanceExtractItem(extractItem);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
index f7aa0f3047..1c8eaa09c2 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
@@ -55,8 +55,8 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -65,35 +65,35 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -101,7 +101,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -112,6 +112,6 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
return;
}
- client.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
+ player.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 1de9056bda..2a6d3e9bb9 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -64,8 +64,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -74,36 +74,36 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -111,14 +111,14 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!appearanceStone.checkConditions(player, targetItem))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,56 +129,56 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
{
if (extractItem == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getOwnerId() != player.getObjectId())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!extractItem.getItem().isAppearanceable())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -189,21 +189,21 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final long cost = appearanceStone.getCost();
if (cost > player.getAdena())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (stone.getCount() < 1L)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((appearanceStone.getType() == AppearanceType.NORMAL) && (inventory.destroyItem(getClass().getSimpleName(), extractItem, 1, player, this) == null))
{
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -276,7 +276,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
player.sendInventoryUpdate(iu);
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
+ player.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
if (targetItem.isEquipped())
{
player.broadcastUserInfo();
@@ -288,8 +288,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
slots.addComponentType(slot);
}
}
- client.sendPacket(slots);
+ player.sendPacket(slots);
}
- client.sendPacket(new ExAdenaInvenCount(player));
+ player.sendPacket(new ExAdenaInvenCount(player));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
index abea70c48a..bf64e21529 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
@@ -65,8 +65,8 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket
// attempting to destroy item
if (player.getInventory().destroyItemByItemId("ChangeAttribute", _consumeItemId, 1, player, item) == null)
{
- client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
- client.sendPacket(ExChangeAttributeFail.STATIC);
+ player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
+ player.sendPacket(ExChangeAttributeFail.STATIC);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH);
return;
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
index a5001f4346..e79211ec85 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
@@ -52,26 +52,26 @@ public class RequestCommissionBuyInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
if (!player.isInventoryUnder80(false) || (player.getWeightPenalty() >= 3))
{
- client.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
return;
}
final CommissionItem commissionItem = ItemCommissionManager.getInstance().getCommissionItem(_commissionId);
if (commissionItem != null)
{
- client.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
+ player.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
}
else
{
- client.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
}
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
index aa794d2d96..16dec35e6f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
@@ -49,7 +49,7 @@ public class RequestCommissionBuyItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
index 4f7141c09d..8a3ff5c955 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
@@ -50,7 +50,7 @@ public class RequestCommissionDelete implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
index 1a7edbbaac..01005d24c1 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
@@ -50,18 +50,18 @@ public class RequestCommissionInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
final Item itemInstance = player.getInventory().getItemByObjectId(_itemObjectId);
if (itemInstance != null)
{
- client.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
+ player.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
}
else
{
- client.sendPacket(ExResponseCommissionInfo.EMPTY);
+ player.sendPacket(ExResponseCommissionInfo.EMPTY);
}
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
index 1ad79b9031..57fd69ec8d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
@@ -62,7 +62,7 @@ public class RequestCommissionList implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
index 6b2f96e87d..7eb252c475 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
@@ -95,7 +95,7 @@ public class RequestCommissionRegister implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
index 1e826566da..b19aefac8d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
@@ -45,7 +45,7 @@ public class RequestCommissionRegisteredItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
index 532c2496c2..75a5a816f0 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
@@ -46,11 +46,11 @@ public class RequestCommissionRegistrableItemList implements IClientIncomingPack
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
- client.sendPacket(new ExResponseCommissionItemList(1, player.getInventory().getAvailableItems(false, false, false)));
- client.sendPacket(new ExResponseCommissionItemList(2, player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(1, player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(2, player.getInventory().getAvailableItems(false, false, false)));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
index 670f9a29ed..398352c0f7 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = new CompoundRequest(player);
if (!player.addRequest(request))
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
@@ -77,7 +79,7 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
final Item itemOne = request.getItemOne();
if (itemOne == null)
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -87,11 +89,11 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItems.isEmpty())
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
- client.sendPacket(ExEnchantOneOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
index 315704e4e5..b8f98ff7ba 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
@@ -51,23 +51,25 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -77,14 +79,14 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -93,10 +95,10 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
- client.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
index 0dbe123787..72a0b34bfc 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemOne();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
request.setItemOne(0);
- client.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
index 5743927fa1..4a05f6c92b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemTwo();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
request.setItemTwo(0);
- client.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
index c0eb970566..70e94532db 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
return;
}
@@ -78,7 +80,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -86,7 +88,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -96,7 +98,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -113,11 +115,11 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item item = player.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true);
if (success)
{
- client.sendPacket(new ExEnchantSucess(item.getId()));
+ player.sendPacket(new ExEnchantSucess(item.getId()));
}
else
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
index e4e46a5271..d5165c28ec 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
@@ -65,6 +65,7 @@ public class RequestCrystallizeEstimate 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);
@@ -73,28 +74,28 @@ public class RequestCrystallizeEstimate 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);
return;
}
final Item item = player.getInventory().getItemByObjectId(_objectId);
if ((item == null) || item.isShadowItem() || item.isTimeLimitedItem() || item.isHeroItem() || (!Config.ALT_ALLOW_AUGMENT_DESTROY && item.isAugmented()))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
PacketLogger.warning(player + ": tried to crystallize " + item.getItem());
return;
}
@@ -167,8 +168,8 @@ public class RequestCrystallizeEstimate 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;
}
@@ -177,11 +178,11 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket
if ((crystallizationRewards != null) && !crystallizationRewards.isEmpty())
{
player.setInCrystallize(true);
- client.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
+ player.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
}
else
{
- client.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
+ player.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
}
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
index 584b6e3e4e..a0b7c23c20 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
@@ -40,9 +40,11 @@ public class RequestFriendDetailInfo implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExFriendDetailInfo(player, _name));
+ return;
}
+
+ player.sendPacket(new ExFriendDetailInfo(player, _name));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
index 82fa3a651a..e9e5d90e84 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
@@ -48,6 +48,7 @@ public class RequestMenteeWaitingList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
+
+ player.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
index 7c22e266ca..20ec347a77 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
@@ -41,6 +41,7 @@ public class RequestMentorList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExMentorList(player));
+
+ player.sendPacket(new ExMentorList(player));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
index 4023b0cff0..618f6dc7ed 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
@@ -37,9 +37,11 @@ public class RequestBRGamePoint implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExBRGamePoint(player));
+ return;
}
+
+ player.sendPacket(new ExBRGamePoint(player));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
index de0446cfd8..7ac78cfe4f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
@@ -34,7 +34,7 @@ public class RequestBRRecentProductList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- // Player player = client.getPlayer();
+ // Player player = cplayer.getPlayer();
// TODO: Implement it.
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
index d248722d3d..8cb6a581bc 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.vip;
import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.vip.ReceiveVipLuckyGameInfo;
@@ -32,6 +33,12 @@ public class RequestVipLuckGameInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.sendPacket(new ReceiveVipLuckyGameInfo(client.getPlayer()));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ReceiveVipLuckyGameInfo(player));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipProductList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipProductList.java
index b2b90dd2ae..0636bc6b36 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipProductList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipProductList.java
@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.vip;
import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.vip.ReceiveVipProductList;
@@ -32,6 +33,12 @@ public class RequestVipProductList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.sendPacket(new ReceiveVipProductList(client.getPlayer()));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ReceiveVipProductList(player));
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
index 6813c75ed2..f8d602624b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
@@ -34,7 +34,6 @@ public class ExRestartClient implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.EX_RESTART_CLIENT.writeId(packet);
-
return true;
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
index 89678c1836..4378479707 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
- * A packet used to draw points and lines on client.
+ * A packet used to draw points and lines on cplayer.
* Note: Names in points and lines are bugged they will appear even when not looking at them.
* @author NosBit
*/
@@ -62,7 +62,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -76,7 +76,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -88,7 +88,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -100,7 +100,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
@@ -110,7 +110,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -124,7 +124,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -136,7 +136,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -148,7 +148,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
index ef3f4acc18..25ba232162 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
@@ -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;
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
index c6ea588540..acab47f316 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
index cdfaa128cb..129d1a52d1 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
index ba988591d0..370aeba2c5 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
@@ -51,6 +51,6 @@ public class Appearing implements IClientIncomingPacket
player.onTeleported();
}
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
index 0ea780c5b4..b47439803f 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
@@ -55,7 +55,7 @@ public class BypassUserCmd implements IClientIncomingPacket
}
else
{
- handler.useUserCommand(_command, client.getPlayer());
+ handler.useUserCommand(_command, player);
}
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
index a3236b0d83..43c0172038 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
@@ -65,12 +65,12 @@ public class CannotMoveAnymore implements IClientIncomingPacket
// PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+
// " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ());
// StopMove smwl = new StopMove(player);
- // client.getPlayer().sendPacket(smwl);
- // client.getPlayer().broadcastPacket(smwl);
+ // cplayer.getPlayer().sendPacket(smwl);
+ // cplayer.getPlayer().broadcastPacket(smwl);
//
- // StopRotation sr = new StopRotation(client.getPlayer(),
+ // StopRotation sr = new StopRotation(cplayer.getPlayer(),
// _heading);
- // client.getPlayer().sendPacket(sr);
- // client.getPlayer().broadcastPacket(sr);
+ // cplayer.getPlayer().sendPacket(sr);
+ // cplayer.getPlayer().broadcastPacket(sr);
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index d17497a229..214cd84e86 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -319,16 +319,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);
@@ -438,7 +438,7 @@ public class EnterWorld implements IClientIncomingPacket
player.sendPacket(new ExStorageMaxCount(player));
// Friend list
- client.sendPacket(new L2FriendList(player));
+ player.sendPacket(new L2FriendList(player));
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN);
sm.addString(player.getName());
for (int id : player.getFriendList())
@@ -466,14 +466,14 @@ public class EnterWorld implements IClientIncomingPacket
notice.replace("%clan_name%", player.getClan().getName());
notice.replace("%notice_text%", player.getClan().getNotice().replaceAll("\r\n", "
"));
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));
}
}
@@ -485,13 +485,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())
@@ -554,7 +554,7 @@ public class EnterWorld implements IClientIncomingPacket
{
if (MailManager.getInstance().hasUnreadPost(player))
{
- client.sendPacket(ExNoticePostArrived.valueOf(false));
+ player.sendPacket(ExNoticePostArrived.valueOf(false));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 4bb789645a..218e629395 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -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;
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 8078d0c10e..6ac4cc7ca0 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -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:
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
index 65c69620a0..94911328a2 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
@@ -41,6 +41,7 @@ public class RequestAlchemySkillList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExAlchemySkillList(player));
+
+ player.sendPacket(new ExAlchemySkillList(player));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
index 49bb9c2285..fb6b18d662 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
index c6f8fe2045..b6f8d4fb9e 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
index 5669f5691a..beb5024780 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
index 7ee18d42b3..3e864837f8 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
index 2baf948bc7..4dc52e2648 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
index e1c584d405..3ce51314b3 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
@@ -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_SERVITOR);
+ player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_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_SERVITOR);
+ player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_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_AND_THEREFORE_CANNOT_USE_THE_AUTOMATIC_USE_FUNCTION);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR_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);
}
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
index 83ffc494d5..4b817c3e70 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index ce3d851f06..9c2d96e99c 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
@@ -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,8 +253,8 @@ 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));
player.sendPacket(SystemMessageId.EXCHANGE_IS_SUCCESSFUL);
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
index d77d8eba6a..f841f306a1 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
index 4534c39c18..b65ad7c589 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
index f1ddb94865..5ae334f854 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
index 21710a1eb0..dd69523f80 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
@@ -96,6 +96,6 @@ public class RequestConfirmSiegeWaitingList implements IClientIncomingPacket
}
// Update the defender list
- client.sendPacket(new SiegeDefenderList(castle));
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
index dc81cb23dc..b2f53bed92 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
index 03d610fe78..1491cb1bfb 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
@@ -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();
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
index 36d36097c1..5fd67b8759 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
@@ -42,6 +42,6 @@ public class RequestCursedWeaponList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExCursedWeaponList());
+ player.sendPacket(new ExCursedWeaponList());
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
index 573a4f7950..193c436d7e 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
index ce21646986..6d59e89936 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
index 5882d1ea46..88fd8b949d 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index 71bb657bf9..0984f53c0b 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -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();
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
index 224a640ef5..5227396561 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
index ed981b63f7..f5607f7fa5 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index 963bf062f5..7a6b2b8704 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -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)
@@ -259,8 +259,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)
@@ -294,13 +294,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()))
@@ -320,11 +320,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)
@@ -356,7 +356,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)
@@ -399,7 +399,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))
@@ -409,11 +409,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)
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
index 4652f15ddc..22d6a0efa5 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
index 9565b3e5ca..f6b8d47c50 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
@@ -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);
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
index 68bb180db1..7b967d8931 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -82,8 +82,8 @@ 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));
+ // cplayer.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
index 35fe136cbd..54a540188c 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
@@ -55,6 +55,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket
{
return;
}
+
player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
index 6ec3504089..79088e0c3a 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
@@ -47,6 +47,6 @@ public class RequestExFriendListExtended implements IClientIncomingPacket
return;
}
- client.sendPacket(new FriendList(player));
+ player.sendPacket(new FriendList(player));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
index 2e0c2154ac..150caed567 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
@@ -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()));
}
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
index 8851aef463..00bb331778 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
@@ -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 + " !!");
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 16f28d5d04..3ee3f7a9aa 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
index 1b20e2e248..f35c069743 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
index c55df32ab6..2b1000f445 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
index 3842d82eb9..f6b2724012 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
index f868d0e26f..056262b4ab 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
@@ -48,6 +48,6 @@ public class RequestExShowContactList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExShowContactList(player));
+ player.sendPacket(new ExShowContactList(player));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
index 2d9f0456f4..1589ff8175 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
index 0a4522bf64..a2667da070 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
index b2f32527da..1355a122ce 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
index 73dd408134..1233ad294b 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
@@ -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);
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
index f1c10ee605..10070bbbeb 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
@@ -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;
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
index a6ede07bb0..71e028b3be 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
index 04abcbce46..719d0b6fc8 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
@@ -61,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket
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;
}
@@ -69,7 +69,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;
}
@@ -91,7 +91,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);
}
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
index a7c019d65d..7253226656 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
index ff96a400c9..79db1768e6 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
index 89e11ba6a9..f51eec948c 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
index 25d004a7b7..2240af9a6e 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
@@ -41,6 +41,7 @@ public class RequestHennaRemoveList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new HennaRemoveList(player));
+
+ player.sendPacket(new HennaRemoveList(player));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
index 1c1fc6d8c2..bc9710d465 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
@@ -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()));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
index d46ef778d4..f9e67ea1ed 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
@@ -43,6 +43,7 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExInzoneWaiting(player, _hide));
+
+ player.sendPacket(new ExInzoneWaiting(player, _hide));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
index 12e0b41dda..1597a7ab37 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
index 99965602f9..cb5c08f036 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
@@ -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)
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
index 226f085fb0..9793d6e1d8 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
@@ -44,7 +44,7 @@ public class RequestKeyMapping implements IClientIncomingPacket
if (Config.STORE_UI_SETTINGS)
{
- client.sendPacket(new ExUISetting(player));
+ player.sendPacket(new ExUISetting(player));
}
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
index ada67e190c..2cdc066ead 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
index bffa403c8a..96b1664122 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
@@ -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));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
index 7b4703d69c..9fcb5e9736 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index b9c3900403..ec1f903d13 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -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_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_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;
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
index 9372163aea..769c2af9e2 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
@@ -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
{
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
index 9149ce1284..8e7c3ee9fe 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
@@ -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));
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
index e1f9061af7..2d4de9a500 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
@@ -44,6 +44,7 @@ public class RequestPackageSendableItemList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PackageSendableList(player, _objectId));
+
+ player.sendPacket(new PackageSendableList(player, _objectId));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
index e8d53e1a19..e4ddcee7e8 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
index a9fac87c7e..ff9183a3fe 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
@@ -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_SUPPORT_4GAME_COM);
+ player.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_ON_HTTPS_SUPPORT_4GAME_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);
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
index b7f1ab30a7..7d148f2d91 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
index 77725a6557..3e43762127 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
index e3ec88ca13..34af0251ca 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
@@ -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())));
}
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
index 76d591b14c..a4f9ba1784 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
index 3459b04c80..4c077a4c9e 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
@@ -64,6 +64,7 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PledgeReceiveMemberInfo(member));
+
+ player.sendPacket(new PledgeReceiveMemberInfo(member));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
index e380ce68c8..464ad76c9f 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
@@ -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)
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
index 8fabbb1f4a..beee5121dd 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
@@ -52,6 +52,6 @@ public class RequestPledgeRecruitBoardDetail implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
+ player.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
index 1d0458db08..0d0d86f7db 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
index fe019fe6d6..dde18f32a4 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
@@ -44,6 +44,6 @@ public class RequestPledgeWaitingList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeWaitingList(_clanId));
+ player.sendPacket(new ExPledgeWaitingList(_clanId));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
index add0aa2f01..618c787a17 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
@@ -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));
}
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
index d66024cc52..a6bebf3a42 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
index 8668dfbb61..624591a6f3 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
index 44bbd9d34c..a038920c8b 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
index 94958bc4fe..2ded12e55d 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
@@ -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());
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
index 2d616f2e94..bb2f0e8e6f 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
index 8ab3d4962f..243e4a3674 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
@@ -87,7 +87,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
if (_items == null)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -128,13 +128,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;
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
index bee0568e03..365e1f598f 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
index b64136dc79..21ba9b39af 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
index 8badb24c5f..6ffcc69313 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
@@ -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();
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
index 461f09492a..06d51160dd 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
index 5e7754bcbe..71dc3aa8da 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
index 891d914e07..e30bee1ac5 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
@@ -41,6 +41,6 @@ public class RequestRecipeItemMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeItemMakeInfo(_id, player));
+ player.sendPacket(new RecipeItemMakeInfo(_id, player));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
index d8e5ef166c..fd6b816fde 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
index d96459999d..b82a2048c7 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
@@ -54,6 +54,6 @@ public class RequestRecipeShopMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeShopItemInfo(shop, _recipeId));
+ player.sendPacket(new RecipeShopItemInfo(shop, _recipeId));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
index 39546dc93f..afc1ee3ecc 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
index 85e67c77ed..82f12af318 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index 1bb51eff9d..87a0574a9f 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -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))
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
index 4da834c30d..3d01f1e525 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
@@ -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);
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
index 1632df189f..9c0c240bd4 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
index b3e709c5db..1a7c1ebc0f 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
@@ -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)
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index 662058f4d8..dfda7319fc 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
index 7b82b33d56..af5f6876b7 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
index e5c53c86d0..1cf200da52 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
@@ -58,7 +58,7 @@ public class RequestSentPost 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;
}
@@ -73,6 +73,6 @@ public class RequestSentPost implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExReplySentPost(msg));
+ player.sendPacket(new ExReplySentPost(msg));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
index 99aec4ba86..05a414f453 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
@@ -47,6 +47,7 @@ public class RequestSentPostList implements IClientIncomingPacket
// player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
// return;
// }
- client.sendPacket(new ExShowSentPostList(player.getObjectId()));
+
+ player.sendPacket(new ExShowSentPostList(player.getObjectId()));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
index 72578e8d22..197ab07190 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
@@ -78,18 +78,23 @@ public class RequestSetCrop implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
index fe5ea44de4..a3e3ded0a3 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
@@ -77,18 +77,23 @@ public class RequestSetSeed implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index b30eb95f41..bf7d98030a 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
@@ -50,13 +51,19 @@ public class RequestShortCutReg implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- if ((client.getPlayer() == null) || (_page > 19) || (_page < 0))
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ if ((_page > 19) || (_page < 0))
{
return;
}
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
- client.getPlayer().registerShortCut(sc);
- client.sendPacket(new ShortCutRegister(sc));
+ player.registerShortCut(sc);
+ player.sendPacket(new ShortCutRegister(sc));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
index 1053bb74c1..fc2725daa7 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
@@ -44,6 +44,6 @@ public class RequestShowBeautyList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExResponseBeautyList(player, _type));
+ player.sendPacket(new ExResponseBeautyList(player, _type));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
index 9c73551f59..541b987e91 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
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;
/**
@@ -40,6 +41,12 @@ public class RequestShowBoard implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, client.getPlayer());
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, player);
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
index 162de17679..f74c3abf4d 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
@@ -41,6 +41,7 @@ public class RequestShowMiniMap implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ShowMiniMap(0));
+
+ player.sendPacket(new ShowMiniMap(0));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
index 097e8f5d30..f055ad8a57 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeAttackerList;
@@ -40,9 +41,17 @@ public class RequestSiegeAttackerList implements IClientIncomingPacket
public void run(GameClient client)
{
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
- if (castle != null)
+ if (castle == null)
{
- client.sendPacket(new SiegeAttackerList(castle));
+ return;
}
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeAttackerList(castle));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
index 6df5163c58..a8d4c9f6d0 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList;
@@ -44,6 +45,13 @@ public class RequestSiegeDefenderList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new SiegeDefenderList(castle));
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
index 8ae03da07b..51c42f7b7c 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
@@ -34,10 +34,12 @@ public class RequestSkillList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- final Player cha = client.getPlayer();
- if (cha != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- cha.sendSkillList();
+ return;
}
+
+ player.sendSkillList();
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
index ac3c6e1b62..2deae58393 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
@@ -60,52 +60,52 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
if ((clanDeclaringWar.getLevel() < 3) || (clanDeclaringWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaringWar.getWarCount() >= 30)
{
- client.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final Clan clanDeclaredWar = ClanTable.getInstance().getClanByName(_pledgeName);
if (clanDeclaredWar == null)
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar == clanDeclaringWar)
{
- client.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaringWar.getAllyId() == clanDeclaredWar.getAllyId()) && (clanDeclaringWar.getAllyId() != 0))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaredWar.getLevel() < 3) || (clanDeclaredWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis())
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -116,15 +116,15 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_T_DECLARE_A_WAR_BECAUSE_THE_21_DAY_PERIOD_HASN_T_PASSED_AFTER_A_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ALREADY_BEEN_AT_WAR_WITH_THE_S1_CLAN_5_DAYS_MUST_PASS_BEFORE_YOU_CAN_DECLARE_WAR_AGAIN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
index 47c39e2e70..e8c4b1a0e1 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
@@ -60,7 +60,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if ((member != null) && member.isOnline() && member.getPlayer().isInCombat())
{
player.sendPacket(SystemMessageId.A_CEASE_FIRE_DURING_A_CLAN_WAR_CAN_NOT_BE_CALLED_WHILE_MEMBERS_OF_YOUR_CLAN_ARE_ENGAGED_IN_BATTLE);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -69,13 +69,13 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if (targetClan == null)
{
player.sendMessage("No such clan.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -85,14 +85,14 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_NOT_DECLARED_A_CLAN_WAR_AGAINST_THE_CLAN_S1);
sm.addString(targetClan.getName());
player.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{
player.sendPacket(SystemMessageId.YOU_CANNOT_DECLARE_DEFEAT_AS_IT_HAS_NOT_BEEN_7_DAYS_SINCE_STARTING_A_CLAN_WAR_WITH_CLAN_S1);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
index d7d4d2b449..c13d46b2bb 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
@@ -65,7 +65,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
// The English system message say weapon, but it's applied to any equipped item.
if (player.isAttackingNow() || player.isCastingNow())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
return;
}
@@ -89,13 +89,13 @@ public class RequestUnEquipItem implements IClientIncomingPacket
if (!player.getInventory().canManipulateWithItemId(item.getId()))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
if (item.isWeapon() && item.getWeaponItem().isForceEquip() && !player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
@@ -117,7 +117,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
}
sm.addItemName(unequippedItem);
- client.sendPacket(sm);
+ player.sendPacket(sm);
final InventoryUpdate iu = new InventoryUpdate();
iu.addItems(unequipped);
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
index 0b38bcb67c..9e95fb93e1 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
@@ -51,28 +51,28 @@ public class RequestVoteNew implements IClientIncomingPacket
{
if (object == null)
{
- client.sendPacket(SystemMessageId.SELECT_TARGET);
+ player.sendPacket(SystemMessageId.SELECT_TARGET);
}
else if (object.isFakePlayer() && FakePlayerData.getInstance().isTalkable(object.getName()))
{
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addString(FakePlayerData.getInstance().getProperName(object.getName()));
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
player.setRecomLeft(player.getRecomLeft() - 1);
- client.sendPacket(new UserInfo(player));
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new UserInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
}
else
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
}
return;
}
@@ -85,19 +85,19 @@ public class RequestVoteNew implements IClientIncomingPacket
if (target == player)
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
return;
}
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
if (target.getRecomHave() >= 255)
{
- client.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
+ player.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
return;
}
@@ -106,16 +106,16 @@ public class RequestVoteNew implements IClientIncomingPacket
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addPcName(target);
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_BEEN_RECOMMENDED_BY_C1);
sm.addPcName(player);
target.sendPacket(sm);
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
target.broadcastUserInfo();
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
target.sendPacket(new ExVoteSystemInfo(target));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
index 05261ba813..0e3300d03c 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
@@ -67,12 +67,12 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
}
else if ((player.getWeightPenalty() >= 3) || !player.isInventoryUnder90(false))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
return;
}
else if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_DIMENSIONAL_ITEM_DURING_AN_EXCHANGE);
return;
}
@@ -101,11 +101,11 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
if (player.getPremiumItemList().isEmpty())
{
- client.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
+ player.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
}
else
{
- client.sendPacket(new ExGetPremiumItemList(player));
+ player.sendPacket(new ExGetPremiumItemList(player));
}
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
index c3f29fe9c9..d23918130b 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
@@ -48,17 +48,17 @@ public class RequestWithdrawalPledge 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.isClanLeader())
{
- client.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
+ player.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
return;
}
if (player.isInCombat())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
return;
}
@@ -72,7 +72,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
// Remove the Player From the Member list
clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(player.getName()));
clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
- client.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
- client.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
+ player.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_CLAN);
+ player.sendPacket(SystemMessageId.AFTER_LEAVING_OR_HAVING_BEEN_DISMISSED_FROM_A_CLAN_YOU_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_JOINING_ANOTHER_CLAN);
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
index 7cdde1c7bb..db6358f368 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
@@ -150,14 +150,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
// Item Max Limit Check
if (!warehouse.validateCapacity(slots))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
+ player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
return;
}
// Check if enough adena and charge the fee
if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, manager, false))
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
return;
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
index a5462164d1..76e8ac2a68 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket
}
player.getBuyList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgBuy(player));
+ player.sendPacket(new PrivateStoreMsgBuy(player));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
index ac64c43c5c..d86bfc8f84 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket
}
player.getSellList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgSell(player));
+ player.sendPacket(new PrivateStoreMsgSell(player));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
index f3078c3e52..2726f99c08 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket
}
player.getSellList().setTitle(_msg);
- client.sendPacket(new ExPrivateStoreSetWholeMsg(player));
+ player.sendPacket(new ExPrivateStoreSetWholeMsg(player));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
index 8e7e6f9b2d..1022c9061d 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
@@ -73,7 +73,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!player.getAccessLevel().allowTransaction())
{
player.sendMessage("Transactions are disabled for your current Access Level.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -84,8 +84,8 @@ public class TradeRequest implements IClientIncomingPacket
{
if (!effect.checkCondition(BotReportTable.TRADE_ACTION_BLOCK_ID))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -104,7 +104,7 @@ public class TradeRequest implements IClientIncomingPacket
// and the following system message is sent to acting player.
if (target.getObjectId() == player.getObjectId())
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
return;
}
@@ -141,7 +141,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!target.isPlayer())
{
- client.sendPacket(SystemMessageId.INVALID_TARGET);
+ player.sendPacket(SystemMessageId.INVALID_TARGET);
return;
}
@@ -161,8 +161,8 @@ public class TradeRequest implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_IS_CURRENTLY_BEING_INVESTIGATED);
sm.addString(partner.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -189,13 +189,13 @@ public class TradeRequest implements IClientIncomingPacket
if ((player.getPrivateStoreType() != PrivateStoreType.NONE) || (partner.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;
}
if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
+ player.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
return;
}
@@ -204,7 +204,7 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
@@ -218,13 +218,13 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
if (player.calculateDistance3D(partner) > 150)
{
- client.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
+ player.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
return;
}
@@ -232,6 +232,6 @@ public class TradeRequest implements IClientIncomingPacket
partner.sendPacket(new SendTradeRequest(player.getObjectId()));
sm = new SystemMessage(SystemMessageId.YOU_HAVE_REQUESTED_A_TRADE_WITH_C1);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
index afbd8b0b76..3ccf45b47f 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
@@ -44,6 +44,6 @@ public class RequestExCancelShape_Shifting_Item implements IClientIncomingPacket
}
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
index 055dc2dd1e..6d286b4894 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
@@ -60,7 +60,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -83,7 +83,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (!extractItem.getItem().isAppearanceable())
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -113,15 +113,15 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,20 +129,20 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -154,6 +154,6 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
}
request.setAppearanceExtractItem(extractItem);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
index f7aa0f3047..1c8eaa09c2 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
@@ -55,8 +55,8 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -65,35 +65,35 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -101,7 +101,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -112,6 +112,6 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
return;
}
- client.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
+ player.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 1de9056bda..2a6d3e9bb9 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -64,8 +64,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -74,36 +74,36 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -111,14 +111,14 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!appearanceStone.checkConditions(player, targetItem))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,56 +129,56 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
{
if (extractItem == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getOwnerId() != player.getObjectId())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!extractItem.getItem().isAppearanceable())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -189,21 +189,21 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final long cost = appearanceStone.getCost();
if (cost > player.getAdena())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (stone.getCount() < 1L)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((appearanceStone.getType() == AppearanceType.NORMAL) && (inventory.destroyItem(getClass().getSimpleName(), extractItem, 1, player, this) == null))
{
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -276,7 +276,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
player.sendInventoryUpdate(iu);
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
+ player.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
if (targetItem.isEquipped())
{
player.broadcastUserInfo();
@@ -288,8 +288,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
slots.addComponentType(slot);
}
}
- client.sendPacket(slots);
+ player.sendPacket(slots);
}
- client.sendPacket(new ExAdenaInvenCount(player));
+ player.sendPacket(new ExAdenaInvenCount(player));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
index abea70c48a..bf64e21529 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
@@ -65,8 +65,8 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket
// attempting to destroy item
if (player.getInventory().destroyItemByItemId("ChangeAttribute", _consumeItemId, 1, player, item) == null)
{
- client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
- client.sendPacket(ExChangeAttributeFail.STATIC);
+ player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
+ player.sendPacket(ExChangeAttributeFail.STATIC);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH);
return;
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
index a5001f4346..e79211ec85 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
@@ -52,26 +52,26 @@ public class RequestCommissionBuyInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
if (!player.isInventoryUnder80(false) || (player.getWeightPenalty() >= 3))
{
- client.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
return;
}
final CommissionItem commissionItem = ItemCommissionManager.getInstance().getCommissionItem(_commissionId);
if (commissionItem != null)
{
- client.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
+ player.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
}
else
{
- client.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
}
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
index aa794d2d96..16dec35e6f 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
@@ -49,7 +49,7 @@ public class RequestCommissionBuyItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
index 4f7141c09d..8a3ff5c955 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
@@ -50,7 +50,7 @@ public class RequestCommissionDelete implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
index 1a7edbbaac..01005d24c1 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
@@ -50,18 +50,18 @@ public class RequestCommissionInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
final Item itemInstance = player.getInventory().getItemByObjectId(_itemObjectId);
if (itemInstance != null)
{
- client.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
+ player.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
}
else
{
- client.sendPacket(ExResponseCommissionInfo.EMPTY);
+ player.sendPacket(ExResponseCommissionInfo.EMPTY);
}
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
index 1ad79b9031..57fd69ec8d 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
@@ -62,7 +62,7 @@ public class RequestCommissionList implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
index 8ca473e613..924fb288da 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
@@ -97,7 +97,7 @@ public class RequestCommissionRegister implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
index 1e826566da..b19aefac8d 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
@@ -45,7 +45,7 @@ public class RequestCommissionRegisteredItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
index 5c587137cb..a0b4c518d2 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
@@ -46,10 +46,10 @@ public class RequestCommissionRegistrableItemList implements IClientIncomingPack
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
- client.sendPacket(new ExResponseCommissionItemList(player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(player.getInventory().getAvailableItems(false, false, false)));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
index 670f9a29ed..398352c0f7 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = new CompoundRequest(player);
if (!player.addRequest(request))
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
@@ -77,7 +79,7 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
final Item itemOne = request.getItemOne();
if (itemOne == null)
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -87,11 +89,11 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItems.isEmpty())
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
- client.sendPacket(ExEnchantOneOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
index 315704e4e5..b8f98ff7ba 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
@@ -51,23 +51,25 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -77,14 +79,14 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -93,10 +95,10 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
- client.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
index 0dbe123787..72a0b34bfc 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemOne();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
request.setItemOne(0);
- client.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
index 5743927fa1..4a05f6c92b 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemTwo();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
request.setItemTwo(0);
- client.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
index c0eb970566..70e94532db 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
return;
}
@@ -78,7 +80,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -86,7 +88,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -96,7 +98,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -113,11 +115,11 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item item = player.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true);
if (success)
{
- client.sendPacket(new ExEnchantSucess(item.getId()));
+ player.sendPacket(new ExEnchantSucess(item.getId()));
}
else
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
index e4e46a5271..d5165c28ec 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
@@ -65,6 +65,7 @@ public class RequestCrystallizeEstimate 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);
@@ -73,28 +74,28 @@ public class RequestCrystallizeEstimate 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);
return;
}
final Item item = player.getInventory().getItemByObjectId(_objectId);
if ((item == null) || item.isShadowItem() || item.isTimeLimitedItem() || item.isHeroItem() || (!Config.ALT_ALLOW_AUGMENT_DESTROY && item.isAugmented()))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
PacketLogger.warning(player + ": tried to crystallize " + item.getItem());
return;
}
@@ -167,8 +168,8 @@ public class RequestCrystallizeEstimate 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;
}
@@ -177,11 +178,11 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket
if ((crystallizationRewards != null) && !crystallizationRewards.isEmpty())
{
player.setInCrystallize(true);
- client.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
+ player.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
}
else
{
- client.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
+ player.sendPacket(SystemMessageId.CRYSTALLIZATION_CANNOT_BE_PROCEEDED_BECAUSE_THERE_ARE_NO_ITEMS_REGISTERED);
}
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
index 584b6e3e4e..a0b7c23c20 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
@@ -40,9 +40,11 @@ public class RequestFriendDetailInfo implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExFriendDetailInfo(player, _name));
+ return;
}
+
+ player.sendPacket(new ExFriendDetailInfo(player, _name));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
index 82fa3a651a..e9e5d90e84 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
@@ -48,6 +48,7 @@ public class RequestMenteeWaitingList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
+
+ player.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
index 7c22e266ca..20ec347a77 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
@@ -41,6 +41,7 @@ public class RequestMentorList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExMentorList(player));
+
+ player.sendPacket(new ExMentorList(player));
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
index 4023b0cff0..618f6dc7ed 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
@@ -37,9 +37,11 @@ public class RequestBRGamePoint implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExBRGamePoint(player));
+ return;
}
+
+ player.sendPacket(new ExBRGamePoint(player));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
index de0446cfd8..7ac78cfe4f 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
@@ -34,7 +34,7 @@ public class RequestBRRecentProductList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- // Player player = client.getPlayer();
+ // Player player = cplayer.getPlayer();
// TODO: Implement it.
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
index 6813c75ed2..f8d602624b 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
@@ -34,7 +34,6 @@ public class ExRestartClient implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.EX_RESTART_CLIENT.writeId(packet);
-
return true;
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
index 89678c1836..4378479707 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
- * A packet used to draw points and lines on client.
+ * A packet used to draw points and lines on cplayer.
* Note: Names in points and lines are bugged they will appear even when not looking at them.
* @author NosBit
*/
@@ -62,7 +62,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -76,7 +76,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -88,7 +88,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -100,7 +100,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
@@ -110,7 +110,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -124,7 +124,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -136,7 +136,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -148,7 +148,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
index ef3f4acc18..25ba232162 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
@@ -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;
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
index c6ea588540..acab47f316 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
index cdfaa128cb..129d1a52d1 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
index ba988591d0..370aeba2c5 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
@@ -51,6 +51,6 @@ public class Appearing implements IClientIncomingPacket
player.onTeleported();
}
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
index 0ea780c5b4..b47439803f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
@@ -55,7 +55,7 @@ public class BypassUserCmd implements IClientIncomingPacket
}
else
{
- handler.useUserCommand(_command, client.getPlayer());
+ handler.useUserCommand(_command, player);
}
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
index a3236b0d83..43c0172038 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
@@ -65,12 +65,12 @@ public class CannotMoveAnymore implements IClientIncomingPacket
// PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+
// " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ());
// StopMove smwl = new StopMove(player);
- // client.getPlayer().sendPacket(smwl);
- // client.getPlayer().broadcastPacket(smwl);
+ // cplayer.getPlayer().sendPacket(smwl);
+ // cplayer.getPlayer().broadcastPacket(smwl);
//
- // StopRotation sr = new StopRotation(client.getPlayer(),
+ // StopRotation sr = new StopRotation(cplayer.getPlayer(),
// _heading);
- // client.getPlayer().sendPacket(sr);
- // client.getPlayer().broadcastPacket(sr);
+ // cplayer.getPlayer().sendPacket(sr);
+ // cplayer.getPlayer().broadcastPacket(sr);
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index e8d9743896..bacbd5a16c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -326,18 +326,18 @@ 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(1, player));
- client.sendPacket(new ItemList(2, player));
+ player.sendPacket(new ItemList(1, player));
+ player.sendPacket(new ItemList(2, player));
// Send Quest Item List
- client.sendPacket(new ExQuestItemList(1, player));
- client.sendPacket(new ExQuestItemList(2, player));
+ player.sendPacket(new ExQuestItemList(1, player));
+ player.sendPacket(new ExQuestItemList(2, player));
// Send Shortcuts
- client.sendPacket(new ShortCutInit(player));
+ player.sendPacket(new ShortCutInit(player));
// Send Action list
player.sendPacket(ExBasicActionList.STATIC_PACKET);
@@ -456,7 +456,7 @@ public class EnterWorld implements IClientIncomingPacket
player.sendPacket(new ExUserInfoEquipSlot(player));
// Friend list
- client.sendPacket(new L2FriendList(player));
+ player.sendPacket(new L2FriendList(player));
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN);
sm.addString(player.getName());
for (int id : player.getFriendList())
@@ -484,14 +484,14 @@ public class EnterWorld implements IClientIncomingPacket
notice.replace("%clan_name%", player.getClan().getName());
notice.replace("%notice_text%", player.getClan().getNotice().replaceAll("\r\n", "
"));
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));
}
}
@@ -503,13 +503,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())
@@ -572,7 +572,7 @@ public class EnterWorld implements IClientIncomingPacket
{
if (MailManager.getInstance().hasUnreadPost(player))
{
- client.sendPacket(ExNoticePostArrived.valueOf(false));
+ player.sendPacket(ExNoticePostArrived.valueOf(false));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 550735eb12..beeceb0a96 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -93,12 +93,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:
@@ -107,7 +107,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new AcquireSkillInfo(_skillType, s));
+ player.sendPacket(new AcquireSkillInfo(_skillType, s));
break;
}
case SUBPLEDGE:
@@ -116,7 +116,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new AcquireSkillInfo(_skillType, s));
+ player.sendPacket(new AcquireSkillInfo(_skillType, s));
break;
}
case ALCHEMY:
@@ -125,7 +125,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new AcquireSkillInfo(_skillType, s));
+ player.sendPacket(new AcquireSkillInfo(_skillType, s));
break;
}
case REVELATION:
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 8078d0c10e..6ac4cc7ca0 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -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:
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
index 65c69620a0..94911328a2 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
@@ -41,6 +41,7 @@ public class RequestAlchemySkillList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExAlchemySkillList(player));
+
+ player.sendPacket(new ExAlchemySkillList(player));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
index 49bb9c2285..fb6b18d662 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
index c6f8fe2045..b6f8d4fb9e 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
index 5669f5691a..beb5024780 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
index 7ee18d42b3..3e864837f8 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
index 2baf948bc7..4dc52e2648 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
index 04cf0eb4aa..90eb5edf27 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
@@ -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_SERVITOR);
+ player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_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_SERVITOR);
+ player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_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_AND_THEREFORE_CANNOT_USE_THE_AUTOMATIC_USE_FUNCTION);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR_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())
{
- 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);
}
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
index 83ffc494d5..4b817c3e70 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index ce3d851f06..9c2d96e99c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
@@ -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,8 +253,8 @@ 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));
player.sendPacket(SystemMessageId.EXCHANGE_IS_SUCCESSFUL);
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
index d77d8eba6a..f841f306a1 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
index 4534c39c18..b65ad7c589 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
index f1ddb94865..5ae334f854 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
index 21710a1eb0..dd69523f80 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
@@ -96,6 +96,6 @@ public class RequestConfirmSiegeWaitingList implements IClientIncomingPacket
}
// Update the defender list
- client.sendPacket(new SiegeDefenderList(castle));
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
index dc81cb23dc..b2f53bed92 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
index 99c633d8ea..1f68699a51 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
@@ -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_OBTAINED_S1_S2_PC_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();
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
index 36d36097c1..5fd67b8759 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
@@ -42,6 +42,6 @@ public class RequestCursedWeaponList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExCursedWeaponList());
+ player.sendPacket(new ExCursedWeaponList());
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
index 573a4f7950..193c436d7e 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
index ce21646986..6d59e89936 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
index 5882d1ea46..88fd8b949d 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index 255cd31d6b..87774e9302 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -83,7 +83,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;
}
@@ -113,14 +113,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;
}
@@ -129,11 +129,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;
}
@@ -186,13 +186,13 @@ public class RequestDestroyItem implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2_UNEQUIPPED);
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();
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
index 224a640ef5..5227396561 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
index ed981b63f7..f5607f7fa5 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index fc7f8820a7..1e6a76dbec 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -86,7 +86,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;
}
@@ -122,9 +122,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;
}
@@ -134,27 +134,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;
}
@@ -164,9 +164,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;
}
@@ -175,9 +175,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:
@@ -201,7 +201,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)
@@ -266,8 +266,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)
@@ -301,13 +301,13 @@ public class RequestEnchantItem implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2_UNEQUIPPED);
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()))
@@ -327,11 +327,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)
@@ -363,7 +363,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)
@@ -406,7 +406,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_S2_PC_S);
sm.addItemName(crystals);
sm.addLong(count);
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null))
@@ -416,11 +416,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)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
index 4652f15ddc..22d6a0efa5 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
index 5351c0c1de..558dd2f66a 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
@@ -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);
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
index 98f0487428..959361f9a3 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -81,8 +81,8 @@ 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));
+ // cplayer.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
index 35fe136cbd..54a540188c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
@@ -55,6 +55,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket
{
return;
}
+
player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
index 6ec3504089..79088e0c3a 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
@@ -47,6 +47,6 @@ public class RequestExFriendListExtended implements IClientIncomingPacket
return;
}
- client.sendPacket(new FriendList(player));
+ player.sendPacket(new FriendList(player));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
index 2e0c2154ac..150caed567 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
@@ -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()));
}
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
index 8851aef463..00bb331778 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
@@ -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 + " !!");
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 16f28d5d04..3ee3f7a9aa 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
index a4e3d49ec4..43be4d259d 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
index c55df32ab6..2b1000f445 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
index 3842d82eb9..f6b2724012 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
index f868d0e26f..056262b4ab 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
@@ -48,6 +48,6 @@ public class RequestExShowContactList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExShowContactList(player));
+ player.sendPacket(new ExShowContactList(player));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
index 2d9f0456f4..1589ff8175 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
index 0a4522bf64..a2667da070 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
index b2f32527da..1355a122ce 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
index 73dd408134..1233ad294b 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
@@ -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);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
index f1c10ee605..10070bbbeb 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
@@ -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;
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
index a6ede07bb0..71e028b3be 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
index 04abcbce46..719d0b6fc8 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
@@ -61,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket
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;
}
@@ -69,7 +69,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;
}
@@ -91,7 +91,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);
}
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
index a7c019d65d..7253226656 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
index ff96a400c9..79db1768e6 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
index 89e11ba6a9..f51eec948c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
index 25d004a7b7..2240af9a6e 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
@@ -41,6 +41,7 @@ public class RequestHennaRemoveList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new HennaRemoveList(player));
+
+ player.sendPacket(new HennaRemoveList(player));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
index 1c1fc6d8c2..bc9710d465 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
@@ -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()));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
index d46ef778d4..f9e67ea1ed 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
@@ -43,6 +43,7 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExInzoneWaiting(player, _hide));
+
+ player.sendPacket(new ExInzoneWaiting(player, _hide));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
index 6551e7d0c4..42404bdd99 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
@@ -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();
+ return;
}
+
+ if (player.isInventoryDisabled())
+ {
+ return;
+ }
+
+ player.sendItemList();
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
index 99965602f9..cb5c08f036 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
@@ -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)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
index 226f085fb0..9793d6e1d8 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
@@ -44,7 +44,7 @@ public class RequestKeyMapping implements IClientIncomingPacket
if (Config.STORE_UI_SETTINGS)
{
- client.sendPacket(new ExUISetting(player));
+ player.sendPacket(new ExUISetting(player));
}
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
index ada67e190c..2cdc066ead 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
index bffa403c8a..96b1664122 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
@@ -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));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
index 7b4703d69c..9fcb5e9736 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index b9c3900403..ec1f903d13 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -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_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_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;
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
index 19ef1194dc..90fe58124a 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
@@ -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.FAILED_TO_DISMISS_THE_PARTY_MEMBER_2);
+ player.sendPacket(SystemMessageId.FAILED_TO_DISMISS_THE_PARTY_MEMBER_2);
}
else
{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
index e5beb36b37..73c7d4aa2c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
@@ -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.S1_IS_DISMISSED_FROM_THE_CLAN);
sm.addString(member.getName());
clan.broadcastToOnlineMembers(sm);
- client.sendPacket(SystemMessageId.THE_CLAN_MEMBER_IS_DISMISSED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_ACCEPT_A_NEW_CLAN_MEMBER_FOR_24_H_AFTER_DISMISSING_SOMEONE);
+ player.sendPacket(SystemMessageId.THE_CLAN_MEMBER_IS_DISMISSED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_ACCEPT_A_NEW_CLAN_MEMBER_FOR_24_H_AFTER_DISMISSING_SOMEONE);
// Remove the Player From the Member list
clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(_target));
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
index e670b165cd..de3adf72c3 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
@@ -43,7 +43,7 @@ public class RequestPackageSendableItemList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PackageSendableList(1, player, _objectId));
- client.sendPacket(new PackageSendableList(2, player, _objectId));
+ player.sendPacket(new PackageSendableList(1, player, _objectId));
+ player.sendPacket(new PackageSendableList(2, player, _objectId));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
index ca4b4dc9ad..0a32bfeddd 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
@@ -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_EU_4GAMESUPPORT_COM);
+ player.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_ON_HTTPS_EU_4GAMESUPPORT_COM);
return;
}
@@ -91,28 +91,28 @@ public class RequestPetition implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_SUBMITTED_MAXIMUM_NUMBER_OF_PETITIONS_TODAY_YOU_CANNOT_SUBMIT_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);
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
index b7f1ab30a7..7d148f2d91 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
index 9934f78249..bd5b51bacc 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
@@ -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_MIN);
+ player.sendPacket(SystemMessageId.ENTRY_APPLICATION_CANCELLED_YOU_MAY_APPLY_TO_A_NEW_CLAN_AFTER_5_MIN);
}
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.YOU_HAVE_JOINED_THE_WAITING_LIST_IF_YOU_DO_NOT_JOIN_ANY_CLAN_IN_30_D_YOUR_CHARACTER_WILL_BE_REMOVED_FROM_THE_LIST_IF_EXIT_WAITING_LIST_IS_USED_YOU_WILL_NOT_BE_ABLE_TO_JOIN_THE_WAITING_LIST_FOR_5_MIN);
+ player.sendPacket(SystemMessageId.YOU_HAVE_JOINED_THE_WAITING_LIST_IF_YOU_DO_NOT_JOIN_ANY_CLAN_IN_30_D_YOUR_CHARACTER_WILL_BE_REMOVED_FROM_THE_LIST_IF_EXIT_WAITING_LIST_IS_USED_YOU_WILL_NOT_BE_ABLE_TO_JOIN_THE_WAITING_LIST_FOR_5_MIN);
}
else
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_MAY_APPLY_FOR_ENTRY_IN_S1_MIN_AFTER_CANCELLING_YOUR_APPLICATION);
sm.addLong(ClanEntryManager.getInstance().getPlayerLockTime(player.getObjectId()));
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
break;
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
index e3ec88ca13..34af0251ca 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
@@ -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())));
}
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
index 76d591b14c..a4f9ba1784 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
index 3459b04c80..4c077a4c9e 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
@@ -64,6 +64,7 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PledgeReceiveMemberInfo(member));
+
+ player.sendPacket(new PledgeReceiveMemberInfo(member));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
index e380ce68c8..464ad76c9f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
@@ -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)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
index 8fabbb1f4a..beee5121dd 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
@@ -52,6 +52,6 @@ public class RequestPledgeRecruitBoardDetail implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
+ player.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
index 59d7fae6b7..552511d6f6 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
@@ -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_IN_S1_MIN_AFTER_CANCELLING_YOUR_APPLICATION);
sm.addLong(ClanEntryManager.getInstance().getPlayerLockTime(player.getObjectId()));
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
index fe019fe6d6..dde18f32a4 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
@@ -44,6 +44,6 @@ public class RequestPledgeWaitingList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeWaitingList(_clanId));
+ player.sendPacket(new ExPledgeWaitingList(_clanId));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
index add0aa2f01..618c787a17 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
@@ -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));
}
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
index 57a20af6c4..d4c41250e9 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
index 086f76c512..2a75d35297 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
@@ -51,11 +51,11 @@ 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(1, player));
- client.sendPacket(new ExReplyPostItemList(2, player));
+ player.sendPacket(new ExReplyPostItemList(1, player));
+ player.sendPacket(new ExReplyPostItemList(2, player));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
index 44bbd9d34c..a038920c8b 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
index 94958bc4fe..2ded12e55d 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
@@ -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());
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
index 2d616f2e94..bb2f0e8e6f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
index 8ab3d4962f..243e4a3674 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
@@ -87,7 +87,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
if (_items == null)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -128,13 +128,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;
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
index bee0568e03..365e1f598f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
index b64136dc79..21ba9b39af 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
index 8badb24c5f..6ffcc69313 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
@@ -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();
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
index 461f09492a..06d51160dd 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
index 5e7754bcbe..71dc3aa8da 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
index 891d914e07..e30bee1ac5 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
@@ -41,6 +41,6 @@ public class RequestRecipeItemMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeItemMakeInfo(_id, player));
+ player.sendPacket(new RecipeItemMakeInfo(_id, player));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
index d8e5ef166c..fd6b816fde 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
index d96459999d..b82a2048c7 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
@@ -54,6 +54,6 @@ public class RequestRecipeShopMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeShopItemInfo(shop, _recipeId));
+ player.sendPacket(new RecipeShopItemInfo(shop, _recipeId));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
index 39546dc93f..afc1ee3ecc 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
index 85e67c77ed..82f12af318 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index 1bb51eff9d..87a0574a9f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -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))
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
index 4da834c30d..3d01f1e525 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
@@ -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);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
index 1632df189f..9c0c240bd4 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
index b3e709c5db..1a7c1ebc0f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
@@ -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)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index 662058f4d8..dfda7319fc 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
index 7b82b33d56..af5f6876b7 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
index e5c53c86d0..1cf200da52 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
@@ -58,7 +58,7 @@ public class RequestSentPost 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;
}
@@ -73,6 +73,6 @@ public class RequestSentPost implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExReplySentPost(msg));
+ player.sendPacket(new ExReplySentPost(msg));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
index 99aec4ba86..05a414f453 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
@@ -47,6 +47,7 @@ public class RequestSentPostList implements IClientIncomingPacket
// player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
// return;
// }
- client.sendPacket(new ExShowSentPostList(player.getObjectId()));
+
+ player.sendPacket(new ExShowSentPostList(player.getObjectId()));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
index 72578e8d22..197ab07190 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
@@ -78,18 +78,23 @@ public class RequestSetCrop implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
index fe5ea44de4..a3e3ded0a3 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
@@ -77,18 +77,23 @@ public class RequestSetSeed implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index a175a9d052..a6ad0c3e9a 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -72,7 +72,7 @@ public class RequestShortCutReg implements IClientIncomingPacket
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
sc.setAutoUse(_active);
player.registerShortCut(sc);
- client.sendPacket(new ShortCutRegister(sc));
+ player.sendPacket(new ShortCutRegister(sc));
player.sendPacket(new ExActivateAutoShortcut(sc, _active));
// When id is not auto used, deactivate auto shortcuts.
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
index 1053bb74c1..fc2725daa7 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
@@ -44,6 +44,6 @@ public class RequestShowBeautyList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExResponseBeautyList(player, _type));
+ player.sendPacket(new ExResponseBeautyList(player, _type));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
index 9c73551f59..541b987e91 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
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;
/**
@@ -40,6 +41,12 @@ public class RequestShowBoard implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, client.getPlayer());
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, player);
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
index 162de17679..f74c3abf4d 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
@@ -41,6 +41,7 @@ public class RequestShowMiniMap implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ShowMiniMap(0));
+
+ player.sendPacket(new ShowMiniMap(0));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
index 097e8f5d30..f055ad8a57 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeAttackerList;
@@ -40,9 +41,17 @@ public class RequestSiegeAttackerList implements IClientIncomingPacket
public void run(GameClient client)
{
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
- if (castle != null)
+ if (castle == null)
{
- client.sendPacket(new SiegeAttackerList(castle));
+ return;
}
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeAttackerList(castle));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
index 6df5163c58..a8d4c9f6d0 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList;
@@ -44,6 +45,13 @@ public class RequestSiegeDefenderList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new SiegeDefenderList(castle));
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
index 8ae03da07b..51c42f7b7c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
@@ -34,10 +34,12 @@ public class RequestSkillList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- final Player cha = client.getPlayer();
- if (cha != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- cha.sendSkillList();
+ return;
}
+
+ player.sendSkillList();
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
index 0b39d05211..356308bbbd 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
@@ -60,52 +60,52 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
if ((clanDeclaringWar.getLevel() < 3) || (clanDeclaringWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_3_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_3_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaringWar.getWarCount() >= 30)
{
- client.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final Clan clanDeclaredWar = ClanTable.getInstance().getClanByName(_pledgeName);
if (clanDeclaredWar == null)
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar == clanDeclaringWar)
{
- client.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaringWar.getAllyId() == clanDeclaredWar.getAllyId()) && (clanDeclaringWar.getAllyId() != 0))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaredWar.getLevel() < 3) || (clanDeclaredWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_3_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_3_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis())
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -116,15 +116,15 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_T_DECLARE_A_WAR_BECAUSE_THE_21_DAY_PERIOD_HASN_T_PASSED_AFTER_A_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ALREADY_BEEN_AT_WAR_WITH_THE_S1_CLAN_5_DAYS_MUST_PASS_BEFORE_YOU_CAN_DECLARE_WAR_AGAIN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
index 8ee1ef35b0..dec25745f5 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
@@ -60,7 +60,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if ((member != null) && member.isOnline() && member.getPlayer().isInCombat())
{
player.sendPacket(SystemMessageId.THE_CLAN_WAR_CANNOT_BE_STOPPED_BECAUSE_SOMEONE_FROM_YOUR_CLAN_IS_STILL_ENGAGED_IN_BATTLE);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -69,13 +69,13 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if (targetClan == null)
{
player.sendMessage("No such clan.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -85,14 +85,14 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_NOT_DECLARED_A_CLAN_WAR_AGAINST_THE_CLAN_S1);
sm.addString(targetClan.getName());
player.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{
player.sendPacket(SystemMessageId.YOU_CANNOT_DECLARE_DEFEAT_AS_IT_HAS_NOT_BEEN_7_DAYS_SINCE_STARTING_A_CLAN_WAR_WITH_CLAN_S1);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
index 47ce1532d4..5f3d1725f9 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
@@ -65,7 +65,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
// The English system message say weapon, but it's applied to any equipped item.
if (player.isAttackingNow() || player.isCastingNow())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
return;
}
@@ -89,13 +89,13 @@ public class RequestUnEquipItem implements IClientIncomingPacket
if (!player.getInventory().canManipulateWithItemId(item.getId()))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
if (item.isWeapon() && item.getWeaponItem().isForceEquip() && !player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
@@ -117,7 +117,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
}
sm.addItemName(unequippedItem);
- client.sendPacket(sm);
+ player.sendPacket(sm);
final InventoryUpdate iu = new InventoryUpdate();
iu.addItems(unequipped);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
index 0b38bcb67c..9e95fb93e1 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
@@ -51,28 +51,28 @@ public class RequestVoteNew implements IClientIncomingPacket
{
if (object == null)
{
- client.sendPacket(SystemMessageId.SELECT_TARGET);
+ player.sendPacket(SystemMessageId.SELECT_TARGET);
}
else if (object.isFakePlayer() && FakePlayerData.getInstance().isTalkable(object.getName()))
{
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addString(FakePlayerData.getInstance().getProperName(object.getName()));
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
player.setRecomLeft(player.getRecomLeft() - 1);
- client.sendPacket(new UserInfo(player));
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new UserInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
}
else
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
}
return;
}
@@ -85,19 +85,19 @@ public class RequestVoteNew implements IClientIncomingPacket
if (target == player)
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
return;
}
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
if (target.getRecomHave() >= 255)
{
- client.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
+ player.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
return;
}
@@ -106,16 +106,16 @@ public class RequestVoteNew implements IClientIncomingPacket
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addPcName(target);
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_BEEN_RECOMMENDED_BY_C1);
sm.addPcName(player);
target.sendPacket(sm);
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
target.broadcastUserInfo();
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
target.sendPacket(new ExVoteSystemInfo(target));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
index a79a835c72..79c24f96df 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
@@ -67,12 +67,12 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
}
else if ((player.getWeightPenalty() >= 3) || !player.isInventoryUnder90(false))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
return;
}
else if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.ITEMS_FROM_GAME_ASSISTANTS_CANNOT_BE_EXCHANGED);
+ player.sendPacket(SystemMessageId.ITEMS_FROM_GAME_ASSISTANTS_CANNOT_BE_EXCHANGED);
return;
}
@@ -101,11 +101,11 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
if (player.getPremiumItemList().isEmpty())
{
- client.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
+ player.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
}
else
{
- client.sendPacket(new ExGetPremiumItemList(player));
+ player.sendPacket(new ExGetPremiumItemList(player));
}
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
index 72cd09fc4f..743f92515d 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
@@ -48,17 +48,17 @@ public class RequestWithdrawalPledge 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.isClanLeader())
{
- client.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
+ player.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
return;
}
if (player.isInCombat())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
return;
}
@@ -72,7 +72,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
// Remove the Player From the Member list
clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(player.getName()));
clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
- client.sendPacket(SystemMessageId.YOU_HAVE_LEFT_THE_CLAN);
- client.sendPacket(SystemMessageId.YOU_CANNOT_JOIN_ANOTHER_CLAN_FOR_24_H_AFTER_LEAVING_THE_PREVIOUS_ONE);
+ player.sendPacket(SystemMessageId.YOU_HAVE_LEFT_THE_CLAN);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_JOIN_ANOTHER_CLAN_FOR_24_H_AFTER_LEAVING_THE_PREVIOUS_ONE);
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
index 84b879e0f7..13ecd08a96 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
@@ -150,14 +150,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
// Item Max Limit Check
if (!warehouse.validateCapacity(slots))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
+ player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
return;
}
// Check if enough adena and charge the fee
if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, manager, false))
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
return;
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
index a5462164d1..76e8ac2a68 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket
}
player.getBuyList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgBuy(player));
+ player.sendPacket(new PrivateStoreMsgBuy(player));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
index ac64c43c5c..d86bfc8f84 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket
}
player.getSellList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgSell(player));
+ player.sendPacket(new PrivateStoreMsgSell(player));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
index f3078c3e52..2726f99c08 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket
}
player.getSellList().setTitle(_msg);
- client.sendPacket(new ExPrivateStoreSetWholeMsg(player));
+ player.sendPacket(new ExPrivateStoreSetWholeMsg(player));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
index d44782af71..5e6691e8be 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
@@ -73,7 +73,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!player.getAccessLevel().allowTransaction())
{
player.sendMessage("Transactions are disabled for your current Access Level.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -84,8 +84,8 @@ public class TradeRequest implements IClientIncomingPacket
{
if (!effect.checkCondition(BotReportTable.TRADE_ACTION_BLOCK_ID))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -104,7 +104,7 @@ public class TradeRequest implements IClientIncomingPacket
// and the following system message is sent to acting player.
if (target.getObjectId() == player.getObjectId())
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
return;
}
@@ -141,7 +141,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!target.isPlayer())
{
- client.sendPacket(SystemMessageId.INVALID_TARGET);
+ player.sendPacket(SystemMessageId.INVALID_TARGET);
return;
}
@@ -161,8 +161,8 @@ public class TradeRequest implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_IS_CURRENTLY_BEING_INVESTIGATED);
sm.addString(partner.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -189,13 +189,13 @@ public class TradeRequest implements IClientIncomingPacket
if ((player.getPrivateStoreType() != PrivateStoreType.NONE) || (partner.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;
}
if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
+ player.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
return;
}
@@ -204,7 +204,7 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
@@ -218,13 +218,13 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.S1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
if (player.calculateDistance3D(partner) > 150)
{
- client.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
+ player.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
return;
}
@@ -232,6 +232,6 @@ public class TradeRequest implements IClientIncomingPacket
partner.sendPacket(new SendTradeRequest(player.getObjectId()));
sm = new SystemMessage(SystemMessageId.YOU_HAVE_REQUESTED_A_TRADE_WITH_C1);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
index afbd8b0b76..3ccf45b47f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
@@ -44,6 +44,6 @@ public class RequestExCancelShape_Shifting_Item implements IClientIncomingPacket
}
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
index 055dc2dd1e..6d286b4894 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
@@ -60,7 +60,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -83,7 +83,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (!extractItem.getItem().isAppearanceable())
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -113,15 +113,15 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,20 +129,20 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -154,6 +154,6 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
}
request.setAppearanceExtractItem(extractItem);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
index f7aa0f3047..1c8eaa09c2 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
@@ -55,8 +55,8 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -65,35 +65,35 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -101,7 +101,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -112,6 +112,6 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
return;
}
- client.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
+ player.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 1de9056bda..2a6d3e9bb9 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -64,8 +64,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -74,36 +74,36 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -111,14 +111,14 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!appearanceStone.checkConditions(player, targetItem))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,56 +129,56 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
{
if (extractItem == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getOwnerId() != player.getObjectId())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!extractItem.getItem().isAppearanceable())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -189,21 +189,21 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final long cost = appearanceStone.getCost();
if (cost > player.getAdena())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (stone.getCount() < 1L)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((appearanceStone.getType() == AppearanceType.NORMAL) && (inventory.destroyItem(getClass().getSimpleName(), extractItem, 1, player, this) == null))
{
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -276,7 +276,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
player.sendInventoryUpdate(iu);
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
+ player.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
if (targetItem.isEquipped())
{
player.broadcastUserInfo();
@@ -288,8 +288,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
slots.addComponentType(slot);
}
}
- client.sendPacket(slots);
+ player.sendPacket(slots);
}
- client.sendPacket(new ExAdenaInvenCount(player));
+ player.sendPacket(new ExAdenaInvenCount(player));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
index abea70c48a..bf64e21529 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
@@ -65,8 +65,8 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket
// attempting to destroy item
if (player.getInventory().destroyItemByItemId("ChangeAttribute", _consumeItemId, 1, player, item) == null)
{
- client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
- client.sendPacket(ExChangeAttributeFail.STATIC);
+ player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
+ player.sendPacket(ExChangeAttributeFail.STATIC);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH);
return;
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
index a5001f4346..e79211ec85 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
@@ -52,26 +52,26 @@ public class RequestCommissionBuyInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
if (!player.isInventoryUnder80(false) || (player.getWeightPenalty() >= 3))
{
- client.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
return;
}
final CommissionItem commissionItem = ItemCommissionManager.getInstance().getCommissionItem(_commissionId);
if (commissionItem != null)
{
- client.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
+ player.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
}
else
{
- client.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
}
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
index aa794d2d96..16dec35e6f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
@@ -49,7 +49,7 @@ public class RequestCommissionBuyItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
index 4f7141c09d..8a3ff5c955 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
@@ -50,7 +50,7 @@ public class RequestCommissionDelete implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
index 1a7edbbaac..01005d24c1 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
@@ -50,18 +50,18 @@ public class RequestCommissionInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
final Item itemInstance = player.getInventory().getItemByObjectId(_itemObjectId);
if (itemInstance != null)
{
- client.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
+ player.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
}
else
{
- client.sendPacket(ExResponseCommissionInfo.EMPTY);
+ player.sendPacket(ExResponseCommissionInfo.EMPTY);
}
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
index 1ad79b9031..57fd69ec8d 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
@@ -62,7 +62,7 @@ public class RequestCommissionList implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
index 6b2f96e87d..7eb252c475 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
@@ -95,7 +95,7 @@ public class RequestCommissionRegister implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
index 1e826566da..b19aefac8d 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
@@ -45,7 +45,7 @@ public class RequestCommissionRegisteredItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
index 532c2496c2..75a5a816f0 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
@@ -46,11 +46,11 @@ public class RequestCommissionRegistrableItemList implements IClientIncomingPack
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
- client.sendPacket(new ExResponseCommissionItemList(1, player.getInventory().getAvailableItems(false, false, false)));
- client.sendPacket(new ExResponseCommissionItemList(2, player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(1, player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(2, player.getInventory().getAvailableItems(false, false, false)));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
index 670f9a29ed..398352c0f7 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = new CompoundRequest(player);
if (!player.addRequest(request))
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
@@ -77,7 +79,7 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
final Item itemOne = request.getItemOne();
if (itemOne == null)
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -87,11 +89,11 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItems.isEmpty())
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
- client.sendPacket(ExEnchantOneOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
index 3b6cd21f20..9ee2839dc3 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
@@ -51,23 +51,25 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -77,14 +79,14 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -93,10 +95,10 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
- client.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
index 0dbe123787..72a0b34bfc 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemOne();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
request.setItemOne(0);
- client.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
index 5743927fa1..4a05f6c92b 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemTwo();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
request.setItemTwo(0);
- client.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
index 8bb6a1605c..6d024a6343 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
return;
}
@@ -78,7 +80,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -86,7 +88,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -96,7 +98,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -113,11 +115,11 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item item = player.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true);
if (success)
{
- client.sendPacket(new ExEnchantSucess(item.getId()));
+ player.sendPacket(new ExEnchantSucess(item.getId()));
}
else
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
index 0100c0113d..f6d74d9d51 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
@@ -65,6 +65,7 @@ public class RequestCrystallizeEstimate 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);
@@ -73,28 +74,28 @@ public class RequestCrystallizeEstimate 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);
return;
}
final Item item = player.getInventory().getItemByObjectId(_objectId);
if ((item == null) || item.isShadowItem() || item.isTimeLimitedItem() || item.isHeroItem() || (!Config.ALT_ALLOW_AUGMENT_DESTROY && item.isAugmented()))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
PacketLogger.warning(player + ": tried to crystallize " + item.getItem());
return;
}
@@ -167,8 +168,8 @@ public class RequestCrystallizeEstimate 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;
}
@@ -177,11 +178,11 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket
if ((crystallizationRewards != null) && !crystallizationRewards.isEmpty())
{
player.setInCrystallize(true);
- client.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
+ player.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
}
else
{
- client.sendPacket(SystemMessageId.ANGEL_NEVIT_S_DESCENT_BONUS_TIME_S1);
+ player.sendPacket(SystemMessageId.ANGEL_NEVIT_S_DESCENT_BONUS_TIME_S1);
}
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
index 584b6e3e4e..a0b7c23c20 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
@@ -40,9 +40,11 @@ public class RequestFriendDetailInfo implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExFriendDetailInfo(player, _name));
+ return;
}
+
+ player.sendPacket(new ExFriendDetailInfo(player, _name));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
index 82fa3a651a..e9e5d90e84 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
@@ -48,6 +48,7 @@ public class RequestMenteeWaitingList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
+
+ player.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
index 7c22e266ca..20ec347a77 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
@@ -41,6 +41,7 @@ public class RequestMentorList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExMentorList(player));
+
+ player.sendPacket(new ExMentorList(player));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
index 4023b0cff0..618f6dc7ed 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
@@ -37,9 +37,11 @@ public class RequestBRGamePoint implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExBRGamePoint(player));
+ return;
}
+
+ player.sendPacket(new ExBRGamePoint(player));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
index de0446cfd8..7ac78cfe4f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
@@ -34,7 +34,7 @@ public class RequestBRRecentProductList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- // Player player = client.getPlayer();
+ // Player player = cplayer.getPlayer();
// TODO: Implement it.
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
index d248722d3d..8cb6a581bc 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.vip;
import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.vip.ReceiveVipLuckyGameInfo;
@@ -32,6 +33,12 @@ public class RequestVipLuckGameInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.sendPacket(new ReceiveVipLuckyGameInfo(client.getPlayer()));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ReceiveVipLuckyGameInfo(player));
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
index 6813c75ed2..f8d602624b 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
@@ -34,7 +34,6 @@ public class ExRestartClient implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.EX_RESTART_CLIENT.writeId(packet);
-
return true;
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
index 89678c1836..4378479707 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
- * A packet used to draw points and lines on client.
+ * A packet used to draw points and lines on cplayer.
* Note: Names in points and lines are bugged they will appear even when not looking at them.
* @author NosBit
*/
@@ -62,7 +62,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -76,7 +76,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -88,7 +88,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -100,7 +100,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
@@ -110,7 +110,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -124,7 +124,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -136,7 +136,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -148,7 +148,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
index ef3f4acc18..25ba232162 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
@@ -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;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
index c6ea588540..acab47f316 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
index cdfaa128cb..129d1a52d1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
index ba988591d0..370aeba2c5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
@@ -51,6 +51,6 @@ public class Appearing implements IClientIncomingPacket
player.onTeleported();
}
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
index 0ea780c5b4..b47439803f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
@@ -55,7 +55,7 @@ public class BypassUserCmd implements IClientIncomingPacket
}
else
{
- handler.useUserCommand(_command, client.getPlayer());
+ handler.useUserCommand(_command, player);
}
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
index a3236b0d83..43c0172038 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
@@ -65,12 +65,12 @@ public class CannotMoveAnymore implements IClientIncomingPacket
// PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+
// " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ());
// StopMove smwl = new StopMove(player);
- // client.getPlayer().sendPacket(smwl);
- // client.getPlayer().broadcastPacket(smwl);
+ // cplayer.getPlayer().sendPacket(smwl);
+ // cplayer.getPlayer().broadcastPacket(smwl);
//
- // StopRotation sr = new StopRotation(client.getPlayer(),
+ // StopRotation sr = new StopRotation(cplayer.getPlayer(),
// _heading);
- // client.getPlayer().sendPacket(sr);
- // client.getPlayer().broadcastPacket(sr);
+ // cplayer.getPlayer().sendPacket(sr);
+ // cplayer.getPlayer().broadcastPacket(sr);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 742ea9e52f..aebcdcd146 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -330,18 +330,18 @@ 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(1, player));
- client.sendPacket(new ItemList(2, player));
+ player.sendPacket(new ItemList(1, player));
+ player.sendPacket(new ItemList(2, player));
// Send Quest Item List
- client.sendPacket(new ExQuestItemList(1, player));
- client.sendPacket(new ExQuestItemList(2, player));
+ player.sendPacket(new ExQuestItemList(1, player));
+ player.sendPacket(new ExQuestItemList(2, player));
// Send Shortcuts
- client.sendPacket(new ShortCutInit(player));
+ player.sendPacket(new ShortCutInit(player));
// Send Action list
player.sendPacket(ExBasicActionList.STATIC_PACKET);
@@ -463,7 +463,7 @@ public class EnterWorld implements IClientIncomingPacket
player.sendPacket(new ExUserInfoEquipSlot(player));
// Friend list
- client.sendPacket(new L2FriendList(player));
+ player.sendPacket(new L2FriendList(player));
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN);
sm.addString(player.getName());
for (int id : player.getFriendList())
@@ -491,14 +491,14 @@ public class EnterWorld implements IClientIncomingPacket
notice.replace("%clan_name%", player.getClan().getName());
notice.replace("%notice_text%", player.getClan().getNotice().replaceAll("\r\n", "
"));
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));
}
}
@@ -510,13 +510,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())
@@ -579,7 +579,7 @@ public class EnterWorld implements IClientIncomingPacket
{
if (MailManager.getInstance().hasUnreadPost(player))
{
- client.sendPacket(ExNoticePostArrived.valueOf(false));
+ player.sendPacket(ExNoticePostArrived.valueOf(false));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 550735eb12..beeceb0a96 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -93,12 +93,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:
@@ -107,7 +107,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new AcquireSkillInfo(_skillType, s));
+ player.sendPacket(new AcquireSkillInfo(_skillType, s));
break;
}
case SUBPLEDGE:
@@ -116,7 +116,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new AcquireSkillInfo(_skillType, s));
+ player.sendPacket(new AcquireSkillInfo(_skillType, s));
break;
}
case ALCHEMY:
@@ -125,7 +125,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new AcquireSkillInfo(_skillType, s));
+ player.sendPacket(new AcquireSkillInfo(_skillType, s));
break;
}
case REVELATION:
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 8078d0c10e..6ac4cc7ca0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -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:
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
index 65c69620a0..94911328a2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
@@ -41,6 +41,7 @@ public class RequestAlchemySkillList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExAlchemySkillList(player));
+
+ player.sendPacket(new ExAlchemySkillList(player));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
index 49bb9c2285..fb6b18d662 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
index c6f8fe2045..b6f8d4fb9e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
index 5669f5691a..beb5024780 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
index 7ee18d42b3..3e864837f8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
index 2baf948bc7..4dc52e2648 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
index 04cf0eb4aa..90eb5edf27 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
@@ -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_SERVITOR);
+ player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_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_SERVITOR);
+ player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_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_AND_THEREFORE_CANNOT_USE_THE_AUTOMATIC_USE_FUNCTION);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR_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())
{
- 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);
}
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
index 83ffc494d5..4b817c3e70 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index ce3d851f06..9c2d96e99c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
@@ -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,8 +253,8 @@ 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));
player.sendPacket(SystemMessageId.EXCHANGE_IS_SUCCESSFUL);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
index d77d8eba6a..f841f306a1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
index 4534c39c18..b65ad7c589 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
index f1ddb94865..5ae334f854 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
index 21710a1eb0..dd69523f80 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
@@ -96,6 +96,6 @@ public class RequestConfirmSiegeWaitingList implements IClientIncomingPacket
}
// Update the defender list
- client.sendPacket(new SiegeDefenderList(castle));
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
index dc81cb23dc..b2f53bed92 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
index 99c633d8ea..1f68699a51 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
@@ -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_OBTAINED_S1_S2_PC_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();
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
index 36d36097c1..5fd67b8759 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
@@ -42,6 +42,6 @@ public class RequestCursedWeaponList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExCursedWeaponList());
+ player.sendPacket(new ExCursedWeaponList());
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
index 573a4f7950..193c436d7e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
index ce21646986..6d59e89936 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
index 5882d1ea46..88fd8b949d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index 255cd31d6b..87774e9302 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -83,7 +83,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;
}
@@ -113,14 +113,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;
}
@@ -129,11 +129,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;
}
@@ -186,13 +186,13 @@ public class RequestDestroyItem implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2_UNEQUIPPED);
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();
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
index 224a640ef5..5227396561 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
index ed981b63f7..f5607f7fa5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index a4be10cf4d..dd90488497 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -86,7 +86,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;
}
@@ -122,9 +122,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.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
+ player.sendPacket(SystemMessageId.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
player.removeRequest(request.getClass());
- client.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
+ player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
return;
}
@@ -134,27 +134,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;
}
@@ -164,9 +164,9 @@ public class RequestEnchantItem implements IClientIncomingPacket
// last validation check
if ((item.getOwnerId() != player.getObjectId()) || !item.isEnchantable())
{
- client.sendPacket(SystemMessageId.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
+ player.sendPacket(SystemMessageId.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
player.removeRequest(request.getClass());
- client.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
+ player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
return;
}
@@ -175,9 +175,9 @@ public class RequestEnchantItem implements IClientIncomingPacket
{
case ERROR:
{
- client.sendPacket(SystemMessageId.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
+ player.sendPacket(SystemMessageId.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
player.removeRequest(request.getClass());
- client.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
+ player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
break;
}
case SUCCESS:
@@ -201,7 +201,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)
@@ -266,8 +266,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)
@@ -301,13 +301,13 @@ public class RequestEnchantItem implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2_UNEQUIPPED);
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()))
@@ -327,11 +327,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)
@@ -363,7 +363,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)
@@ -406,7 +406,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_S2_PC_S);
sm.addItemName(crystals);
sm.addLong(count);
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null))
@@ -416,11 +416,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)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
index 4652f15ddc..22d6a0efa5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
index 31c0ac34f6..6c7d1de201 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
@@ -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);
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
index 98f0487428..959361f9a3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -81,8 +81,8 @@ 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));
+ // cplayer.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
index 35fe136cbd..54a540188c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
@@ -55,6 +55,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket
{
return;
}
+
player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
index 6ec3504089..79088e0c3a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
@@ -47,6 +47,6 @@ public class RequestExFriendListExtended implements IClientIncomingPacket
return;
}
- client.sendPacket(new FriendList(player));
+ player.sendPacket(new FriendList(player));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
index 2e0c2154ac..150caed567 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
@@ -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()));
}
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
index 8851aef463..00bb331778 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
@@ -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 + " !!");
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 16f28d5d04..3ee3f7a9aa 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
index a4e3d49ec4..43be4d259d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
index c55df32ab6..2b1000f445 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
index 3842d82eb9..f6b2724012 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
index f868d0e26f..056262b4ab 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
@@ -48,6 +48,6 @@ public class RequestExShowContactList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExShowContactList(player));
+ player.sendPacket(new ExShowContactList(player));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
index 2d9f0456f4..1589ff8175 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
index 0a4522bf64..a2667da070 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
index b2f32527da..1355a122ce 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
index 73dd408134..1233ad294b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
@@ -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);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
index f1c10ee605..10070bbbeb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
@@ -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;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
index a6ede07bb0..71e028b3be 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
index 04abcbce46..719d0b6fc8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
@@ -61,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket
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;
}
@@ -69,7 +69,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;
}
@@ -91,7 +91,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);
}
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
index a7c019d65d..7253226656 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
index ff96a400c9..79db1768e6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
index 89e11ba6a9..f51eec948c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
index 25d004a7b7..2240af9a6e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
@@ -41,6 +41,7 @@ public class RequestHennaRemoveList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new HennaRemoveList(player));
+
+ player.sendPacket(new HennaRemoveList(player));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
index 1c1fc6d8c2..bc9710d465 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
@@ -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()));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
index d46ef778d4..f9e67ea1ed 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
@@ -43,6 +43,7 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExInzoneWaiting(player, _hide));
+
+ player.sendPacket(new ExInzoneWaiting(player, _hide));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
index 6551e7d0c4..42404bdd99 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
@@ -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();
+ return;
}
+
+ if (player.isInventoryDisabled())
+ {
+ return;
+ }
+
+ player.sendItemList();
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
index 99965602f9..cb5c08f036 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
@@ -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)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
index 226f085fb0..9793d6e1d8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
@@ -44,7 +44,7 @@ public class RequestKeyMapping implements IClientIncomingPacket
if (Config.STORE_UI_SETTINGS)
{
- client.sendPacket(new ExUISetting(player));
+ player.sendPacket(new ExUISetting(player));
}
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
index ada67e190c..2cdc066ead 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
index bffa403c8a..96b1664122 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
@@ -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));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
index 7b4703d69c..9fcb5e9736 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index b9c3900403..ec1f903d13 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -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_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_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;
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
index 19ef1194dc..90fe58124a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
@@ -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.FAILED_TO_DISMISS_THE_PARTY_MEMBER_2);
+ player.sendPacket(SystemMessageId.FAILED_TO_DISMISS_THE_PARTY_MEMBER_2);
}
else
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
index e5beb36b37..73c7d4aa2c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
@@ -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.S1_IS_DISMISSED_FROM_THE_CLAN);
sm.addString(member.getName());
clan.broadcastToOnlineMembers(sm);
- client.sendPacket(SystemMessageId.THE_CLAN_MEMBER_IS_DISMISSED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_ACCEPT_A_NEW_CLAN_MEMBER_FOR_24_H_AFTER_DISMISSING_SOMEONE);
+ player.sendPacket(SystemMessageId.THE_CLAN_MEMBER_IS_DISMISSED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_ACCEPT_A_NEW_CLAN_MEMBER_FOR_24_H_AFTER_DISMISSING_SOMEONE);
// Remove the Player From the Member list
clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(_target));
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
index e670b165cd..de3adf72c3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
@@ -43,7 +43,7 @@ public class RequestPackageSendableItemList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PackageSendableList(1, player, _objectId));
- client.sendPacket(new PackageSendableList(2, player, _objectId));
+ player.sendPacket(new PackageSendableList(1, player, _objectId));
+ player.sendPacket(new PackageSendableList(2, player, _objectId));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
index ca4b4dc9ad..0a32bfeddd 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
@@ -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_EU_4GAMESUPPORT_COM);
+ player.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_ON_HTTPS_EU_4GAMESUPPORT_COM);
return;
}
@@ -91,28 +91,28 @@ public class RequestPetition implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_SUBMITTED_MAXIMUM_NUMBER_OF_PETITIONS_TODAY_YOU_CANNOT_SUBMIT_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);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
index b7f1ab30a7..7d148f2d91 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
index 9934f78249..bd5b51bacc 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
@@ -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_MIN);
+ player.sendPacket(SystemMessageId.ENTRY_APPLICATION_CANCELLED_YOU_MAY_APPLY_TO_A_NEW_CLAN_AFTER_5_MIN);
}
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.YOU_HAVE_JOINED_THE_WAITING_LIST_IF_YOU_DO_NOT_JOIN_ANY_CLAN_IN_30_D_YOUR_CHARACTER_WILL_BE_REMOVED_FROM_THE_LIST_IF_EXIT_WAITING_LIST_IS_USED_YOU_WILL_NOT_BE_ABLE_TO_JOIN_THE_WAITING_LIST_FOR_5_MIN);
+ player.sendPacket(SystemMessageId.YOU_HAVE_JOINED_THE_WAITING_LIST_IF_YOU_DO_NOT_JOIN_ANY_CLAN_IN_30_D_YOUR_CHARACTER_WILL_BE_REMOVED_FROM_THE_LIST_IF_EXIT_WAITING_LIST_IS_USED_YOU_WILL_NOT_BE_ABLE_TO_JOIN_THE_WAITING_LIST_FOR_5_MIN);
}
else
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_MAY_APPLY_FOR_ENTRY_IN_S1_MIN_AFTER_CANCELLING_YOUR_APPLICATION);
sm.addLong(ClanEntryManager.getInstance().getPlayerLockTime(player.getObjectId()));
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
break;
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
index e3ec88ca13..34af0251ca 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
@@ -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())));
}
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
index 76d591b14c..a4f9ba1784 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
index 3459b04c80..4c077a4c9e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
@@ -64,6 +64,7 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PledgeReceiveMemberInfo(member));
+
+ player.sendPacket(new PledgeReceiveMemberInfo(member));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
index e380ce68c8..464ad76c9f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
@@ -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)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
index 8fabbb1f4a..beee5121dd 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
@@ -52,6 +52,6 @@ public class RequestPledgeRecruitBoardDetail implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
+ player.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
index 59d7fae6b7..552511d6f6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
@@ -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_IN_S1_MIN_AFTER_CANCELLING_YOUR_APPLICATION);
sm.addLong(ClanEntryManager.getInstance().getPlayerLockTime(player.getObjectId()));
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
index fe019fe6d6..dde18f32a4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
@@ -44,6 +44,6 @@ public class RequestPledgeWaitingList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeWaitingList(_clanId));
+ player.sendPacket(new ExPledgeWaitingList(_clanId));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
index add0aa2f01..618c787a17 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
@@ -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));
}
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
index 353d28aeb9..724c5dcf5d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
@@ -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_OBTAINED_S1_X_S2);
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);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
index 086f76c512..2a75d35297 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
@@ -51,11 +51,11 @@ 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(1, player));
- client.sendPacket(new ExReplyPostItemList(2, player));
+ player.sendPacket(new ExReplyPostItemList(1, player));
+ player.sendPacket(new ExReplyPostItemList(2, player));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
index 44bbd9d34c..a038920c8b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
index 94958bc4fe..2ded12e55d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
@@ -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());
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
index 2d616f2e94..bb2f0e8e6f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
index 8ab3d4962f..243e4a3674 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
@@ -87,7 +87,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
if (_items == null)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -128,13 +128,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;
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
index bee0568e03..365e1f598f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
index b64136dc79..21ba9b39af 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
index 8badb24c5f..6ffcc69313 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
@@ -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();
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
index 461f09492a..06d51160dd 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
index 5e7754bcbe..71dc3aa8da 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
index 891d914e07..e30bee1ac5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
@@ -41,6 +41,6 @@ public class RequestRecipeItemMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeItemMakeInfo(_id, player));
+ player.sendPacket(new RecipeItemMakeInfo(_id, player));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
index d8e5ef166c..fd6b816fde 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
index d96459999d..b82a2048c7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
@@ -54,6 +54,6 @@ public class RequestRecipeShopMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeShopItemInfo(shop, _recipeId));
+ player.sendPacket(new RecipeShopItemInfo(shop, _recipeId));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
index 39546dc93f..afc1ee3ecc 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
index 85e67c77ed..82f12af318 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index 1bb51eff9d..87a0574a9f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -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))
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
index 4da834c30d..3d01f1e525 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
@@ -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);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
index 1632df189f..9c0c240bd4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
index b3e709c5db..1a7c1ebc0f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
@@ -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)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index 662058f4d8..dfda7319fc 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
index 7b82b33d56..af5f6876b7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
index e5c53c86d0..1cf200da52 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
@@ -58,7 +58,7 @@ public class RequestSentPost 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;
}
@@ -73,6 +73,6 @@ public class RequestSentPost implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExReplySentPost(msg));
+ player.sendPacket(new ExReplySentPost(msg));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
index 99aec4ba86..05a414f453 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
@@ -47,6 +47,7 @@ public class RequestSentPostList implements IClientIncomingPacket
// player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
// return;
// }
- client.sendPacket(new ExShowSentPostList(player.getObjectId()));
+
+ player.sendPacket(new ExShowSentPostList(player.getObjectId()));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
index 72578e8d22..197ab07190 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
@@ -78,18 +78,23 @@ public class RequestSetCrop implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
index fe5ea44de4..a3e3ded0a3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
@@ -77,18 +77,23 @@ public class RequestSetSeed implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index a175a9d052..a6ad0c3e9a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -72,7 +72,7 @@ public class RequestShortCutReg implements IClientIncomingPacket
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
sc.setAutoUse(_active);
player.registerShortCut(sc);
- client.sendPacket(new ShortCutRegister(sc));
+ player.sendPacket(new ShortCutRegister(sc));
player.sendPacket(new ExActivateAutoShortcut(sc, _active));
// When id is not auto used, deactivate auto shortcuts.
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
index 1053bb74c1..fc2725daa7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
@@ -44,6 +44,6 @@ public class RequestShowBeautyList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExResponseBeautyList(player, _type));
+ player.sendPacket(new ExResponseBeautyList(player, _type));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
index 9c73551f59..541b987e91 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
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;
/**
@@ -40,6 +41,12 @@ public class RequestShowBoard implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, client.getPlayer());
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, player);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
index 162de17679..f74c3abf4d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
@@ -41,6 +41,7 @@ public class RequestShowMiniMap implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ShowMiniMap(0));
+
+ player.sendPacket(new ShowMiniMap(0));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
index 097e8f5d30..f055ad8a57 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeAttackerList;
@@ -40,9 +41,17 @@ public class RequestSiegeAttackerList implements IClientIncomingPacket
public void run(GameClient client)
{
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
- if (castle != null)
+ if (castle == null)
{
- client.sendPacket(new SiegeAttackerList(castle));
+ return;
}
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeAttackerList(castle));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
index 6df5163c58..a8d4c9f6d0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList;
@@ -44,6 +45,13 @@ public class RequestSiegeDefenderList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new SiegeDefenderList(castle));
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
index 8ae03da07b..51c42f7b7c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
@@ -34,10 +34,12 @@ public class RequestSkillList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- final Player cha = client.getPlayer();
- if (cha != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- cha.sendSkillList();
+ return;
}
+
+ player.sendSkillList();
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
index 0b39d05211..356308bbbd 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
@@ -60,52 +60,52 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
if ((clanDeclaringWar.getLevel() < 3) || (clanDeclaringWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_3_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_3_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaringWar.getWarCount() >= 30)
{
- client.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final Clan clanDeclaredWar = ClanTable.getInstance().getClanByName(_pledgeName);
if (clanDeclaredWar == null)
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar == clanDeclaringWar)
{
- client.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaringWar.getAllyId() == clanDeclaredWar.getAllyId()) && (clanDeclaringWar.getAllyId() != 0))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaredWar.getLevel() < 3) || (clanDeclaredWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_3_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_3_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis())
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -116,15 +116,15 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_T_DECLARE_A_WAR_BECAUSE_THE_21_DAY_PERIOD_HASN_T_PASSED_AFTER_A_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ALREADY_BEEN_AT_WAR_WITH_THE_S1_CLAN_5_DAYS_MUST_PASS_BEFORE_YOU_CAN_DECLARE_WAR_AGAIN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
index 8ee1ef35b0..dec25745f5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
@@ -60,7 +60,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if ((member != null) && member.isOnline() && member.getPlayer().isInCombat())
{
player.sendPacket(SystemMessageId.THE_CLAN_WAR_CANNOT_BE_STOPPED_BECAUSE_SOMEONE_FROM_YOUR_CLAN_IS_STILL_ENGAGED_IN_BATTLE);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -69,13 +69,13 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if (targetClan == null)
{
player.sendMessage("No such clan.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -85,14 +85,14 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_NOT_DECLARED_A_CLAN_WAR_AGAINST_THE_CLAN_S1);
sm.addString(targetClan.getName());
player.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{
player.sendPacket(SystemMessageId.YOU_CANNOT_DECLARE_DEFEAT_AS_IT_HAS_NOT_BEEN_7_DAYS_SINCE_STARTING_A_CLAN_WAR_WITH_CLAN_S1);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
index 47ce1532d4..5f3d1725f9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
@@ -65,7 +65,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
// The English system message say weapon, but it's applied to any equipped item.
if (player.isAttackingNow() || player.isCastingNow())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
return;
}
@@ -89,13 +89,13 @@ public class RequestUnEquipItem implements IClientIncomingPacket
if (!player.getInventory().canManipulateWithItemId(item.getId()))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
if (item.isWeapon() && item.getWeaponItem().isForceEquip() && !player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
@@ -117,7 +117,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
}
sm.addItemName(unequippedItem);
- client.sendPacket(sm);
+ player.sendPacket(sm);
final InventoryUpdate iu = new InventoryUpdate();
iu.addItems(unequipped);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
index 0b38bcb67c..9e95fb93e1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
@@ -51,28 +51,28 @@ public class RequestVoteNew implements IClientIncomingPacket
{
if (object == null)
{
- client.sendPacket(SystemMessageId.SELECT_TARGET);
+ player.sendPacket(SystemMessageId.SELECT_TARGET);
}
else if (object.isFakePlayer() && FakePlayerData.getInstance().isTalkable(object.getName()))
{
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addString(FakePlayerData.getInstance().getProperName(object.getName()));
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
player.setRecomLeft(player.getRecomLeft() - 1);
- client.sendPacket(new UserInfo(player));
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new UserInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
}
else
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
}
return;
}
@@ -85,19 +85,19 @@ public class RequestVoteNew implements IClientIncomingPacket
if (target == player)
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
return;
}
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
if (target.getRecomHave() >= 255)
{
- client.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
+ player.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
return;
}
@@ -106,16 +106,16 @@ public class RequestVoteNew implements IClientIncomingPacket
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addPcName(target);
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_BEEN_RECOMMENDED_BY_C1);
sm.addPcName(player);
target.sendPacket(sm);
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
target.broadcastUserInfo();
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
target.sendPacket(new ExVoteSystemInfo(target));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
index a79a835c72..79c24f96df 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
@@ -67,12 +67,12 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
}
else if ((player.getWeightPenalty() >= 3) || !player.isInventoryUnder90(false))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
return;
}
else if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.ITEMS_FROM_GAME_ASSISTANTS_CANNOT_BE_EXCHANGED);
+ player.sendPacket(SystemMessageId.ITEMS_FROM_GAME_ASSISTANTS_CANNOT_BE_EXCHANGED);
return;
}
@@ -101,11 +101,11 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
if (player.getPremiumItemList().isEmpty())
{
- client.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
+ player.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
}
else
{
- client.sendPacket(new ExGetPremiumItemList(player));
+ player.sendPacket(new ExGetPremiumItemList(player));
}
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
index 72cd09fc4f..743f92515d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
@@ -48,17 +48,17 @@ public class RequestWithdrawalPledge 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.isClanLeader())
{
- client.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
+ player.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
return;
}
if (player.isInCombat())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
return;
}
@@ -72,7 +72,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
// Remove the Player From the Member list
clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(player.getName()));
clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
- client.sendPacket(SystemMessageId.YOU_HAVE_LEFT_THE_CLAN);
- client.sendPacket(SystemMessageId.YOU_CANNOT_JOIN_ANOTHER_CLAN_FOR_24_H_AFTER_LEAVING_THE_PREVIOUS_ONE);
+ player.sendPacket(SystemMessageId.YOU_HAVE_LEFT_THE_CLAN);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_JOIN_ANOTHER_CLAN_FOR_24_H_AFTER_LEAVING_THE_PREVIOUS_ONE);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
index 84b879e0f7..13ecd08a96 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
@@ -150,14 +150,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
// Item Max Limit Check
if (!warehouse.validateCapacity(slots))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
+ player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
return;
}
// Check if enough adena and charge the fee
if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, manager, false))
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
return;
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
index a5462164d1..76e8ac2a68 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket
}
player.getBuyList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgBuy(player));
+ player.sendPacket(new PrivateStoreMsgBuy(player));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
index ac64c43c5c..d86bfc8f84 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket
}
player.getSellList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgSell(player));
+ player.sendPacket(new PrivateStoreMsgSell(player));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
index f3078c3e52..2726f99c08 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket
}
player.getSellList().setTitle(_msg);
- client.sendPacket(new ExPrivateStoreSetWholeMsg(player));
+ player.sendPacket(new ExPrivateStoreSetWholeMsg(player));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
index d44782af71..5e6691e8be 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
@@ -73,7 +73,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!player.getAccessLevel().allowTransaction())
{
player.sendMessage("Transactions are disabled for your current Access Level.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -84,8 +84,8 @@ public class TradeRequest implements IClientIncomingPacket
{
if (!effect.checkCondition(BotReportTable.TRADE_ACTION_BLOCK_ID))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -104,7 +104,7 @@ public class TradeRequest implements IClientIncomingPacket
// and the following system message is sent to acting player.
if (target.getObjectId() == player.getObjectId())
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
return;
}
@@ -141,7 +141,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!target.isPlayer())
{
- client.sendPacket(SystemMessageId.INVALID_TARGET);
+ player.sendPacket(SystemMessageId.INVALID_TARGET);
return;
}
@@ -161,8 +161,8 @@ public class TradeRequest implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_IS_CURRENTLY_BEING_INVESTIGATED);
sm.addString(partner.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -189,13 +189,13 @@ public class TradeRequest implements IClientIncomingPacket
if ((player.getPrivateStoreType() != PrivateStoreType.NONE) || (partner.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;
}
if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
+ player.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
return;
}
@@ -204,7 +204,7 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
@@ -218,13 +218,13 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.S1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
if (player.calculateDistance3D(partner) > 150)
{
- client.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
+ player.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
return;
}
@@ -232,6 +232,6 @@ public class TradeRequest implements IClientIncomingPacket
partner.sendPacket(new SendTradeRequest(player.getObjectId()));
sm = new SystemMessage(SystemMessageId.YOU_HAVE_REQUESTED_A_TRADE_WITH_C1);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
index afbd8b0b76..3ccf45b47f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
@@ -44,6 +44,6 @@ public class RequestExCancelShape_Shifting_Item implements IClientIncomingPacket
}
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
index 055dc2dd1e..6d286b4894 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
@@ -60,7 +60,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -83,7 +83,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (!extractItem.getItem().isAppearanceable())
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -113,15 +113,15 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,20 +129,20 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -154,6 +154,6 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
}
request.setAppearanceExtractItem(extractItem);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
index f7aa0f3047..1c8eaa09c2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
@@ -55,8 +55,8 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -65,35 +65,35 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -101,7 +101,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -112,6 +112,6 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
return;
}
- client.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
+ player.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 1de9056bda..2a6d3e9bb9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -64,8 +64,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -74,36 +74,36 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -111,14 +111,14 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!appearanceStone.checkConditions(player, targetItem))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,56 +129,56 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
{
if (extractItem == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getOwnerId() != player.getObjectId())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!extractItem.getItem().isAppearanceable())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -189,21 +189,21 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final long cost = appearanceStone.getCost();
if (cost > player.getAdena())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (stone.getCount() < 1L)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((appearanceStone.getType() == AppearanceType.NORMAL) && (inventory.destroyItem(getClass().getSimpleName(), extractItem, 1, player, this) == null))
{
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -276,7 +276,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
player.sendInventoryUpdate(iu);
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
+ player.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
if (targetItem.isEquipped())
{
player.broadcastUserInfo();
@@ -288,8 +288,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
slots.addComponentType(slot);
}
}
- client.sendPacket(slots);
+ player.sendPacket(slots);
}
- client.sendPacket(new ExAdenaInvenCount(player));
+ player.sendPacket(new ExAdenaInvenCount(player));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
index abea70c48a..bf64e21529 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
@@ -65,8 +65,8 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket
// attempting to destroy item
if (player.getInventory().destroyItemByItemId("ChangeAttribute", _consumeItemId, 1, player, item) == null)
{
- client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
- client.sendPacket(ExChangeAttributeFail.STATIC);
+ player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
+ player.sendPacket(ExChangeAttributeFail.STATIC);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH);
return;
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
index a5001f4346..e79211ec85 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
@@ -52,26 +52,26 @@ public class RequestCommissionBuyInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
if (!player.isInventoryUnder80(false) || (player.getWeightPenalty() >= 3))
{
- client.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
return;
}
final CommissionItem commissionItem = ItemCommissionManager.getInstance().getCommissionItem(_commissionId);
if (commissionItem != null)
{
- client.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
+ player.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
}
else
{
- client.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
}
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
index aa794d2d96..16dec35e6f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
@@ -49,7 +49,7 @@ public class RequestCommissionBuyItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
index 4f7141c09d..8a3ff5c955 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
@@ -50,7 +50,7 @@ public class RequestCommissionDelete implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
index 1a7edbbaac..01005d24c1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
@@ -50,18 +50,18 @@ public class RequestCommissionInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
final Item itemInstance = player.getInventory().getItemByObjectId(_itemObjectId);
if (itemInstance != null)
{
- client.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
+ player.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
}
else
{
- client.sendPacket(ExResponseCommissionInfo.EMPTY);
+ player.sendPacket(ExResponseCommissionInfo.EMPTY);
}
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
index 1ad79b9031..57fd69ec8d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
@@ -62,7 +62,7 @@ public class RequestCommissionList implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
index 6b2f96e87d..7eb252c475 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
@@ -95,7 +95,7 @@ public class RequestCommissionRegister implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
index 1e826566da..b19aefac8d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
@@ -45,7 +45,7 @@ public class RequestCommissionRegisteredItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
index 532c2496c2..75a5a816f0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
@@ -46,11 +46,11 @@ public class RequestCommissionRegistrableItemList implements IClientIncomingPack
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
- client.sendPacket(new ExResponseCommissionItemList(1, player.getInventory().getAvailableItems(false, false, false)));
- client.sendPacket(new ExResponseCommissionItemList(2, player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(1, player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(2, player.getInventory().getAvailableItems(false, false, false)));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
index 9cc69554c4..f72f1b6cef 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = new CompoundRequest(player);
if (!player.addRequest(request))
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
@@ -77,7 +79,7 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
final Item itemOne = request.getItemOne();
if (itemOne == null)
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -87,11 +89,11 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItems.isEmpty())
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
- client.sendPacket(ExEnchantOneOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
index 53112870da..1da5028812 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
@@ -51,23 +51,25 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -77,14 +79,14 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -93,10 +95,10 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
- client.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
index 0dbe123787..72a0b34bfc 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemOne();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
request.setItemOne(0);
- client.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
index 5743927fa1..4a05f6c92b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemTwo();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
request.setItemTwo(0);
- client.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
index 8562dc024b..3d54ac4f0d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
return;
}
@@ -78,7 +80,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -86,7 +88,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -96,7 +98,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -121,11 +123,11 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item item = player.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true);
if (success)
{
- client.sendPacket(new ExEnchantSucess(item.getId()));
+ player.sendPacket(new ExEnchantSucess(item.getId()));
}
else
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
index 0100c0113d..f6d74d9d51 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
@@ -65,6 +65,7 @@ public class RequestCrystallizeEstimate 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);
@@ -73,28 +74,28 @@ public class RequestCrystallizeEstimate 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);
return;
}
final Item item = player.getInventory().getItemByObjectId(_objectId);
if ((item == null) || item.isShadowItem() || item.isTimeLimitedItem() || item.isHeroItem() || (!Config.ALT_ALLOW_AUGMENT_DESTROY && item.isAugmented()))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
PacketLogger.warning(player + ": tried to crystallize " + item.getItem());
return;
}
@@ -167,8 +168,8 @@ public class RequestCrystallizeEstimate 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;
}
@@ -177,11 +178,11 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket
if ((crystallizationRewards != null) && !crystallizationRewards.isEmpty())
{
player.setInCrystallize(true);
- client.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
+ player.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
}
else
{
- client.sendPacket(SystemMessageId.ANGEL_NEVIT_S_DESCENT_BONUS_TIME_S1);
+ player.sendPacket(SystemMessageId.ANGEL_NEVIT_S_DESCENT_BONUS_TIME_S1);
}
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
index 584b6e3e4e..a0b7c23c20 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
@@ -40,9 +40,11 @@ public class RequestFriendDetailInfo implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExFriendDetailInfo(player, _name));
+ return;
}
+
+ player.sendPacket(new ExFriendDetailInfo(player, _name));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
index 82fa3a651a..e9e5d90e84 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
@@ -48,6 +48,7 @@ public class RequestMenteeWaitingList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
+
+ player.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
index 7c22e266ca..20ec347a77 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
@@ -41,6 +41,7 @@ public class RequestMentorList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExMentorList(player));
+
+ player.sendPacket(new ExMentorList(player));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
index 4023b0cff0..618f6dc7ed 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
@@ -37,9 +37,11 @@ public class RequestBRGamePoint implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExBRGamePoint(player));
+ return;
}
+
+ player.sendPacket(new ExBRGamePoint(player));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
index de0446cfd8..7ac78cfe4f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
@@ -34,7 +34,7 @@ public class RequestBRRecentProductList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- // Player player = client.getPlayer();
+ // Player player = cplayer.getPlayer();
// TODO: Implement it.
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
index d248722d3d..8cb6a581bc 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.vip;
import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.vip.ReceiveVipLuckyGameInfo;
@@ -32,6 +33,12 @@ public class RequestVipLuckGameInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.sendPacket(new ReceiveVipLuckyGameInfo(client.getPlayer()));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ReceiveVipLuckyGameInfo(player));
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
index 6813c75ed2..f8d602624b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
@@ -34,7 +34,6 @@ public class ExRestartClient implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.EX_RESTART_CLIENT.writeId(packet);
-
return true;
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
index 89678c1836..4378479707 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
- * A packet used to draw points and lines on client.
+ * A packet used to draw points and lines on cplayer.
* Note: Names in points and lines are bugged they will appear even when not looking at them.
* @author NosBit
*/
@@ -62,7 +62,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -76,7 +76,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -88,7 +88,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -100,7 +100,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
@@ -110,7 +110,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -124,7 +124,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -136,7 +136,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -148,7 +148,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
index ef3f4acc18..25ba232162 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
@@ -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;
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
index c6ea588540..acab47f316 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
index cdfaa128cb..129d1a52d1 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
index ba988591d0..370aeba2c5 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
@@ -51,6 +51,6 @@ public class Appearing implements IClientIncomingPacket
player.onTeleported();
}
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
index 0ea780c5b4..b47439803f 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
@@ -55,7 +55,7 @@ public class BypassUserCmd implements IClientIncomingPacket
}
else
{
- handler.useUserCommand(_command, client.getPlayer());
+ handler.useUserCommand(_command, player);
}
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
index a3236b0d83..43c0172038 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
@@ -65,12 +65,12 @@ public class CannotMoveAnymore implements IClientIncomingPacket
// PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+
// " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ());
// StopMove smwl = new StopMove(player);
- // client.getPlayer().sendPacket(smwl);
- // client.getPlayer().broadcastPacket(smwl);
+ // cplayer.getPlayer().sendPacket(smwl);
+ // cplayer.getPlayer().broadcastPacket(smwl);
//
- // StopRotation sr = new StopRotation(client.getPlayer(),
+ // StopRotation sr = new StopRotation(cplayer.getPlayer(),
// _heading);
- // client.getPlayer().sendPacket(sr);
- // client.getPlayer().broadcastPacket(sr);
+ // cplayer.getPlayer().sendPacket(sr);
+ // cplayer.getPlayer().broadcastPacket(sr);
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 742ea9e52f..aebcdcd146 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -330,18 +330,18 @@ 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(1, player));
- client.sendPacket(new ItemList(2, player));
+ player.sendPacket(new ItemList(1, player));
+ player.sendPacket(new ItemList(2, player));
// Send Quest Item List
- client.sendPacket(new ExQuestItemList(1, player));
- client.sendPacket(new ExQuestItemList(2, player));
+ player.sendPacket(new ExQuestItemList(1, player));
+ player.sendPacket(new ExQuestItemList(2, player));
// Send Shortcuts
- client.sendPacket(new ShortCutInit(player));
+ player.sendPacket(new ShortCutInit(player));
// Send Action list
player.sendPacket(ExBasicActionList.STATIC_PACKET);
@@ -463,7 +463,7 @@ public class EnterWorld implements IClientIncomingPacket
player.sendPacket(new ExUserInfoEquipSlot(player));
// Friend list
- client.sendPacket(new L2FriendList(player));
+ player.sendPacket(new L2FriendList(player));
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN);
sm.addString(player.getName());
for (int id : player.getFriendList())
@@ -491,14 +491,14 @@ public class EnterWorld implements IClientIncomingPacket
notice.replace("%clan_name%", player.getClan().getName());
notice.replace("%notice_text%", player.getClan().getNotice().replaceAll("\r\n", "
"));
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));
}
}
@@ -510,13 +510,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())
@@ -579,7 +579,7 @@ public class EnterWorld implements IClientIncomingPacket
{
if (MailManager.getInstance().hasUnreadPost(player))
{
- client.sendPacket(ExNoticePostArrived.valueOf(false));
+ player.sendPacket(ExNoticePostArrived.valueOf(false));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index 550735eb12..beeceb0a96 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -93,12 +93,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:
@@ -107,7 +107,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new AcquireSkillInfo(_skillType, s));
+ player.sendPacket(new AcquireSkillInfo(_skillType, s));
break;
}
case SUBPLEDGE:
@@ -116,7 +116,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new AcquireSkillInfo(_skillType, s));
+ player.sendPacket(new AcquireSkillInfo(_skillType, s));
break;
}
case ALCHEMY:
@@ -125,7 +125,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new AcquireSkillInfo(_skillType, s));
+ player.sendPacket(new AcquireSkillInfo(_skillType, s));
break;
}
case REVELATION:
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 8078d0c10e..6ac4cc7ca0 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -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:
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
index 65c69620a0..94911328a2 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
@@ -41,6 +41,7 @@ public class RequestAlchemySkillList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExAlchemySkillList(player));
+
+ player.sendPacket(new ExAlchemySkillList(player));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
index 49bb9c2285..fb6b18d662 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
index c6f8fe2045..b6f8d4fb9e 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
index 5669f5691a..beb5024780 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
index 7ee18d42b3..3e864837f8 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
index 2baf948bc7..4dc52e2648 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
index 04cf0eb4aa..90eb5edf27 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
@@ -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_SERVITOR);
+ player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_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_SERVITOR);
+ player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_SOULSHOTS_NEEDED_FOR_A_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_AND_THEREFORE_CANNOT_USE_THE_AUTOMATIC_USE_FUNCTION);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR_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())
{
- 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);
}
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
index 83ffc494d5..4b817c3e70 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index ce3d851f06..9c2d96e99c 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
@@ -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,8 +253,8 @@ 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));
player.sendPacket(SystemMessageId.EXCHANGE_IS_SUCCESSFUL);
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
index d77d8eba6a..f841f306a1 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
index 4534c39c18..b65ad7c589 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
index f1ddb94865..5ae334f854 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
index 21710a1eb0..dd69523f80 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
@@ -96,6 +96,6 @@ public class RequestConfirmSiegeWaitingList implements IClientIncomingPacket
}
// Update the defender list
- client.sendPacket(new SiegeDefenderList(castle));
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
index dc81cb23dc..b2f53bed92 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
index 99c633d8ea..1f68699a51 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
@@ -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_OBTAINED_S1_S2_PC_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();
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
index 36d36097c1..5fd67b8759 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
@@ -42,6 +42,6 @@ public class RequestCursedWeaponList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExCursedWeaponList());
+ player.sendPacket(new ExCursedWeaponList());
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
index 573a4f7950..193c436d7e 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
index ce21646986..6d59e89936 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
index 5882d1ea46..88fd8b949d 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index 255cd31d6b..87774e9302 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -83,7 +83,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;
}
@@ -113,14 +113,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;
}
@@ -129,11 +129,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;
}
@@ -186,13 +186,13 @@ public class RequestDestroyItem implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2_UNEQUIPPED);
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();
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
index 224a640ef5..5227396561 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
index ed981b63f7..f5607f7fa5 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index a4be10cf4d..dd90488497 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -86,7 +86,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;
}
@@ -122,9 +122,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.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
+ player.sendPacket(SystemMessageId.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
player.removeRequest(request.getClass());
- client.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
+ player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
return;
}
@@ -134,27 +134,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;
}
@@ -164,9 +164,9 @@ public class RequestEnchantItem implements IClientIncomingPacket
// last validation check
if ((item.getOwnerId() != player.getObjectId()) || !item.isEnchantable())
{
- client.sendPacket(SystemMessageId.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
+ player.sendPacket(SystemMessageId.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
player.removeRequest(request.getClass());
- client.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
+ player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
return;
}
@@ -175,9 +175,9 @@ public class RequestEnchantItem implements IClientIncomingPacket
{
case ERROR:
{
- client.sendPacket(SystemMessageId.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
+ player.sendPacket(SystemMessageId.AUGMENTATION_REQUIREMENTS_ARE_NOT_FULFILLED);
player.removeRequest(request.getClass());
- client.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
+ player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0));
break;
}
case SUCCESS:
@@ -201,7 +201,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)
@@ -266,8 +266,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)
@@ -301,13 +301,13 @@ public class RequestEnchantItem implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2_UNEQUIPPED);
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()))
@@ -327,11 +327,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)
@@ -363,7 +363,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)
@@ -406,7 +406,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_S2_PC_S);
sm.addItemName(crystals);
sm.addLong(count);
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null))
@@ -416,11 +416,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)
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
index 4652f15ddc..22d6a0efa5 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
index 31c0ac34f6..6c7d1de201 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
@@ -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);
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
index 98f0487428..959361f9a3 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -81,8 +81,8 @@ 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));
+ // cplayer.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
index 35fe136cbd..54a540188c 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
@@ -55,6 +55,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket
{
return;
}
+
player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
index 6ec3504089..79088e0c3a 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
@@ -47,6 +47,6 @@ public class RequestExFriendListExtended implements IClientIncomingPacket
return;
}
- client.sendPacket(new FriendList(player));
+ player.sendPacket(new FriendList(player));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
index 2e0c2154ac..150caed567 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
@@ -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()));
}
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
index 8851aef463..00bb331778 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
@@ -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 + " !!");
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 16f28d5d04..3ee3f7a9aa 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
index a4e3d49ec4..43be4d259d 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
index c55df32ab6..2b1000f445 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
index 3842d82eb9..f6b2724012 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
index f868d0e26f..056262b4ab 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
@@ -48,6 +48,6 @@ public class RequestExShowContactList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExShowContactList(player));
+ player.sendPacket(new ExShowContactList(player));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
index 2d9f0456f4..1589ff8175 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
index 0a4522bf64..a2667da070 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
index b2f32527da..1355a122ce 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
@@ -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));
}
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
index 73dd408134..1233ad294b 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
@@ -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);
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
index f1c10ee605..10070bbbeb 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
@@ -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;
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
index a6ede07bb0..71e028b3be 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
index 04abcbce46..719d0b6fc8 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
@@ -61,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket
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;
}
@@ -69,7 +69,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;
}
@@ -91,7 +91,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);
}
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
index a7c019d65d..7253226656 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
index ff96a400c9..79db1768e6 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
index 89e11ba6a9..f51eec948c 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
index 25d004a7b7..2240af9a6e 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
@@ -41,6 +41,7 @@ public class RequestHennaRemoveList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new HennaRemoveList(player));
+
+ player.sendPacket(new HennaRemoveList(player));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
index 1c1fc6d8c2..bc9710d465 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
@@ -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()));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
index d46ef778d4..f9e67ea1ed 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
@@ -43,6 +43,7 @@ public class RequestInzoneWaitingTime implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExInzoneWaiting(player, _hide));
+
+ player.sendPacket(new ExInzoneWaiting(player, _hide));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
index 6551e7d0c4..42404bdd99 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
@@ -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();
+ return;
}
+
+ if (player.isInventoryDisabled())
+ {
+ return;
+ }
+
+ player.sendItemList();
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
index 99965602f9..cb5c08f036 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
@@ -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)
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
index 226f085fb0..9793d6e1d8 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
@@ -44,7 +44,7 @@ public class RequestKeyMapping implements IClientIncomingPacket
if (Config.STORE_UI_SETTINGS)
{
- client.sendPacket(new ExUISetting(player));
+ player.sendPacket(new ExUISetting(player));
}
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
index ada67e190c..2cdc066ead 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
@@ -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);
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
index bffa403c8a..96b1664122 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
@@ -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));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
index 7b4703d69c..9fcb5e9736 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
@@ -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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index b9c3900403..ec1f903d13 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -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_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_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;
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
index 19ef1194dc..90fe58124a 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
@@ -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.FAILED_TO_DISMISS_THE_PARTY_MEMBER_2);
+ player.sendPacket(SystemMessageId.FAILED_TO_DISMISS_THE_PARTY_MEMBER_2);
}
else
{
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
index e5beb36b37..73c7d4aa2c 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
@@ -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.S1_IS_DISMISSED_FROM_THE_CLAN);
sm.addString(member.getName());
clan.broadcastToOnlineMembers(sm);
- client.sendPacket(SystemMessageId.THE_CLAN_MEMBER_IS_DISMISSED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_ACCEPT_A_NEW_CLAN_MEMBER_FOR_24_H_AFTER_DISMISSING_SOMEONE);
+ player.sendPacket(SystemMessageId.THE_CLAN_MEMBER_IS_DISMISSED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_ACCEPT_A_NEW_CLAN_MEMBER_FOR_24_H_AFTER_DISMISSING_SOMEONE);
// Remove the Player From the Member list
clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(_target));
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
index e670b165cd..de3adf72c3 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
@@ -43,7 +43,7 @@ public class RequestPackageSendableItemList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PackageSendableList(1, player, _objectId));
- client.sendPacket(new PackageSendableList(2, player, _objectId));
+ player.sendPacket(new PackageSendableList(1, player, _objectId));
+ player.sendPacket(new PackageSendableList(2, player, _objectId));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
index ca4b4dc9ad..0a32bfeddd 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
@@ -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_EU_4GAMESUPPORT_COM);
+ player.sendPacket(SystemMessageId.THE_PETITION_SERVICE_IS_CURRENTLY_UNAVAILABLE_PLEASE_SEND_A_SUPPORT_TICKET_ON_HTTPS_EU_4GAMESUPPORT_COM);
return;
}
@@ -91,28 +91,28 @@ public class RequestPetition implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_SUBMITTED_MAXIMUM_NUMBER_OF_PETITIONS_TODAY_YOU_CANNOT_SUBMIT_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);
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
index b7f1ab30a7..7d148f2d91 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
index 9934f78249..bd5b51bacc 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
@@ -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_MIN);
+ player.sendPacket(SystemMessageId.ENTRY_APPLICATION_CANCELLED_YOU_MAY_APPLY_TO_A_NEW_CLAN_AFTER_5_MIN);
}
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.YOU_HAVE_JOINED_THE_WAITING_LIST_IF_YOU_DO_NOT_JOIN_ANY_CLAN_IN_30_D_YOUR_CHARACTER_WILL_BE_REMOVED_FROM_THE_LIST_IF_EXIT_WAITING_LIST_IS_USED_YOU_WILL_NOT_BE_ABLE_TO_JOIN_THE_WAITING_LIST_FOR_5_MIN);
+ player.sendPacket(SystemMessageId.YOU_HAVE_JOINED_THE_WAITING_LIST_IF_YOU_DO_NOT_JOIN_ANY_CLAN_IN_30_D_YOUR_CHARACTER_WILL_BE_REMOVED_FROM_THE_LIST_IF_EXIT_WAITING_LIST_IS_USED_YOU_WILL_NOT_BE_ABLE_TO_JOIN_THE_WAITING_LIST_FOR_5_MIN);
}
else
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_MAY_APPLY_FOR_ENTRY_IN_S1_MIN_AFTER_CANCELLING_YOUR_APPLICATION);
sm.addLong(ClanEntryManager.getInstance().getPlayerLockTime(player.getObjectId()));
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
break;
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
index e3ec88ca13..34af0251ca 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
@@ -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())));
}
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
index 76d591b14c..a4f9ba1784 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
index 3459b04c80..4c077a4c9e 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
@@ -64,6 +64,7 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new PledgeReceiveMemberInfo(member));
+
+ player.sendPacket(new PledgeReceiveMemberInfo(member));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
index e380ce68c8..464ad76c9f 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
@@ -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)
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
index 8fabbb1f4a..beee5121dd 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
@@ -52,6 +52,6 @@ public class RequestPledgeRecruitBoardDetail implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
+ player.sendPacket(new ExPledgeRecruitBoardDetail(pledgeRecruitInfo));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
index 59d7fae6b7..552511d6f6 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
@@ -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_IN_S1_MIN_AFTER_CANCELLING_YOUR_APPLICATION);
sm.addLong(ClanEntryManager.getInstance().getPlayerLockTime(player.getObjectId()));
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
index fe019fe6d6..dde18f32a4 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
@@ -44,6 +44,6 @@ public class RequestPledgeWaitingList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExPledgeWaitingList(_clanId));
+ player.sendPacket(new ExPledgeWaitingList(_clanId));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
index add0aa2f01..618c787a17 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
@@ -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));
}
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
index 353d28aeb9..724c5dcf5d 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
@@ -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_OBTAINED_S1_X_S2);
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);
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
index 086f76c512..2a75d35297 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
@@ -51,11 +51,11 @@ 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(1, player));
- client.sendPacket(new ExReplyPostItemList(2, player));
+ player.sendPacket(new ExReplyPostItemList(1, player));
+ player.sendPacket(new ExReplyPostItemList(2, player));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
index 44bbd9d34c..a038920c8b 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
index 94958bc4fe..2ded12e55d 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
@@ -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());
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
index 2d616f2e94..bb2f0e8e6f 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
index 8ab3d4962f..243e4a3674 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
@@ -87,7 +87,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
if (_items == null)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -128,13 +128,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;
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
index bee0568e03..365e1f598f 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
index b64136dc79..21ba9b39af 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
index 8badb24c5f..6ffcc69313 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
@@ -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();
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
index 461f09492a..06d51160dd 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
@@ -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()));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
index 5e7754bcbe..71dc3aa8da 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
index 891d914e07..e30bee1ac5 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
@@ -41,6 +41,6 @@ public class RequestRecipeItemMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeItemMakeInfo(_id, player));
+ player.sendPacket(new RecipeItemMakeInfo(_id, player));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
index d8e5ef166c..fd6b816fde 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
index d96459999d..b82a2048c7 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
@@ -54,6 +54,6 @@ public class RequestRecipeShopMakeInfo implements IClientIncomingPacket
return;
}
- client.sendPacket(new RecipeShopItemInfo(shop, _recipeId));
+ player.sendPacket(new RecipeShopItemInfo(shop, _recipeId));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
index 39546dc93f..afc1ee3ecc 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
index 85e67c77ed..82f12af318 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index 1bb51eff9d..87a0574a9f 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -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))
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
index 4da834c30d..3d01f1e525 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
@@ -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);
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
index 1632df189f..9c0c240bd4 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
index b3e709c5db..1a7c1ebc0f 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
@@ -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)
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index 662058f4d8..dfda7319fc 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
index 7b82b33d56..af5f6876b7 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
@@ -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));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
index e5c53c86d0..1cf200da52 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
@@ -58,7 +58,7 @@ public class RequestSentPost 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;
}
@@ -73,6 +73,6 @@ public class RequestSentPost implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExReplySentPost(msg));
+ player.sendPacket(new ExReplySentPost(msg));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
index 99aec4ba86..05a414f453 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
@@ -47,6 +47,7 @@ public class RequestSentPostList implements IClientIncomingPacket
// player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_OR_SEND_MAIL_WITH_ATTACHED_ITEMS_IN_NON_PEACE_ZONE_REGIONS);
// return;
// }
- client.sendPacket(new ExShowSentPostList(player.getObjectId()));
+
+ player.sendPacket(new ExShowSentPostList(player.getObjectId()));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
index 72578e8d22..197ab07190 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
@@ -78,18 +78,23 @@ public class RequestSetCrop implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
index fe5ea44de4..a3e3ded0a3 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
@@ -77,18 +77,23 @@ public class RequestSetSeed implements IClientIncomingPacket
return;
}
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod())
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Check player privileges
- final Player player = client.getPlayer();
- if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
+ if ((player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index a175a9d052..a6ad0c3e9a 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -72,7 +72,7 @@ public class RequestShortCutReg implements IClientIncomingPacket
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
sc.setAutoUse(_active);
player.registerShortCut(sc);
- client.sendPacket(new ShortCutRegister(sc));
+ player.sendPacket(new ShortCutRegister(sc));
player.sendPacket(new ExActivateAutoShortcut(sc, _active));
// When id is not auto used, deactivate auto shortcuts.
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
index 1053bb74c1..fc2725daa7 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
@@ -44,6 +44,6 @@ public class RequestShowBeautyList implements IClientIncomingPacket
return;
}
- client.sendPacket(new ExResponseBeautyList(player, _type));
+ player.sendPacket(new ExResponseBeautyList(player, _type));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
index 9c73551f59..541b987e91 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
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;
/**
@@ -40,6 +41,12 @@ public class RequestShowBoard implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, client.getPlayer());
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ CommunityBoardHandler.getInstance().handleParseCommand(Config.BBS_DEFAULT, player);
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
index 162de17679..f74c3abf4d 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
@@ -41,6 +41,7 @@ public class RequestShowMiniMap implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ShowMiniMap(0));
+
+ player.sendPacket(new ShowMiniMap(0));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
index 097e8f5d30..f055ad8a57 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeAttackerList;
@@ -40,9 +41,17 @@ public class RequestSiegeAttackerList implements IClientIncomingPacket
public void run(GameClient client)
{
final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
- if (castle != null)
+ if (castle == null)
{
- client.sendPacket(new SiegeAttackerList(castle));
+ return;
}
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeAttackerList(castle));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
index 6df5163c58..a8d4c9f6d0 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList;
@@ -44,6 +45,13 @@ public class RequestSiegeDefenderList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new SiegeDefenderList(castle));
+
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new SiegeDefenderList(castle));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
index 8ae03da07b..51c42f7b7c 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
@@ -34,10 +34,12 @@ public class RequestSkillList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- final Player cha = client.getPlayer();
- if (cha != null)
+ final Player player = client.getPlayer();
+ if (player == null)
{
- cha.sendSkillList();
+ return;
}
+
+ player.sendSkillList();
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
index 0b39d05211..356308bbbd 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
@@ -60,52 +60,52 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
if ((clanDeclaringWar.getLevel() < 3) || (clanDeclaringWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_3_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_3_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaringWar.getWarCount() >= 30)
{
- client.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.A_DECLARATION_OF_WAR_AGAINST_MORE_THAN_30_CLANS_CAN_T_BE_MADE_AT_THE_SAME_TIME);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final Clan clanDeclaredWar = ClanTable.getInstance().getClanByName(_pledgeName);
if (clanDeclaredWar == null)
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar == clanDeclaringWar)
{
- client.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.FOOL_YOU_CANNOT_DECLARE_WAR_AGAINST_YOUR_OWN_CLAN));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaringWar.getAllyId() == clanDeclaredWar.getAllyId()) && (clanDeclaringWar.getAllyId() != 0))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clanDeclaredWar.getLevel() < 3) || (clanDeclaredWar.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_3_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_ONLY_BE_DECLARED_IF_THE_CLAN_IS_LV_3_OR_HIGHER_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_15_OR_GREATER));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis())
{
- client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED));
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -116,15 +116,15 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_T_DECLARE_A_WAR_BECAUSE_THE_21_DAY_PERIOD_HASN_T_PASSED_AFTER_A_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ALREADY_BEEN_AT_WAR_WITH_THE_S1_CLAN_5_DAYS_MUST_PASS_BEFORE_YOU_CAN_DECLARE_WAR_AGAIN);
sm.addString(clanDeclaredWar.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
index 8ee1ef35b0..dec25745f5 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
@@ -60,7 +60,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if ((member != null) && member.isOnline() && member.getPlayer().isInCombat())
{
player.sendPacket(SystemMessageId.THE_CLAN_WAR_CANNOT_BE_STOPPED_BECAUSE_SOMEONE_FROM_YOUR_CLAN_IS_STILL_ENGAGED_IN_BATTLE);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -69,13 +69,13 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
if (targetClan == null)
{
player.sendMessage("No such clan.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
{
- client.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -85,14 +85,14 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_NOT_DECLARED_A_CLAN_WAR_AGAINST_THE_CLAN_S1);
sm.addString(targetClan.getName());
player.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{
player.sendPacket(SystemMessageId.YOU_CANNOT_DECLARE_DEFEAT_AS_IT_HAS_NOT_BEEN_7_DAYS_SINCE_STARTING_A_CLAN_WAR_WITH_CLAN_S1);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
index 47ce1532d4..5f3d1725f9 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
@@ -65,7 +65,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
// The English system message say weapon, but it's applied to any equipped item.
if (player.isAttackingNow() || player.isCastingNow())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_WEAPONS_DURING_AN_ATTACK);
return;
}
@@ -89,13 +89,13 @@ public class RequestUnEquipItem implements IClientIncomingPacket
if (!player.getInventory().canManipulateWithItemId(item.getId()))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
if (item.isWeapon() && item.getWeaponItem().isForceEquip() && !player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS))
{
- client.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
+ player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_TAKEN_OFF);
return;
}
@@ -117,7 +117,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
}
sm.addItemName(unequippedItem);
- client.sendPacket(sm);
+ player.sendPacket(sm);
final InventoryUpdate iu = new InventoryUpdate();
iu.addItems(unequipped);
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
index 0b38bcb67c..9e95fb93e1 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
@@ -51,28 +51,28 @@ public class RequestVoteNew implements IClientIncomingPacket
{
if (object == null)
{
- client.sendPacket(SystemMessageId.SELECT_TARGET);
+ player.sendPacket(SystemMessageId.SELECT_TARGET);
}
else if (object.isFakePlayer() && FakePlayerData.getInstance().isTalkable(object.getName()))
{
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addString(FakePlayerData.getInstance().getProperName(object.getName()));
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
player.setRecomLeft(player.getRecomLeft() - 1);
- client.sendPacket(new UserInfo(player));
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new UserInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
}
else
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
}
return;
}
@@ -85,19 +85,19 @@ public class RequestVoteNew implements IClientIncomingPacket
if (target == player)
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
return;
}
if (player.getRecomLeft() <= 0)
{
- client.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
+ player.sendPacket(SystemMessageId.YOU_ARE_OUT_OF_RECOMMENDATIONS_TRY_AGAIN_LATER);
return;
}
if (target.getRecomHave() >= 255)
{
- client.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
+ player.sendPacket(SystemMessageId.YOUR_SELECTED_TARGET_CAN_NO_LONGER_RECEIVE_A_RECOMMENDATION);
return;
}
@@ -106,16 +106,16 @@ public class RequestVoteNew implements IClientIncomingPacket
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
sm.addPcName(target);
sm.addInt(player.getRecomLeft());
- client.sendPacket(sm);
+ player.sendPacket(sm);
sm = new SystemMessage(SystemMessageId.YOU_HAVE_BEEN_RECOMMENDED_BY_C1);
sm.addPcName(player);
target.sendPacket(sm);
- client.sendPacket(new UserInfo(player));
+ player.sendPacket(new UserInfo(player));
target.broadcastUserInfo();
- client.sendPacket(new ExVoteSystemInfo(player));
+ player.sendPacket(new ExVoteSystemInfo(player));
target.sendPacket(new ExVoteSystemInfo(target));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
index a79a835c72..79c24f96df 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
@@ -67,12 +67,12 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
}
else if ((player.getWeightPenalty() >= 3) || !player.isInventoryUnder90(false))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_DIMENSIONAL_ITEM_BECAUSE_YOU_HAVE_EXCEED_YOUR_INVENTORY_WEIGHT_QUANTITY_LIMIT);
return;
}
else if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.ITEMS_FROM_GAME_ASSISTANTS_CANNOT_BE_EXCHANGED);
+ player.sendPacket(SystemMessageId.ITEMS_FROM_GAME_ASSISTANTS_CANNOT_BE_EXCHANGED);
return;
}
@@ -101,11 +101,11 @@ public class RequestWithDrawPremiumItem implements IClientIncomingPacket
if (player.getPremiumItemList().isEmpty())
{
- client.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
+ player.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_DIMENSIONAL_ITEMS_TO_BE_FOUND);
}
else
{
- client.sendPacket(new ExGetPremiumItemList(player));
+ player.sendPacket(new ExGetPremiumItemList(player));
}
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
index 72cd09fc4f..743f92515d 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
@@ -48,17 +48,17 @@ public class RequestWithdrawalPledge 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.isClanLeader())
{
- client.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
+ player.sendPacket(SystemMessageId.A_CLAN_LEADER_CANNOT_WITHDRAW_FROM_THEIR_OWN_CLAN);
return;
}
if (player.isInCombat())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_A_CLAN_WHILE_ENGAGED_IN_COMBAT);
return;
}
@@ -72,7 +72,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
// Remove the Player From the Member list
clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(player.getName()));
clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
- client.sendPacket(SystemMessageId.YOU_HAVE_LEFT_THE_CLAN);
- client.sendPacket(SystemMessageId.YOU_CANNOT_JOIN_ANOTHER_CLAN_FOR_24_H_AFTER_LEAVING_THE_PREVIOUS_ONE);
+ player.sendPacket(SystemMessageId.YOU_HAVE_LEFT_THE_CLAN);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_JOIN_ANOTHER_CLAN_FOR_24_H_AFTER_LEAVING_THE_PREVIOUS_ONE);
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
index 84b879e0f7..13ecd08a96 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
@@ -150,14 +150,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
// Item Max Limit Check
if (!warehouse.validateCapacity(slots))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
+ player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
return;
}
// Check if enough adena and charge the fee
if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, manager, false))
{
- client.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
return;
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
index a5462164d1..76e8ac2a68 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket
}
player.getBuyList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgBuy(player));
+ player.sendPacket(new PrivateStoreMsgBuy(player));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
index ac64c43c5c..d86bfc8f84 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket
}
player.getSellList().setTitle(_storeMsg);
- client.sendPacket(new PrivateStoreMsgSell(player));
+ player.sendPacket(new PrivateStoreMsgSell(player));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
index f3078c3e52..2726f99c08 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
@@ -55,6 +55,6 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket
}
player.getSellList().setTitle(_msg);
- client.sendPacket(new ExPrivateStoreSetWholeMsg(player));
+ player.sendPacket(new ExPrivateStoreSetWholeMsg(player));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
index d44782af71..5e6691e8be 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
@@ -73,7 +73,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!player.getAccessLevel().allowTransaction())
{
player.sendMessage("Transactions are disabled for your current Access Level.");
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -84,8 +84,8 @@ public class TradeRequest implements IClientIncomingPacket
{
if (!effect.checkCondition(BotReportTable.TRADE_ACTION_BLOCK_ID))
{
- client.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_YOUR_ACTIONS_HAVE_BEEN_RESTRICTED);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -104,7 +104,7 @@ public class TradeRequest implements IClientIncomingPacket
// and the following system message is sent to acting player.
if (target.getObjectId() == player.getObjectId())
{
- client.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+ player.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
return;
}
@@ -141,7 +141,7 @@ public class TradeRequest implements IClientIncomingPacket
if (!target.isPlayer())
{
- client.sendPacket(SystemMessageId.INVALID_TARGET);
+ player.sendPacket(SystemMessageId.INVALID_TARGET);
return;
}
@@ -161,8 +161,8 @@ public class TradeRequest implements IClientIncomingPacket
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_IS_CURRENTLY_BEING_INVESTIGATED);
sm.addString(partner.getName());
- client.sendPacket(sm);
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(sm);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
}
@@ -189,13 +189,13 @@ public class TradeRequest implements IClientIncomingPacket
if ((player.getPrivateStoreType() != PrivateStoreType.NONE) || (partner.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;
}
if (player.isProcessingTransaction())
{
- client.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
+ player.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE);
return;
}
@@ -204,7 +204,7 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
@@ -218,13 +218,13 @@ public class TradeRequest implements IClientIncomingPacket
{
sm = new SystemMessage(SystemMessageId.S1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
return;
}
if (player.calculateDistance3D(partner) > 150)
{
- client.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
+ player.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
return;
}
@@ -232,6 +232,6 @@ public class TradeRequest implements IClientIncomingPacket
partner.sendPacket(new SendTradeRequest(player.getObjectId()));
sm = new SystemMessage(SystemMessageId.YOU_HAVE_REQUESTED_A_TRADE_WITH_C1);
sm.addString(partner.getName());
- client.sendPacket(sm);
+ player.sendPacket(sm);
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
index afbd8b0b76..3ccf45b47f 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
@@ -44,6 +44,6 @@ public class RequestExCancelShape_Shifting_Item implements IClientIncomingPacket
}
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
index 055dc2dd1e..6d286b4894 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
@@ -60,7 +60,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -83,7 +83,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (!extractItem.getItem().isAppearanceable())
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -113,15 +113,15 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_A_MODIFIED_ITEM);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,20 +129,20 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED);
player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED);
return;
}
@@ -154,6 +154,6 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient
}
request.setAppearanceExtractItem(extractItem);
- client.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
+ player.sendPacket(ExPutShapeShiftingExtractionItemResult.SUCCESS);
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
index f7aa0f3047..1c8eaa09c2 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
@@ -55,8 +55,8 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -65,35 +65,35 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -101,7 +101,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
+ player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -112,6 +112,6 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming
return;
}
- client.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
+ player.sendPacket(new ExPutShapeShiftingTargetItemResult(ExPutShapeShiftingTargetItemResult.RESULT_SUCCESS, appearanceStone.getCost()));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 1de9056bda..2a6d3e9bb9 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -64,8 +64,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class);
if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
return;
}
@@ -74,36 +74,36 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
Item stone = request.getAppearanceStone();
if ((targetItem == null) || (stone == null))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone.getOwnerId() != player.getObjectId()) || (targetItem.getOwnerId() != player.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!targetItem.getItem().isAppearanceable())
{
- client.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((targetItem.getItemLocation() != ItemLocation.INVENTORY) && (targetItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((stone = inventory.getItemByObjectId(stone.getObjectId())) == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -111,14 +111,14 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final AppearanceStone appearanceStone = AppearanceItemData.getInstance().getStone(stone.getId());
if (appearanceStone == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!appearanceStone.checkConditions(player, targetItem))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -129,56 +129,56 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
{
if (extractItem == null)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getOwnerId() != player.getObjectId())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (!extractItem.getItem().isAppearanceable())
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemLocation() != ItemLocation.INVENTORY) && (extractItem.getItemLocation() != ItemLocation.PAPERDOLL))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (extractItem.getVisualId() > 0)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItemType() != targetItem.getItemType()) || (extractItem.getId() == targetItem.getId()) || (extractItem.getObjectId() == targetItem.getObjectId()))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST)))
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -189,21 +189,21 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
final long cost = appearanceStone.getCost();
if (cost > player.getAdena())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AS_YOU_DO_NOT_HAVE_ENOUGH_ADENA);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if (stone.getCount() < 1L)
{
- client.sendPacket(ExShapeShiftingResult.CLOSE);
+ player.sendPacket(ExShapeShiftingResult.CLOSE);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
if ((appearanceStone.getType() == AppearanceType.NORMAL) && (inventory.destroyItem(getClass().getSimpleName(), extractItem, 1, player, this) == null))
{
- client.sendPacket(ExShapeShiftingResult.FAILED);
+ player.sendPacket(ExShapeShiftingResult.FAILED);
player.removeRequest(ShapeShiftingItemRequest.class);
return;
}
@@ -276,7 +276,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
player.sendInventoryUpdate(iu);
player.removeRequest(ShapeShiftingItemRequest.class);
- client.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
+ player.sendPacket(new ExShapeShiftingResult(ExShapeShiftingResult.RESULT_SUCCESS, targetItem.getId(), extracItemId));
if (targetItem.isEquipped())
{
player.broadcastUserInfo();
@@ -288,8 +288,8 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket
slots.addComponentType(slot);
}
}
- client.sendPacket(slots);
+ player.sendPacket(slots);
}
- client.sendPacket(new ExAdenaInvenCount(player));
+ player.sendPacket(new ExAdenaInvenCount(player));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
index abea70c48a..bf64e21529 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java
@@ -65,8 +65,8 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket
// attempting to destroy item
if (player.getInventory().destroyItemByItemId("ChangeAttribute", _consumeItemId, 1, player, item) == null)
{
- client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
- client.sendPacket(ExChangeAttributeFail.STATIC);
+ player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
+ player.sendPacket(ExChangeAttributeFail.STATIC);
Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH);
return;
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
index a5001f4346..e79211ec85 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
@@ -52,26 +52,26 @@ public class RequestCommissionBuyInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
if (!player.isInventoryUnder80(false) || (player.getWeightPenalty() >= 3))
{
- client.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.IF_THE_WEIGHT_IS_80_OR_MORE_AND_THE_INVENTORY_NUMBER_IS_90_OR_MORE_PURCHASE_CANCELLATION_IS_NOT_POSSIBLE);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
return;
}
final CommissionItem commissionItem = ItemCommissionManager.getInstance().getCommissionItem(_commissionId);
if (commissionItem != null)
{
- client.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
+ player.sendPacket(new ExResponseCommissionBuyInfo(commissionItem));
}
else
{
- client.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
- client.sendPacket(ExResponseCommissionBuyInfo.FAILED);
+ player.sendPacket(SystemMessageId.ITEM_PURCHASE_IS_NOT_AVAILABLE_BECAUSE_THE_CORRESPONDING_ITEM_DOES_NOT_EXIST);
+ player.sendPacket(ExResponseCommissionBuyInfo.FAILED);
}
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
index aa794d2d96..16dec35e6f 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
@@ -49,7 +49,7 @@ public class RequestCommissionBuyItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
index 4f7141c09d..8a3ff5c955 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
@@ -50,7 +50,7 @@ public class RequestCommissionDelete implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
index 1a7edbbaac..01005d24c1 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
@@ -50,18 +50,18 @@ public class RequestCommissionInfo implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
final Item itemInstance = player.getInventory().getItemByObjectId(_itemObjectId);
if (itemInstance != null)
{
- client.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
+ player.sendPacket(player.getLastCommissionInfos().getOrDefault(itemInstance.getId(), ExResponseCommissionInfo.EMPTY));
}
else
{
- client.sendPacket(ExResponseCommissionInfo.EMPTY);
+ player.sendPacket(ExResponseCommissionInfo.EMPTY);
}
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
index 1ad79b9031..57fd69ec8d 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
@@ -62,7 +62,7 @@ public class RequestCommissionList implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
index 6b2f96e87d..7eb252c475 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
@@ -95,7 +95,7 @@ public class RequestCommissionRegister implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
index 1e826566da..b19aefac8d 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
@@ -45,7 +45,7 @@ public class RequestCommissionRegisteredItem implements IClientIncomingPacket
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
index 532c2496c2..75a5a816f0 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
@@ -46,11 +46,11 @@ public class RequestCommissionRegistrableItemList implements IClientIncomingPack
if (!ItemCommissionManager.isPlayerAllowedToInteract(player))
{
- client.sendPacket(ExCloseCommission.STATIC_PACKET);
+ player.sendPacket(ExCloseCommission.STATIC_PACKET);
return;
}
- client.sendPacket(new ExResponseCommissionItemList(1, player.getInventory().getAvailableItems(false, false, false)));
- client.sendPacket(new ExResponseCommissionItemList(2, player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(1, player.getInventory().getAvailableItems(false, false, false)));
+ player.sendPacket(new ExResponseCommissionItemList(2, player.getInventory().getAvailableItems(false, false, false)));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
index 9cc69554c4..f72f1b6cef 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = new CompoundRequest(player);
if (!player.addRequest(request))
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
@@ -77,7 +79,7 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
final Item itemOne = request.getItemOne();
if (itemOne == null)
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -87,11 +89,11 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItems.isEmpty())
{
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
- client.sendPacket(ExEnchantOneOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
index 53112870da..1da5028812 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
@@ -51,23 +51,25 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -77,14 +79,14 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
@@ -93,10 +95,10 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
- client.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
index 0dbe123787..72a0b34bfc 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveOne implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemOne();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
request.setItemOne(0);
- client.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
index 5743927fa1..4a05f6c92b 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
@@ -49,34 +49,36 @@ public class RequestNewEnchantRemoveTwo implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
final Item item = request.getItemTwo();
if ((item == null) || (item.getObjectId() != _objectId))
{
- client.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
request.setItemTwo(0);
- client.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
+ player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
index 8562dc024b..3d54ac4f0d 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
@@ -52,23 +52,25 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
{
return;
}
- else if (player.isInStoreMode())
+
+ if (player.isInStoreMode())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_IN_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
- else if (player.isProcessingTransaction() || player.isProcessingRequest())
+
+ if (player.isProcessingTransaction() || player.isProcessingRequest())
{
- client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
- client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
+ player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP);
+ player.sendPacket(ExEnchantOneFail.STATIC_PACKET);
return;
}
final CompoundRequest request = player.getRequest(CompoundRequest.class);
if ((request == null) || request.isProcessing())
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
return;
}
@@ -78,7 +80,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item itemTwo = request.getItemTwo();
if ((itemOne == null) || (itemTwo == null))
{
- client.sendPacket(ExEnchantFail.STATIC_PACKET);
+ player.sendPacket(ExEnchantFail.STATIC_PACKET);
player.removeRequest(request.getClass());
return;
}
@@ -86,7 +88,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -96,7 +98,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Not implemented or not able to merge!
if (combinationItem == null)
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass());
return;
}
@@ -121,11 +123,11 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final Item item = player.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true);
if (success)
{
- client.sendPacket(new ExEnchantSucess(item.getId()));
+ player.sendPacket(new ExEnchantSucess(item.getId()));
}
else
{
- client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
+ player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
index 0100c0113d..f6d74d9d51 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
@@ -65,6 +65,7 @@ public class RequestCrystallizeEstimate 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);
@@ -73,28 +74,28 @@ public class RequestCrystallizeEstimate 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);
return;
}
final Item item = player.getInventory().getItemByObjectId(_objectId);
if ((item == null) || item.isShadowItem() || item.isTimeLimitedItem() || item.isHeroItem() || (!Config.ALT_ALLOW_AUGMENT_DESTROY && item.isAugmented()))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE))
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
+ player.sendPacket(ActionFailed.STATIC_PACKET);
PacketLogger.warning(player + ": tried to crystallize " + item.getItem());
return;
}
@@ -167,8 +168,8 @@ public class RequestCrystallizeEstimate 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;
}
@@ -177,11 +178,11 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket
if ((crystallizationRewards != null) && !crystallizationRewards.isEmpty())
{
player.setInCrystallize(true);
- client.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
+ player.sendPacket(new ExGetCrystalizingEstimation(crystallizationRewards));
}
else
{
- client.sendPacket(SystemMessageId.ANGEL_NEVIT_S_DESCENT_BONUS_TIME_S1);
+ player.sendPacket(SystemMessageId.ANGEL_NEVIT_S_DESCENT_BONUS_TIME_S1);
}
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
index 584b6e3e4e..a0b7c23c20 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
@@ -40,9 +40,11 @@ public class RequestFriendDetailInfo implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExFriendDetailInfo(player, _name));
+ return;
}
+
+ player.sendPacket(new ExFriendDetailInfo(player, _name));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
index 82fa3a651a..e9e5d90e84 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
@@ -48,6 +48,7 @@ public class RequestMenteeWaitingList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
+
+ player.sendPacket(new ListMenteeWaiting(_page, _minLevel, _maxLevel));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
index 7c22e266ca..20ec347a77 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
@@ -41,6 +41,7 @@ public class RequestMentorList implements IClientIncomingPacket
{
return;
}
- client.sendPacket(new ExMentorList(player));
+
+ player.sendPacket(new ExMentorList(player));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
index 4023b0cff0..618f6dc7ed 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
@@ -37,9 +37,11 @@ public class RequestBRGamePoint implements IClientIncomingPacket
public void run(GameClient client)
{
final Player player = client.getPlayer();
- if (player != null)
+ if (player == null)
{
- client.sendPacket(new ExBRGamePoint(player));
+ return;
}
+
+ player.sendPacket(new ExBRGamePoint(player));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
index de0446cfd8..7ac78cfe4f 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
@@ -34,7 +34,7 @@ public class RequestBRRecentProductList implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- // Player player = client.getPlayer();
+ // Player player = cplayer.getPlayer();
// TODO: Implement it.
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
index d248722d3d..8cb6a581bc 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/vip/RequestVipLuckGameInfo.java
@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets.vip;
import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.vip.ReceiveVipLuckyGameInfo;
@@ -32,6 +33,12 @@ public class RequestVipLuckGameInfo implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
- client.sendPacket(new ReceiveVipLuckyGameInfo(client.getPlayer()));
+ final Player player = client.getPlayer();
+ if (player == null)
+ {
+ return;
+ }
+
+ player.sendPacket(new ReceiveVipLuckyGameInfo(player));
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
index 6813c75ed2..f8d602624b 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
@@ -34,7 +34,6 @@ public class ExRestartClient implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.EX_RESTART_CLIENT.writeId(packet);
-
return true;
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
index 89678c1836..4378479707 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
- * A packet used to draw points and lines on client.
+ * A packet used to draw points and lines on cplayer.
* Note: Names in points and lines are bugged they will appear even when not looking at them.
* @author NosBit
*/
@@ -62,7 +62,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -76,7 +76,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -88,7 +88,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -100,7 +100,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/
@@ -110,7 +110,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -124,7 +124,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param name the name that will be displayed over the point
* @param color the color
* @param isNameColored if {@code true} name will be colored as well.
@@ -136,7 +136,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param x the x coordinate for this point
* @param y the y coordinate for this point
@@ -148,7 +148,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket
}
/**
- * Adds a point to be displayed on client.
+ * Adds a point to be displayed on cplayer.
* @param color the color
* @param locational the ILocational to take coordinates for this point
*/