Removal of GameClient sendActionFailed method.

This commit is contained in:
MobiusDevelopment
2021-12-13 14:02:44 +00:00
parent 3981ca96e7
commit 49a6897d1d
39 changed files with 66 additions and 188 deletions

View File

@@ -46,7 +46,6 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
@@ -659,11 +658,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
return _trace; return _trace;
} }
public void sendActionFailed()
{
sendPacket(ActionFailed.STATIC_PACKET);
}
public ICrypt getCrypt() public ICrypt getCrypt()
{ {
return _crypt; return _crypt;

View File

@@ -46,7 +46,6 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
@@ -659,11 +658,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
return _trace; return _trace;
} }
public void sendActionFailed()
{
sendPacket(ActionFailed.STATIC_PACKET);
}
public ICrypt getCrypt() public ICrypt getCrypt()
{ {
return _crypt; return _crypt;

View File

@@ -46,7 +46,6 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
@@ -659,11 +658,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
return _trace; return _trace;
} }
public void sendActionFailed()
{
sendPacket(ActionFailed.STATIC_PACKET);
}
public ICrypt getCrypt() public ICrypt getCrypt()
{ {
return _crypt; return _crypt;

View File

@@ -46,7 +46,6 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
@@ -659,11 +658,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
return _trace; return _trace;
} }
public void sendActionFailed()
{
sendPacket(ActionFailed.STATIC_PACKET);
}
public ICrypt getCrypt() public ICrypt getCrypt()
{ {
return _crypt; return _crypt;

View File

@@ -46,7 +46,6 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
@@ -659,11 +658,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
return _trace; return _trace;
} }
public void sendActionFailed()
{
sendPacket(ActionFailed.STATIC_PACKET);
}
public ICrypt getCrypt() public ICrypt getCrypt()
{ {
return _crypt; return _crypt;

View File

@@ -46,7 +46,6 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
@@ -659,11 +658,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
return _trace; return _trace;
} }
public void sendActionFailed()
{
sendPacket(ActionFailed.STATIC_PACKET);
}
public ICrypt getCrypt() public ICrypt getCrypt()
{ {
return _crypt; return _crypt;

View File

@@ -46,7 +46,6 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
@@ -659,11 +658,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
return _trace; return _trace;
} }
public void sendActionFailed()
{
sendPacket(ActionFailed.STATIC_PACKET);
}
public ICrypt getCrypt() public ICrypt getCrypt()
{ {
return _crypt; return _crypt;

View File

@@ -46,7 +46,6 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
@@ -659,11 +658,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
return _trace; return _trace;
} }
public void sendActionFailed()
{
sendPacket(ActionFailed.STATIC_PACKET);
}
public ICrypt getCrypt() public ICrypt getCrypt()
{ {
return _crypt; return _crypt;

View File

@@ -46,7 +46,6 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
@@ -659,11 +658,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
return _trace; return _trace;
} }
public void sendActionFailed()
{
sendPacket(ActionFailed.STATIC_PACKET);
}
public ICrypt getCrypt() public ICrypt getCrypt()
{ {
return _crypt; return _crypt;

View File

@@ -46,7 +46,6 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
@@ -659,11 +658,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
return _trace; return _trace;
} }
public void sendActionFailed()
{
sendPacket(ActionFailed.STATIC_PACKET);
}
public ICrypt getCrypt() public ICrypt getCrypt()
{ {
return _crypt; return _crypt;

View File

@@ -46,7 +46,6 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
@@ -659,11 +658,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
return _trace; return _trace;
} }
public void sendActionFailed()
{
sendPacket(ActionFailed.STATIC_PACKET);
}
public ICrypt getCrypt() public ICrypt getCrypt()
{ {
return _crypt; return _crypt;

View File

@@ -42,7 +42,6 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder;
import org.l2jmobius.gameserver.network.serverpackets.AbstractNpcInfo.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.AbstractNpcInfo.NpcInfo;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
@@ -660,11 +659,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
return _trace; return _trace;
} }
public void sendActionFailed()
{
sendPacket(ActionFailed.STATIC_PACKET);
}
public ICrypt getCrypt() public ICrypt getCrypt()
{ {
return _crypt; return _crypt;

View File

@@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.util.Util; import org.l2jmobius.gameserver.util.Util;
@@ -89,28 +90,28 @@ public class RequestBuySeed implements IClientIncomingPacket
} }
else if (_items == null) else if (_items == null)
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
final CastleManorManager manor = CastleManorManager.getInstance(); final CastleManorManager manor = CastleManorManager.getInstance();
if (manor.isUnderMaintenance()) if (manor.isUnderMaintenance())
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
final Castle castle = CastleManager.getInstance().getCastleById(_manorId); final Castle castle = CastleManager.getInstance().getCastleById(_manorId);
if (castle == null) if (castle == null)
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
final Npc manager = player.getLastFolkNPC(); final Npc manager = player.getLastFolkNPC();
if (!(manager instanceof Merchant) || !manager.canInteract(player) || (manager.getTemplate().getParameters().getInt("manor_id", -1) != _manorId)) if (!(manager instanceof Merchant) || !manager.canInteract(player) || (manager.getTemplate().getParameters().getInt("manor_id", -1) != _manorId))
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
@@ -124,7 +125,7 @@ public class RequestBuySeed implements IClientIncomingPacket
final SeedProduction sp = manor.getSeedProduct(_manorId, ih.getId(), false); 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())) if ((sp == null) || (sp.getPrice() <= 0) || (sp.getAmount() < ih.getCount()) || ((MAX_ADENA / ih.getCount()) < sp.getPrice()))
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
@@ -133,7 +134,7 @@ public class RequestBuySeed implements IClientIncomingPacket
if (totalPrice > MAX_ADENA) 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); 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.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }

View File

@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.item.Henna;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.util.Util; import org.l2jmobius.gameserver.util.Util;
@@ -59,7 +60,7 @@ public class RequestHennaEquip implements IClientIncomingPacket
if (player.getHennaEmptySlots() == 0) if (player.getHennaEmptySlots() == 0)
{ {
player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL);
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
@@ -67,12 +68,12 @@ public class RequestHennaEquip implements IClientIncomingPacket
if (henna == null) if (henna == null)
{ {
PacketLogger.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); PacketLogger.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + player);
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
final long _count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1); final long count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1);
if (henna.isAllowedClass(player.getClassId()) && (_count >= henna.getWearCount()) && (player.getAdena() >= henna.getWearFee()) && player.addHenna(henna)) if (henna.isAllowedClass(player.getClassId()) && (count >= henna.getWearCount()) && (player.getAdena() >= henna.getWearFee()) && player.addHenna(henna))
{ {
player.destroyItemByItemId("Henna", henna.getDyeItemId(), henna.getWearCount(), player, true); player.destroyItemByItemId("Henna", henna.getDyeItemId(), henna.getWearCount(), player, true);
player.getInventory().reduceAdena("Henna", henna.getWearFee(), player, player.getLastFolkNPC()); player.getInventory().reduceAdena("Henna", henna.getWearFee(), player, player.getLastFolkNPC());
@@ -88,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); Util.handleIllegalPlayerAction(player, "Exploit attempt: Character " + player.getName() + " of account " + player.getAccountName() + " tryed to add a forbidden henna.", Config.DEFAULT_PUNISH);
} }
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
} }
} }
} }

View File

@@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.item.Henna;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo;
/** /**
@@ -54,7 +55,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket
{ {
PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player);
} }
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
player.sendPacket(new HennaItemDrawInfo(henna, player)); player.sendPacket(new HennaItemDrawInfo(henna, player));

View File

@@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.item.Henna;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo;
/** /**
@@ -51,7 +52,7 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket
if (henna == null) if (henna == null)
{ {
PacketLogger.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); PacketLogger.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + player);
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
player.sendPacket(new HennaItemRemoveInfo(henna, player)); player.sendPacket(new HennaItemRemoveInfo(henna, player));

View File

@@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.item.Henna;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
/** /**
* @author Zoey76 * @author Zoey76
@@ -48,7 +49,7 @@ public class RequestHennaRemove implements IClientIncomingPacket
if (!client.getFloodProtectors().canPerformTransaction()) if (!client.getFloodProtectors().canPerformTransaction())
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
@@ -66,7 +67,7 @@ public class RequestHennaRemove implements IClientIncomingPacket
else else
{ {
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA); player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
} }
found = true; found = true;
break; break;
@@ -76,7 +77,7 @@ public class RequestHennaRemove implements IClientIncomingPacket
if (!found) if (!found)
{ {
PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna.");
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
} }
} }
} }

View File

@@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/** /**
@@ -86,21 +87,21 @@ public class RequestProcureCropList implements IClientIncomingPacket
final CastleManorManager manor = CastleManorManager.getInstance(); final CastleManorManager manor = CastleManorManager.getInstance();
if (manor.isUnderMaintenance()) if (manor.isUnderMaintenance())
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
final Npc manager = player.getLastFolkNPC(); final Npc manager = player.getLastFolkNPC();
if (!(manager instanceof Merchant) || !manager.canInteract(player)) if (!(manager instanceof Merchant) || !manager.canInteract(player))
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
final int castleId = manager.getCastle().getResidenceId(); final int castleId = manager.getCastle().getResidenceId();
if (manager.getTemplate().getParameters().getInt("manor_id", -1) != castleId) if (manager.getTemplate().getParameters().getInt("manor_id", -1) != castleId)
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
@@ -111,14 +112,14 @@ public class RequestProcureCropList implements IClientIncomingPacket
final Item item = player.getInventory().getItemByObjectId(i.getObjectId()); final Item item = player.getInventory().getItemByObjectId(i.getObjectId());
if ((item == null) || (item.getCount() < i.getCount()) || (item.getId() != i.getId())) if ((item == null) || (item.getCount() < i.getCount()) || (item.getId() != i.getId()))
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
final CropProcure cp = i.getCropProcure(); final CropProcure cp = i.getCropProcure();
if ((cp == null) || (cp.getAmount() < i.getCount())) if ((cp == null) || (cp.getAmount() < i.getCount()))
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }

View File

@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.Seed;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.clan.ClanPrivilege;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
/** /**
* @author l3x * @author l3x
@@ -80,7 +81,7 @@ public class RequestSetCrop implements IClientIncomingPacket
final CastleManorManager manor = CastleManorManager.getInstance(); final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod()) if (!manor.isModifiablePeriod())
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
@@ -88,7 +89,7 @@ public class RequestSetCrop implements IClientIncomingPacket
final Player player = client.getPlayer(); 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 == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }

View File

@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.SeedProduction;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.clan.ClanPrivilege;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
/** /**
* @author l3x * @author l3x
@@ -79,7 +80,7 @@ public class RequestSetSeed implements IClientIncomingPacket
final CastleManorManager manor = CastleManorManager.getInstance(); final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod()) if (!manor.isModifiablePeriod())
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
@@ -87,7 +88,7 @@ public class RequestSetSeed implements IClientIncomingPacket
final Player player = client.getPlayer(); 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 == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }

View File

@@ -43,7 +43,6 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder;
import org.l2jmobius.gameserver.network.serverpackets.AbstractNpcInfo.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.AbstractNpcInfo.NpcInfo;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
@@ -671,11 +670,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
return _trace; return _trace;
} }
public void sendActionFailed()
{
sendPacket(ActionFailed.STATIC_PACKET);
}
public ICrypt getCrypt() public ICrypt getCrypt()
{ {
return _crypt; return _crypt;

View File

@@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.util.Util; import org.l2jmobius.gameserver.util.Util;
@@ -89,28 +90,28 @@ public class RequestBuySeed implements IClientIncomingPacket
} }
else if (_items == null) else if (_items == null)
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
final CastleManorManager manor = CastleManorManager.getInstance(); final CastleManorManager manor = CastleManorManager.getInstance();
if (manor.isUnderMaintenance()) if (manor.isUnderMaintenance())
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
final Castle castle = CastleManager.getInstance().getCastleById(_manorId); final Castle castle = CastleManager.getInstance().getCastleById(_manorId);
if (castle == null) if (castle == null)
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
final Npc manager = player.getLastFolkNPC(); final Npc manager = player.getLastFolkNPC();
if (!(manager instanceof Merchant) || !manager.canInteract(player) || (manager.getTemplate().getParameters().getInt("manor_id", -1) != _manorId)) if (!(manager instanceof Merchant) || !manager.canInteract(player) || (manager.getTemplate().getParameters().getInt("manor_id", -1) != _manorId))
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
@@ -124,7 +125,7 @@ public class RequestBuySeed implements IClientIncomingPacket
final SeedProduction sp = manor.getSeedProduct(_manorId, ih.getId(), false); 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())) if ((sp == null) || (sp.getPrice() <= 0) || (sp.getAmount() < ih.getCount()) || ((MAX_ADENA / ih.getCount()) < sp.getPrice()))
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
@@ -133,7 +134,7 @@ public class RequestBuySeed implements IClientIncomingPacket
if (totalPrice > MAX_ADENA) 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); 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.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }

View File

@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.item.Henna;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.util.Util; import org.l2jmobius.gameserver.util.Util;
@@ -59,7 +60,7 @@ public class RequestHennaEquip implements IClientIncomingPacket
if (player.getHennaEmptySlots() == 0) if (player.getHennaEmptySlots() == 0)
{ {
player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL); player.sendPacket(SystemMessageId.NO_SLOT_EXISTS_TO_DRAW_THE_SYMBOL);
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
@@ -67,12 +68,12 @@ public class RequestHennaEquip implements IClientIncomingPacket
if (henna == null) if (henna == null)
{ {
PacketLogger.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); PacketLogger.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + player);
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
final long _count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1); final long count = player.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1);
if (henna.isAllowedClass(player.getClassId()) && (_count >= henna.getWearCount()) && (player.getAdena() >= henna.getWearFee()) && player.addHenna(henna)) if (henna.isAllowedClass(player.getClassId()) && (count >= henna.getWearCount()) && (player.getAdena() >= henna.getWearFee()) && player.addHenna(henna))
{ {
player.destroyItemByItemId("Henna", henna.getDyeItemId(), henna.getWearCount(), player, true); player.destroyItemByItemId("Henna", henna.getDyeItemId(), henna.getWearCount(), player, true);
player.getInventory().reduceAdena("Henna", henna.getWearFee(), player, player.getLastFolkNPC()); player.getInventory().reduceAdena("Henna", henna.getWearFee(), player, player.getLastFolkNPC());
@@ -88,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); Util.handleIllegalPlayerAction(player, "Exploit attempt: Character " + player.getName() + " of account " + player.getAccountName() + " tryed to add a forbidden henna.", Config.DEFAULT_PUNISH);
} }
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
} }
} }
} }

View File

@@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.item.Henna;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo;
/** /**
@@ -54,7 +55,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket
{ {
PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player);
} }
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
player.sendPacket(new HennaItemDrawInfo(henna, player)); player.sendPacket(new HennaItemDrawInfo(henna, player));

View File

@@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.item.Henna;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo;
/** /**
@@ -51,7 +52,7 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket
if (henna == null) if (henna == null)
{ {
PacketLogger.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); PacketLogger.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + player);
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
player.sendPacket(new HennaItemRemoveInfo(henna, player)); player.sendPacket(new HennaItemRemoveInfo(henna, player));

View File

@@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.item.Henna;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
/** /**
* @author Zoey76 * @author Zoey76
@@ -48,7 +49,7 @@ public class RequestHennaRemove implements IClientIncomingPacket
if (!client.getFloodProtectors().canPerformTransaction()) if (!client.getFloodProtectors().canPerformTransaction())
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
@@ -66,7 +67,7 @@ public class RequestHennaRemove implements IClientIncomingPacket
else else
{ {
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA); player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA);
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
} }
found = true; found = true;
break; break;
@@ -76,7 +77,7 @@ public class RequestHennaRemove implements IClientIncomingPacket
if (!found) if (!found)
{ {
PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna.");
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
} }
} }
} }

View File

@@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/** /**
@@ -86,21 +87,21 @@ public class RequestProcureCropList implements IClientIncomingPacket
final CastleManorManager manor = CastleManorManager.getInstance(); final CastleManorManager manor = CastleManorManager.getInstance();
if (manor.isUnderMaintenance()) if (manor.isUnderMaintenance())
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
final Npc manager = player.getLastFolkNPC(); final Npc manager = player.getLastFolkNPC();
if (!(manager instanceof Merchant) || !manager.canInteract(player)) if (!(manager instanceof Merchant) || !manager.canInteract(player))
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
final int castleId = manager.getCastle().getResidenceId(); final int castleId = manager.getCastle().getResidenceId();
if (manager.getTemplate().getParameters().getInt("manor_id", -1) != castleId) if (manager.getTemplate().getParameters().getInt("manor_id", -1) != castleId)
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
@@ -111,14 +112,14 @@ public class RequestProcureCropList implements IClientIncomingPacket
final Item item = player.getInventory().getItemByObjectId(i.getObjectId()); final Item item = player.getInventory().getItemByObjectId(i.getObjectId());
if ((item == null) || (item.getCount() < i.getCount()) || (item.getId() != i.getId())) if ((item == null) || (item.getCount() < i.getCount()) || (item.getId() != i.getId()))
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
final CropProcure cp = i.getCropProcure(); final CropProcure cp = i.getCropProcure();
if ((cp == null) || (cp.getAmount() < i.getCount())) if ((cp == null) || (cp.getAmount() < i.getCount()))
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }

View File

@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.Seed;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.clan.ClanPrivilege;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
/** /**
* @author l3x * @author l3x
@@ -80,7 +81,7 @@ public class RequestSetCrop implements IClientIncomingPacket
final CastleManorManager manor = CastleManorManager.getInstance(); final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod()) if (!manor.isModifiablePeriod())
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
@@ -88,7 +89,7 @@ public class RequestSetCrop implements IClientIncomingPacket
final Player player = client.getPlayer(); 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 == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }

View File

@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.SeedProduction;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.clan.ClanPrivilege;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
/** /**
* @author l3x * @author l3x
@@ -79,7 +80,7 @@ public class RequestSetSeed implements IClientIncomingPacket
final CastleManorManager manor = CastleManorManager.getInstance(); final CastleManorManager manor = CastleManorManager.getInstance();
if (!manor.isModifiablePeriod()) if (!manor.isModifiablePeriod())
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
@@ -87,7 +88,7 @@ public class RequestSetSeed implements IClientIncomingPacket
final Player player = client.getPlayer(); 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 == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player))
{ {
client.sendActionFailed(); client.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }

View File

@@ -46,7 +46,6 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
@@ -659,11 +658,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
return _trace; return _trace;
} }
public void sendActionFailed()
{
sendPacket(ActionFailed.STATIC_PACKET);
}
public ICrypt getCrypt() public ICrypt getCrypt()
{ {
return _crypt; return _crypt;

View File

@@ -46,7 +46,6 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
@@ -659,11 +658,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
return _trace; return _trace;
} }
public void sendActionFailed()
{
sendPacket(ActionFailed.STATIC_PACKET);
}
public ICrypt getCrypt() public ICrypt getCrypt()
{ {
return _crypt; return _crypt;

View File

@@ -46,7 +46,6 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
@@ -659,11 +658,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
return _trace; return _trace;
} }
public void sendActionFailed()
{
sendPacket(ActionFailed.STATIC_PACKET);
}
public ICrypt getCrypt() public ICrypt getCrypt()
{ {
return _crypt; return _crypt;

View File

@@ -46,7 +46,6 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
@@ -659,11 +658,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
return _trace; return _trace;
} }
public void sendActionFailed()
{
sendPacket(ActionFailed.STATIC_PACKET);
}
public ICrypt getCrypt() public ICrypt getCrypt()
{ {
return _crypt; return _crypt;

View File

@@ -46,7 +46,6 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
@@ -659,11 +658,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
return _trace; return _trace;
} }
public void sendActionFailed()
{
sendPacket(ActionFailed.STATIC_PACKET);
}
public ICrypt getCrypt() public ICrypt getCrypt()
{ {
return _crypt; return _crypt;

View File

@@ -46,7 +46,6 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
@@ -659,11 +658,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
return _trace; return _trace;
} }
public void sendActionFailed()
{
sendPacket(ActionFailed.STATIC_PACKET);
}
public ICrypt getCrypt() public ICrypt getCrypt()
{ {
return _crypt; return _crypt;

View File

@@ -46,7 +46,6 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
@@ -653,11 +652,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
return _trace; return _trace;
} }
public void sendActionFailed()
{
sendPacket(ActionFailed.STATIC_PACKET);
}
public ICrypt getCrypt() public ICrypt getCrypt()
{ {
return _crypt; return _crypt;

View File

@@ -46,7 +46,6 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
@@ -659,11 +658,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
return _trace; return _trace;
} }
public void sendActionFailed()
{
sendPacket(ActionFailed.STATIC_PACKET);
}
public ICrypt getCrypt() public ICrypt getCrypt()
{ {
return _crypt; return _crypt;

View File

@@ -46,7 +46,6 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
@@ -659,11 +658,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
return _trace; return _trace;
} }
public void sendActionFailed()
{
sendPacket(ActionFailed.STATIC_PACKET);
}
public ICrypt getCrypt() public ICrypt getCrypt()
{ {
return _crypt; return _crypt;

View File

@@ -46,7 +46,6 @@ import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
@@ -659,11 +658,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
return _trace; return _trace;
} }
public void sendActionFailed()
{
sendPacket(ActionFailed.STATIC_PACKET);
}
public ICrypt getCrypt() public ICrypt getCrypt()
{ {
return _crypt; return _crypt;