Sfoglia il codice sorgente

BETA: DP-Part for [L5980]

Rumen Nikiforov 12 anni fa
parent
commit
c17e6b3fc7

+ 3 - 2
L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceAction.java

@@ -27,6 +27,7 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
+import com.l2jserver.gameserver.model.holders.DoorRequestHolder;
 import com.l2jserver.gameserver.network.serverpackets.ConfirmDlg;
 import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
 import com.l2jserver.gameserver.network.serverpackets.StaticObject;
@@ -68,7 +69,7 @@ public class L2DoorInstanceAction implements IActionHandler
 				}
 				else if (!door.getClanHall().isSiegableHall() || !((SiegableHall) door.getClanHall()).isInSiege())
 				{
-					activeChar.gatesRequest(door);
+					activeChar.addScript(new DoorRequestHolder(door));
 					if (!door.getOpen())
 					{
 						activeChar.sendPacket(new ConfirmDlg(1140));
@@ -87,7 +88,7 @@ public class L2DoorInstanceAction implements IActionHandler
 				}
 				else
 				{
-					activeChar.gatesRequest((L2DoorInstance) target);
+					activeChar.addScript(new DoorRequestHolder((L2DoorInstance) target));
 					if (!((L2DoorInstance) target).getOpen())
 					{
 						activeChar.sendPacket(new ConfirmDlg(1140));

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java

@@ -109,7 +109,7 @@ public class ClanWarehouse implements IBypassHandler
 			{
 				activeChar.sendPacket(ActionFailed.STATIC_PACKET);
 				activeChar.setActiveWarehouse(activeChar.getClan().getWarehouse());
-				activeChar.tempInventoryDisable();
+				activeChar.setInventoryBlockingStatus(true);
 				
 				if (Config.DEBUG)
 				{

+ 1 - 7
L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java

@@ -94,13 +94,7 @@ public class PrivateWarehouse implements IBypassHandler
 			{
 				activeChar.sendPacket(ActionFailed.STATIC_PACKET);
 				activeChar.setActiveWarehouse(activeChar.getWarehouse());
-				activeChar.tempInventoryDisable();
-				
-				if (Config.DEBUG)
-				{
-					_log.fine("Source: L2WarehouseInstance.java; Player: " + activeChar.getName() + "; Command: showDepositWindow; Message: Showing items to deposit.");
-				}
-				
+				activeChar.setInventoryBlockingStatus(true);
 				activeChar.sendPacket(new WareHouseDepositList(activeChar, WareHouseDepositList.PRIVATE));
 				return true;
 			}

+ 1 - 7
L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Wear.java

@@ -72,15 +72,9 @@ public class Wear implements IBypassHandler
 	
 	private static final void showWearWindow(L2PcInstance player, int val)
 	{
-		player.tempInventoryDisable();
-		
-		if (Config.DEBUG)
-		{
-			_log.fine("Showing wearlist");
-		}
+		player.setInventoryBlockingStatus(true);
 		
 		L2TradeList list = TradeController.getInstance().getBuyList(val);
-		
 		if (list != null)
 		{
 			ShopPreviewList bl = new ShopPreviewList(list, player.getAdena(), player.getExpertiseLevel());

+ 6 - 2
L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/SummonFriend.java

@@ -25,6 +25,7 @@ import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Party;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.holders.SummonRequestHolder;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.network.SystemMessageId;
@@ -95,7 +96,8 @@ public class SummonFriend implements ISkillHandler
 					
 					if (!Util.checkIfInRange(0, activeChar, target, false))
 					{
-						if (!targetPlayer.teleportRequest(activePlayer, skill))
+						final SummonRequestHolder holder = activeChar.getScript(SummonRequestHolder.class);
+						if (holder != null)
 						{
 							final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_ALREADY_SUMMONED);
 							sm.addString(target.getName());
@@ -103,6 +105,8 @@ public class SummonFriend implements ISkillHandler
 							continue;
 						}
 						
+						activeChar.addScript(new SummonRequestHolder(activePlayer, skill));
+						
 						if (skill.getId() == 1403) // Summon Friend
 						{
 							// Send message
@@ -116,7 +120,7 @@ public class SummonFriend implements ISkillHandler
 						else
 						{
 							L2PcInstance.teleToTarget(targetPlayer, activePlayer, skill);
-							targetPlayer.teleportRequest(null, null);
+							targetPlayer.removeScript(SummonRequestHolder.class);
 						}
 					}
 				}