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

Make use of stored player variable for simplicity reasons.

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

14
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
View File

@@ -70,7 +70,7 @@ public class Action implements IClientIncomingPacket
if (player.inObserverMode())
{
player.sendPacket(SystemMessageId.OBSERVERS_CANNOT_PARTICIPATE);
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -106,27 +106,27 @@ public class Action implements IClientIncomingPacket
if (obj == null)
{
// pressing e.g. pickup many times quickly would get you here
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
if (!obj.isTargetable() && !player.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;
}
}

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
View File

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

5
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
View File

@@ -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));
}
}

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
View File

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

22
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@@ -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", "<br>"));
notice.disableValidation();
client.sendPacket(notice);
player.sendPacket(notice);
}
else if (Config.SERVER_NEWS)
{
final String serverNews = HtmCache.getInstance().getHtm(player, "data/html/servnews.htm");
if (serverNews != null)
{
client.sendPacket(new NpcHtmlMessage(serverNews));
player.sendPacket(new NpcHtmlMessage(serverNews));
}
}
@@ -497,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)

8
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
View File

@@ -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;
}
}

24
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
View File

@@ -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);

8
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
View File

@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExShowAgitInfo;
@@ -34,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());
}
}

8
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
View File

@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExShowCastleInfo;
@@ -34,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());
}
}

8
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
View File

@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressInfo;
@@ -34,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);
}
}

9
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
View File

@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.AllyCrest;
@@ -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));
}
}

9
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
View File

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

22
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
View File

@@ -91,14 +91,14 @@ public class RequestBuyItem implements IClientIncomingPacket
if (_items == null)
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Alt game - Karma punishment
if (!Config.ALT_GAME_KARMA_PLAYER_CAN_SHOP && (player.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;
}

18
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
View File

@@ -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;
}

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
View File

@@ -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;
}

7
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteMacro.java
View File

@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
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);
}
}

4
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
View File

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

4
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
View File

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

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
View File

@@ -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);

11
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDominionInfo.java
View File

@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.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);
}
}

9
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
View File

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

9
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
View File

@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.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));
}
}

9
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
View File

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

19
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
View File

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

16
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
View File

@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.instancemanager.FortManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressSiegeInfo;
@@ -36,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));
}
}
}

4
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
View File

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

4
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
View File

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

7
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGmList.java
View File

@@ -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);
}
}

6
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
View File

@@ -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);
}
}
}

3
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
View File

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

3
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
View File

@@ -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));
}
}

6
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
View File

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

13
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
View File

@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
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));
}
}

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java
View File

@@ -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);

18
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
View File

@@ -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);
}
}

9
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
View File

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

4
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java
View File

@@ -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);
}
}

11
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
View File

@@ -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<Item> 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<Item> items = player.getInventory().getAvailableItems(true, true, true);
player.sendPacket(new PackageSendableList(items, _objectID, player.getAdena()));
}
}

28
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
View File

@@ -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;
}

9
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
View File

@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.PledgeCrest;
@@ -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));
}
}

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
View File

@@ -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));
}
}
}

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
View File

@@ -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;
}

10
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
View File

@@ -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());

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
View File

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

6
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
View File

@@ -79,7 +79,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket
if (_items == null)
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@@ -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;
}

10
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
View File

@@ -87,21 +87,21 @@ public class RequestProcureCropList implements IClientIncomingPacket
final CastleManorManager manor = CastleManorManager.getInstance();
if (manor.isUnderMaintenance())
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final Npc manager = player.getLastFolkNPC();
if (!(manager instanceof Merchant) || !manager.canInteract(player))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
final int castleId = manager.getCastle().getResidenceId();
if (manager.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;
}

9
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
View File

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

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
View File

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

8
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
View File

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

3
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
View File

@@ -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);

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
View File

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

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
View File

@@ -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

24
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
View File

@@ -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));
}
}

12
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
View File

@@ -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;
}

12
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
View File

@@ -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;
}

4
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
View File

@@ -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));
}
}

13
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
View File

@@ -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;
}

13
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
View File

@@ -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;
}

13
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
View File

@@ -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));
}
}

9
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
View File

@@ -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);
}
}

11
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
View File

@@ -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));
}
}
}

10
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
View File

@@ -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));
}
}

8
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
View File

@@ -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();
}
}

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
View File

@@ -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;

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
View File

@@ -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.");

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
View File

@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket
}
player.getBuyList().setTitle(_storeMsg);
client.sendPacket(new PrivateStoreMsgBuy(player));
player.sendPacket(new PrivateStoreMsgBuy(player));
}
}

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
View File

@@ -55,6 +55,6 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket
}
player.getSellList().setTitle(_storeMsg);
client.sendPacket(new PrivateStoreMsgSell(player));
player.sendPacket(new PrivateStoreMsgSell(player));
}
}

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
View File

@@ -55,6 +55,6 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket
}
player.getSellList().setTitle(_msg);
client.sendPacket(new ExPrivateStoreSetWholeMsg(player));
player.sendPacket(new ExPrivateStoreSetWholeMsg(player));
}
}

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
View File

@@ -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;
}

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
View File

@@ -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;
}