rendered paste bodyIndex: D:/L2J Workspace/L2_GameServer_CT1/java/net/sf/l2j/gameserver/model/actor/instance/L2ClanHallManagerInstance.java
===================================================================
--- D:/L2J Workspace/L2_GameServer_CT1/java/net/sf/l2j/gameserver/model/actor/instance/L2ClanHallManagerInstance.java (revision 62)
+++ D:/L2J Workspace/L2_GameServer_CT1/java/net/sf/l2j/gameserver/model/actor/instance/L2ClanHallManagerInstance.java (working copy)
@@ -26,10 +26,12 @@
import net.sf.l2j.gameserver.model.L2TeleportLocation;
import net.sf.l2j.gameserver.model.L2Skill.SkillType;
import net.sf.l2j.gameserver.model.entity.ClanHall;
+import net.sf.l2j.gameserver.network.SystemMessageId;
import net.sf.l2j.gameserver.serverpackets.ActionFailed;
import net.sf.l2j.gameserver.serverpackets.AgitDecoInfo;
import net.sf.l2j.gameserver.serverpackets.MyTargetSelected;
import net.sf.l2j.gameserver.serverpackets.NpcHtmlMessage;
+import net.sf.l2j.gameserver.serverpackets.SystemMessage;
import net.sf.l2j.gameserver.serverpackets.ValidateLocation;
import net.sf.l2j.gameserver.serverpackets.WareHouseDepositList;
import net.sf.l2j.gameserver.serverpackets.WareHouseWithdrawalList;
@@ -105,6 +107,19 @@
}
return;
}
+ else if (actualCommand.equals("privatewh"))
+ {
+ if (val.equalsIgnoreCase("WithdrawP"))
+ showRetrieveWindow(player);
+ else if (val.equalsIgnoreCase("DepositP"))
+ showDepositWindow(player);
+ else
+ {
+ NpcHtmlMessage html = new NpcHtmlMessage(1);
+ html.setFile("data/html/clanHallManager/privatewh.htm");
+ sendHtmlMessage(player, html);
+ }
+ }
else if (actualCommand.equalsIgnoreCase("door"))
{
NpcHtmlMessage html = new NpcHtmlMessage(1);
@@ -1460,4 +1475,29 @@
AgitDecoInfo bl = new AgitDecoInfo(ClanHallManager.getInstance().getClanHallByOwner(player.getClan()));
player.sendPacket(bl);
}
+
+ private void showRetrieveWindow(L2PcInstance player)
+ {
+ player.sendPacket(ActionFailed.STATIC_PACKET);
+ player.setActiveWarehouse(player.getWarehouse());
+
+ if (player.getActiveWarehouse().getSize() == 0)
+ {
+ player.sendPacket(new SystemMessage(SystemMessageId.NO_ITEM_DEPOSITED_IN_WH));
+ return;
+ }
+
+ if (Config.DEBUG) _log.fine("Showing stored items");
+ player.sendPacket(new WareHouseWithdrawalList(player, WareHouseWithdrawalList.PRIVATE));
+ }
+
+ private void showDepositWindow(L2PcInstance player)
+ {
+ player.sendPacket(ActionFailed.STATIC_PACKET);
+ player.setActiveWarehouse(player.getWarehouse());
+ player.tempInvetoryDisable();
+ if (Config.DEBUG) _log.fine("Showing items to deposit");
+
+ player.sendPacket(new WareHouseDepositList(player, WareHouseDepositList.PRIVATE));
+ }
}