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

10
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Action.java
View File

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

11
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java
View File

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

9
L2J_Mobius_C6_Interlude/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_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.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.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));
}
}

10
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
View File

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

9
L2J_Mobius_C6_Interlude/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_C6_Interlude/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_C6_Interlude/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;
@@ -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));
}
}

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
View File

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

11
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.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.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));
}
}
}

11
L2J_Mobius_C6_Interlude/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.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));
}
}
}