Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/network/serverpackets/ActionFailed.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/network/serverpackets/ActionFailed.java (revision 173)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/network/serverpackets/ActionFailed.java (revision 230)
- @@ -19,13 +19,13 @@
- package net.ins.gameserver.network.serverpackets;
- -/**
- - * This class ...
- - *
- - * @version $Revision: 1.3.2.1.2.3 $ $Date: 2005/03/27 15:29:39 $
- - */
- public final class ActionFailed extends L2GameServerPacket
- {
- private static final String _S__35_ACTIONFAILED = "[S] 25 ActionFailed";
- + public static final ActionFailed STATIC_PACKET = new ActionFailed();
- + public ActionFailed()
- + {
- + }
- +
- @Override
- protected void writeImpl()
- @@ -34,8 +34,4 @@
- }
- - /*
- - * (non-Javadoc)
- - * @see net.ins.gameserver.network.serverpackets.ServerBasePacket#getType()
- - */
- @Override
- public String getType()
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/network/clientpackets/ChangeWaitType2.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/network/clientpackets/ChangeWaitType2.java (revision 173)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/network/clientpackets/ChangeWaitType2.java (revision 230)
- @@ -51,5 +51,5 @@
- if (player.isOutOfControl())
- {
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/network/clientpackets/CharacterSelected.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/network/clientpackets/CharacterSelected.java (revision 173)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/network/clientpackets/CharacterSelected.java (revision 230)
- @@ -86,5 +86,5 @@
- {
- _log.severe("Character could not be loaded (slot:" + _charSlot + ")");
- - sendPacket(new ActionFailed());
- + sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/network/clientpackets/Action.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/network/clientpackets/Action.java (revision 213)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/network/clientpackets/Action.java (revision 230)
- @@ -72,5 +72,5 @@
- // pressing e.g. pickup many times quickly would get you here
- // _log.warning("Character: " + activeChar.getName() + " request action with non existent ObjectID:" + _objectId);
- - getClient().sendPacket(new ActionFailed());
- + getClient().sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
- @@ -92,5 +92,5 @@
- // Ivalid action detected (probably client cheating), log this
- _log.warning("Character: " + activeChar.getName() + " requested invalid action: " + _actionId);
- - getClient().sendPacket(new ActionFailed());
- + getClient().sendPacket(ActionFailed.STATIC_PACKET);
- break;
- }
- @@ -98,5 +98,5 @@
- else
- // Actions prohibited when in trade
- - getClient().sendPacket(new ActionFailed());
- + getClient().sendPacket(ActionFailed.STATIC_PACKET);
- }
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/network/clientpackets/AnswerTradeRequest.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/network/clientpackets/AnswerTradeRequest.java (revision 173)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/network/clientpackets/AnswerTradeRequest.java (revision 230)
- @@ -53,10 +53,10 @@
- {
- player.sendMessage("Transactions are disable for your Access Level");
- - sendPacket(new ActionFailed());
- + sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
- if (player.getActiveEnchantItem() != null)
- {
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- player.sendMessage("You cannot Trade While Enchanting!");
- return;
- @@ -72,5 +72,5 @@
- player.setAllowTrade(true);
- partner.setAllowTrade(true);
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
- @@ -87,5 +87,5 @@
- partner.sendPacket(msg);
- player.setAllowTrade(true);
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- // Clears requesting status
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/network/clientpackets/AttackRequest.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/network/clientpackets/AttackRequest.java (revision 173)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/network/clientpackets/AttackRequest.java (revision 230)
- @@ -81,5 +81,5 @@
- else
- {
- - sendPacket(new ActionFailed());
- + sendPacket(ActionFailed.STATIC_PACKET);
- }
- }
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/status/CharStatus.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/status/CharStatus.java (revision 208)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/status/CharStatus.java (revision 230)
- @@ -175,5 +175,5 @@
- stopHpMpRegeneration();
- attacker.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
- - attacker.sendPacket(new ActionFailed());
- + attacker.sendPacket(ActionFailed.STATIC_PACKET);
- // let the DuelManager know of his defeat
- DuelManager.getInstance().onPlayerDefeat((L2PcInstance) getActiveChar());
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2ClassMasterInstance.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2ClassMasterInstance.java (revision 226)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2ClassMasterInstance.java (revision 230)
- @@ -150,5 +150,5 @@
- }
- }
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2CastleTeleporterInstance.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2CastleTeleporterInstance.java (revision 223)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2CastleTeleporterInstance.java (revision 230)
- @@ -145,5 +145,5 @@
- _log.warning("No teleport destination with id:" + val);
- }
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2BoxInstance.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2BoxInstance.java (revision 223)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2BoxInstance.java (revision 230)
- @@ -300,5 +300,5 @@
- html.setHtml(content);
- player.sendPacket(html);
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- @@ -348,5 +348,5 @@
- html.setHtml(content);
- player.sendPacket(html);
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2ArtefactInstance.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2ArtefactInstance.java (revision 223)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2ArtefactInstance.java (revision 230)
- @@ -109,5 +109,5 @@
- }
- // Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2FestivalGuideInstance.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2FestivalGuideInstance.java (revision 223)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2FestivalGuideInstance.java (revision 230)
- @@ -395,5 +395,5 @@
- player.sendPacket(html);
- // Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2CastleWarehouseInstance.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2CastleWarehouseInstance.java (revision 223)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2CastleWarehouseInstance.java (revision 230)
- @@ -29,5 +29,5 @@
- private void showRetrieveWindow(L2PcInstance player)
- {
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- player.setActiveWarehouse(player.getWarehouse());
- if (player.getActiveWarehouse().getSize() == 0)
- @@ -41,5 +41,5 @@
- private void showDepositWindow(L2PcInstance player)
- {
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- player.setActiveWarehouse(player.getWarehouse());
- player.tempInvetoryDisable();
- @@ -49,5 +49,5 @@
- private void showDepositWindowClan(L2PcInstance player)
- {
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- if (player.getClan() != null)
- {
- @@ -72,5 +72,5 @@
- private void showWithdrawWindowClan(L2PcInstance player)
- {
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- if ((player.getClanPrivileges() & L2Clan.CP_CL_VIEW_WAREHOUSE) != L2Clan.CP_CL_VIEW_WAREHOUSE)
- {
- @@ -131,5 +131,5 @@
- public void showChatWindow(L2PcInstance player, int val)
- {
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- String filename = "data/html/castlewarehouse/castlewarehouse-no.htm";
- int condition = validateCondition(player);
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2AuctioneerInstance.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2AuctioneerInstance.java (revision 223)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2AuctioneerInstance.java (revision 230)
- @@ -83,5 +83,5 @@
- }
- // Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2CastleDoormenInstance.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2CastleDoormenInstance.java (revision 223)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2CastleDoormenInstance.java (revision 230)
- @@ -130,10 +130,10 @@
- }
- // Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- public void showMessageWindow(L2PcInstance player)
- {
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- String filename = "data/html/doormen/" + getTemplate().npcId + "-no.htm";
- int condition = validateCondition(player);
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2DoorInstance.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2DoorInstance.java (revision 226)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2DoorInstance.java (revision 230)
- @@ -433,5 +433,5 @@
- }
- // Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- @@ -476,5 +476,5 @@
- // ATTACK the mob without moving?
- }
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2ManorManagerInstance.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2ManorManagerInstance.java (revision 226)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2ManorManagerInstance.java (revision 230)
- @@ -105,5 +105,5 @@
- }
- // Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- @@ -124,5 +124,5 @@
- _log.info("buylist id:" + val);
- }
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- @@ -139,5 +139,5 @@
- if (CastleManorManager.getInstance().isUnderMaintenance())
- {
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- player.sendPacket(new SystemMessage(SystemMessageId.THE_MANOR_SYSTEM_IS_CURRENTLY_UNDER_MAINTENANCE));
- return;
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2ClanHallManagerInstance.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2ClanHallManagerInstance.java (revision 223)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2ClanHallManagerInstance.java (revision 230)
- @@ -721,5 +721,5 @@
- }
- // Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- @@ -734,5 +734,5 @@
- private void showMessageWindow(L2PcInstance player)
- {
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- String filename = "data/html/clanHallManager/chamberlain-no.htm";
- int condition = validateCondition(player);
- @@ -779,5 +779,5 @@
- private void showVaultWindowDeposit(L2PcInstance player)
- {
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- player.setActiveWarehouse(player.getClan().getWarehouse());
- player.sendPacket(new WareHouseDepositList(player, WareHouseDepositList.CLAN)); // Or Clan Hall??
- @@ -786,5 +786,5 @@
- private void showVaultWindowWithdraw(L2PcInstance player)
- {
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- player.setActiveWarehouse(player.getClan().getWarehouse());
- player.sendPacket(new WareHouseWithdrawalList(player, WareHouseWithdrawalList.CLAN)); // Or Clan Hall ??
- @@ -815,5 +815,5 @@
- _log.warning("No teleport destination with id:" + val);
- }
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- @@ -837,5 +837,5 @@
- _log.warning("buylist id:" + val);
- }
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2FishermanInstance.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2FishermanInstance.java (revision 223)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2FishermanInstance.java (revision 230)
- @@ -79,5 +79,5 @@
- _log.warning("buylist id:" + val);
- }
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- @@ -157,5 +157,5 @@
- player.sendPacket(asl);
- }
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- }
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2CastleBlacksmithInstance.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2CastleBlacksmithInstance.java (revision 223)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2CastleBlacksmithInstance.java (revision 230)
- @@ -64,5 +64,5 @@
- }
- // Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2ControlTowerInstance.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2ControlTowerInstance.java (revision 223)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2ControlTowerInstance.java (revision 230)
- @@ -90,5 +90,5 @@
- player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, this);
- // Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- }
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2CabaleBufferInstance.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2CabaleBufferInstance.java (revision 223)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2CabaleBufferInstance.java (revision 230)
- @@ -76,5 +76,5 @@
- }
- // Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2CastleChamberlainInstance.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2CastleChamberlainInstance.java (revision 226)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2CastleChamberlainInstance.java (revision 230)
- @@ -97,5 +97,5 @@
- }
- // Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- @@ -290,5 +290,5 @@
- _log.warning("buylist id:" + buy);
- }
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- else if (actualCommand.equalsIgnoreCase("manage_siege_defender"))
- @@ -392,5 +392,5 @@
- if (CastleManorManager.getInstance().isUnderMaintenance())
- {
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- player.sendPacket(new SystemMessage(SystemMessageId.THE_MANOR_SYSTEM_IS_CURRENTLY_UNDER_MAINTENANCE));
- return;
- @@ -502,5 +502,5 @@
- private void showMessageWindow(L2PcInstance player)
- {
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- String filename = "data/html/chamberlain/chamberlain-no.htm";
- int condition = validateCondition(player);
- @@ -520,8 +520,4 @@
- }
- - /*
- - * private void showVaultWindowDeposit(L2PcInstance player) { player.sendPacket(new ActionFailed()); player.setActiveWarehouse(player.getClan().getWarehouse()); player.sendPacket(new WareHouseDepositList(player, WareHouseDepositList.CLAN)); //Or Castle ?? } private void showVaultWindowWithdraw(L2PcInstance player) { player.sendPacket(new ActionFailed());
- - * player.setActiveWarehouse(player.getClan().getWarehouse()); player.sendPacket(new WareHouseWithdrawalList(player, WareHouseWithdrawalList.CLAN)); //Or Castle ?? }
- - */
- protected int validateCondition(L2PcInstance player)
- {
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2MerchantInstance.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2MerchantInstance.java (revision 223)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2MerchantInstance.java (revision 230)
- @@ -78,5 +78,5 @@
- {
- _log.warning("no buylist with id:" + val);
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- }
- @@ -101,5 +101,5 @@
- _log.warning("buylist id:" + val);
- }
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- @@ -111,5 +111,5 @@
- if (Config.DEBUG)
- _log.fine("Showing sell window");
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- @@ -271,5 +271,5 @@
- player.sendPacket(html);
- }
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- }
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2ClanHallDoormenInstance.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2ClanHallDoormenInstance.java (revision 223)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2ClanHallDoormenInstance.java (revision 230)
- @@ -231,10 +231,10 @@
- }
- // Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- public void showMessageWindow(L2PcInstance player)
- {
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- String filename = "data/html/doormen/" + getTemplate().npcId + "-no.htm";
- int condition = validateCondition(player);
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2DoormenInstance.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2DoormenInstance.java (revision 223)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/instance/L2DoormenInstance.java (revision 230)
- @@ -163,10 +163,10 @@
- }
- // Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- public void showMessageWindow(L2PcInstance player)
- {
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- String filename = "data/html/doormen/" + getTemplate().npcId + "-no.htm";
- int condition = validateCondition(player);
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/L2Character.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/L2Character.java (revision 226)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/L2Character.java (revision 230)
- @@ -562,5 +562,5 @@
- // If L2PcInstance is dead or the target is dead, the action is stoped
- getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
- - sendPacket(new ActionFailed());
- + sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
- @@ -572,5 +572,5 @@
- {
- sendPacket(new SystemMessage(SystemMessageId.OBSERVERS_CANNOT_PARTICIPATE));
- - sendPacket(new ActionFailed());
- + sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
- @@ -580,5 +580,5 @@
- {
- ((L2PcInstance) this).sendMessage("Can't attack a cursed player when under level 21.");
- - sendPacket(new ActionFailed());
- + sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
- @@ -586,5 +586,5 @@
- {
- ((L2PcInstance) this).sendMessage("Can't attack a newbie player using a cursed weapon.");
- - sendPacket(new ActionFailed());
- + sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
- @@ -600,6 +600,5 @@
- ((L2PcInstance) this).sendPacket(new SystemMessage(SystemMessageId.CANNOT_ATTACK_WITH_FISHING_POLE));
- getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
- - ActionFailed af = new ActionFailed();
- - sendPacket(af);
- + sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
- @@ -609,5 +608,5 @@
- sendPacket(new SystemMessage(SystemMessageId.CANT_SEE_TARGET));
- getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
- - sendPacket(new ActionFailed());
- + sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
- @@ -623,5 +622,5 @@
- {
- getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
- - sendPacket(new ActionFailed());
- + sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
- @@ -637,5 +636,5 @@
- ThreadPoolManager.getInstance().scheduleAi(new NotifyAITask(CtrlEvent.EVT_READY_TO_ACT), 1000);
- sendPacket(new SystemMessage(SystemMessageId.NOT_ENOUGH_MP));
- - sendPacket(new ActionFailed());
- + sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
- @@ -649,5 +648,5 @@
- // Cancel the action because the bow can't be re-use at this moment
- ThreadPoolManager.getInstance().scheduleAi(new NotifyAITask(CtrlEvent.EVT_READY_TO_ACT), 1000);
- - sendPacket(new ActionFailed());
- + sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
- @@ -657,5 +656,5 @@
- // Cancel the action because the L2PcInstance have no arrow
- getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
- - sendPacket(new ActionFailed());
- + sendPacket(ActionFailed.STATIC_PACKET);
- sendPacket(new SystemMessage(SystemMessageId.NOT_ENOUGH_ARROWS));
- return;
- @@ -3606,5 +3605,5 @@
- {
- _attacking = 0;
- - sendPacket(new ActionFailed());
- + sendPacket(ActionFailed.STATIC_PACKET);
- }
- }
- @@ -3640,5 +3639,5 @@
- getAI().notifyEvent(CtrlEvent.EVT_FINISH_CASTING); // setting back previous intention
- broadcastPacket(new MagicSkillCanceld(getObjectId())); // broadcast packet to stop animations client-side
- - sendPacket(new ActionFailed()); // send an "action failed" packet to the caster
- + sendPacket(ActionFailed.STATIC_PACKET); // send an "action failed" packet to the caster
- }
- }
- @@ -3795,6 +3794,6 @@
- }
- /*
- - * if (isAttackingNow() && getAI().getAttackTarget() == _target) { abortAttack(); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); if (this instanceof L2PcInstance) { sendPacket(new ActionFailed()); SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); sm.addString("Attack is aborted"); sendPacket(sm); } } if (isCastingNow() && canAbortCast() && getAI().getCastTarget()
- - * == _target) { abortCast(); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); if (this instanceof L2PcInstance) { sendPacket(new ActionFailed()); SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); sm.addString("Casting is aborted"); sendPacket(sm); } }
- + * if (isAttackingNow() && getAI().getAttackTarget() == _target) { abortAttack(); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); if (this instanceof L2PcInstance) { sendPacket(ActionFailed.STATIC_PACKET); SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); sm.addString("Attack is aborted"); sendPacket(sm); } } if (isCastingNow() && canAbortCast() && getAI().getCastTarget()
- + * == _target) { abortCast(); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); if (this instanceof L2PcInstance) { sendPacket(ActionFailed.STATIC_PACKET); SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); sm.addString("Casting is aborted"); sendPacket(sm); } }
- */
- }
- @@ -4560,5 +4559,5 @@
- // getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, null);
- getAI().notifyEvent(CtrlEvent.EVT_CANCEL);
- - sendPacket(new ActionFailed());
- + sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
- @@ -4702,5 +4701,5 @@
- {
- // TODO Remove sendPacket because it's always done in abortAttack
- - sendPacket(new ActionFailed());
- + sendPacket(ActionFailed.STATIC_PACKET);
- // Send a system message
- sendPacket(new SystemMessage(SystemMessageId.ATTACK_FAILED));
- @@ -4760,5 +4759,5 @@
- // If L2Character or target is in a peace zone, send a system message TARGET_IN_PEACEZONE a Server->Client packet ActionFailed
- player.sendPacket(new SystemMessage(SystemMessageId.TARGET_IN_PEACEZONE));
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- else if (player.isInOlympiadMode() && player.getTarget() != null)
- @@ -4772,5 +4771,5 @@
- {
- // if L2PcInstance is in Olympia and the match isn't already start, send a Server->Client packet ActionFailed
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- }
- @@ -4778,15 +4777,15 @@
- {
- // If target is not attackable, send a Server->Client packet ActionFailed
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- else if (player.isConfused())
- {
- // If target is confused, send a Server->Client packet ActionFailed
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- else if (this instanceof L2ArtefactInstance)
- {
- // If L2Character is a L2ArtefactInstance, send a Server->Client packet ActionFailed
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- else
- @@ -4796,5 +4795,5 @@
- {
- player.sendPacket(new SystemMessage(SystemMessageId.CANT_SEE_TARGET));
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/L2Npc.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/L2Npc.java (revision 226)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/actor/L2Npc.java (revision 230)
- @@ -543,5 +543,5 @@
- if (player.isOutOfControl())
- {
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- return false;
- }
- @@ -638,5 +638,5 @@
- {
- // Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- }
- @@ -671,5 +671,5 @@
- }
- else
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- }
- @@ -811,5 +811,5 @@
- }
- // Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- @@ -859,5 +859,5 @@
- if (isBusy() && getBusyMessage().length() > 0)
- {
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
- html.setFile("data/html/npcbusy.htm");
- @@ -1281,5 +1281,5 @@
- insertObjectIdAndShowChatWindow(player, content);
- // Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- @@ -1555,5 +1555,5 @@
- player.sendPacket(html);
- // Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- @@ -1666,5 +1666,5 @@
- pkDenyMsg.setHtml(html);
- player.sendPacket(pkDenyMsg);
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- return true;
- }
- @@ -2011,5 +2011,5 @@
- player.sendPacket(html);
- // Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- @@ -2033,5 +2033,5 @@
- player.sendPacket(html);
- // Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- }
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/entity/Duel.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/entity/Duel.java (revision 226)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/model/entity/Duel.java (revision 230)
- @@ -263,5 +263,4 @@
- private void stopFighting()
- {
- - ActionFailed af = new ActionFailed();
- if (_partyDuel)
- {
- @@ -271,5 +270,5 @@
- temp.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
- temp.setTarget(null);
- - temp.sendPacket(af);
- + temp.sendPacket(ActionFailed.STATIC_PACKET);
- }
- for (L2PcInstance temp : _playerB.getParty().getPartyMembers())
- @@ -278,5 +277,5 @@
- temp.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
- temp.setTarget(null);
- - temp.sendPacket(af);
- + temp.sendPacket(ActionFailed.STATIC_PACKET);
- }
- }
- @@ -289,6 +288,6 @@
- _playerB.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
- _playerB.setTarget(null);
- - _playerA.sendPacket(af);
- - _playerB.sendPacket(af);
- + _playerA.sendPacket(ActionFailed.STATIC_PACKET);
- + _playerB.sendPacket(ActionFailed.STATIC_PACKET);
- }
- }
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/handler/itemhandlers/EnergyStone.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/handler/itemhandlers/EnergyStone.java (revision 207)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/handler/itemhandlers/EnergyStone.java (revision 230)
- @@ -60,6 +60,5 @@
- if (activeChar.isAllSkillsDisabled())
- {
- - ActionFailed af = new ActionFailed();
- - activeChar.sendPacket(af);
- + activeChar.sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/handler/itemhandlers/ChestKey.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/handler/itemhandlers/ChestKey.java (revision 207)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/handler/itemhandlers/ChestKey.java (revision 230)
- @@ -48,5 +48,5 @@
- {
- activeChar.sendPacket(new SystemMessage(SystemMessageId.INCORRECT_TARGET));
- - activeChar.sendPacket(new ActionFailed());
- + activeChar.sendPacket(ActionFailed.STATIC_PACKET);
- }
- else
- @@ -56,5 +56,5 @@
- {
- activeChar.sendMessage("The chest Is empty.");
- - activeChar.sendPacket(new ActionFailed());
- + activeChar.sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/handler/itemhandlers/Book.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/handler/itemhandlers/Book.java (revision 207)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/handler/itemhandlers/Book.java (revision 230)
- @@ -59,5 +59,5 @@
- activeChar.sendPacket(itemReply);
- }
- - activeChar.sendPacket(new ActionFailed());
- + activeChar.sendPacket(ActionFailed.STATIC_PACKET);
- }
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/handler/itemhandlers/CharChangePotions.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/handler/itemhandlers/CharChangePotions.java (revision 226)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/handler/itemhandlers/CharChangePotions.java (revision 230)
- @@ -52,6 +52,5 @@
- if (activeChar.isAllSkillsDisabled())
- {
- - ActionFailed af = new ActionFailed();
- - activeChar.sendPacket(af);
- + activeChar.sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/handler/itemhandlers/Harvester.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/handler/itemhandlers/Harvester.java (revision 207)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/handler/itemhandlers/Harvester.java (revision 230)
- @@ -50,5 +50,5 @@
- {
- _activeChar.sendPacket(new SystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
- - _activeChar.sendPacket(new ActionFailed());
- + _activeChar.sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
- @@ -56,5 +56,5 @@
- if (_target == null || !_target.isDead())
- {
- - _activeChar.sendPacket(new ActionFailed());
- + _activeChar.sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/handler/skillhandlers/FishingSkill.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/handler/skillhandlers/FishingSkill.java (revision 226)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/handler/skillhandlers/FishingSkill.java (revision 230)
- @@ -55,5 +55,5 @@
- player.sendPacket(new SystemMessage(SystemMessageId.CAN_USE_REELING_ONLY_WHILE_FISHING));
- }
- - player.sendPacket(new ActionFailed());
- + player.sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/handler/admincommandhandlers/AdminShop.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/handler/admincommandhandlers/AdminShop.java (revision 173)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/handler/admincommandhandlers/AdminShop.java (revision 230)
- @@ -98,5 +98,5 @@
- _log.warning("no buylist with id:" + val);
- }
- - activeChar.sendPacket(new ActionFailed());
- + activeChar.sendPacket(ActionFailed.STATIC_PACKET);
- }
- }
- Index: /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/ai/AbstractAI.java
- ===================================================================
- --- /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/ai/AbstractAI.java (revision 213)
- +++ /Interlude_C6/Interlude_C6_GameServer/java/net/ins/gameserver/ai/AbstractAI.java (revision 230)
- @@ -464,5 +464,5 @@
- {
- if (_actor instanceof L2PcInstance)
- - _actor.sendPacket(new ActionFailed());
- + _actor.sendPacket(ActionFailed.STATIC_PACKET);
- }
- @@ -510,5 +510,5 @@
- if (!_actor.isMoving())
- {
- - _actor.sendPacket(new ActionFailed());
- + _actor.sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
- @@ -528,5 +528,5 @@
- }
- else
- - _actor.sendPacket(new ActionFailed());
- + _actor.sendPacket(ActionFailed.STATIC_PACKET);
- }
- @@ -552,5 +552,5 @@
- }
- else
- - _actor.sendPacket(new ActionFailed());
- + _actor.sendPacket(ActionFailed.STATIC_PACKET);
- }
- @@ -569,5 +569,5 @@
- }
- else
- - _actor.sendPacket(new ActionFailed());
- + _actor.sendPacket(ActionFailed.STATIC_PACKET);
- }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement