浏览代码

BETA: Removed useless !PaganKeys itemhandler.

Adry_85 12 年之前
父节点
当前提交
a5f9bebdc5

+ 0 - 2
L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java

@@ -191,7 +191,6 @@ import handlers.itemhandlers.ManaPotion;
 import handlers.itemhandlers.Maps;
 import handlers.itemhandlers.MercTicket;
 import handlers.itemhandlers.NicknameColor;
-import handlers.itemhandlers.PaganKeys;
 import handlers.itemhandlers.PetFood;
 import handlers.itemhandlers.Recipes;
 import handlers.itemhandlers.RollingDice;
@@ -471,7 +470,6 @@ public class MasterHandler
 			BeastSpiritShot.class,
 			Bypass.class,
 			Calculator.class,
-			PaganKeys.class,
 			Maps.class,
 			NicknameColor.class,
 			Recipes.class,

+ 0 - 137
L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PaganKeys.java

@@ -1,137 +0,0 @@
-/*
- * Copyright (C) 2004-2013 L2J DataPack
- * 
- * This file is part of L2J DataPack.
- * 
- * L2J DataPack is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * L2J DataPack is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.itemhandlers;
-
-import com.l2jserver.gameserver.datatables.DoorTable;
-import com.l2jserver.gameserver.handler.IItemHandler;
-import com.l2jserver.gameserver.instancemanager.InstanceManager;
-import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.actor.L2Playable;
-import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
-
-/**
- * @author chris
- */
-public class PaganKeys implements IItemHandler
-{
-	public static final int INTERACTION_DISTANCE = 100;
-	
-	@Override
-	public boolean useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
-	{
-		if (!playable.isPlayer())
-		{
-			playable.sendPacket(SystemMessageId.ITEM_NOT_FOR_PETS);
-			return false;
-		}
-		
-		final int itemId = item.getItemId();
-		final L2PcInstance activeChar = (L2PcInstance) playable;
-		final L2Object target = activeChar.getTarget();
-		
-		if (!(target instanceof L2DoorInstance))
-		{
-			activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
-			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
-			return false;
-		}
-		L2DoorInstance door = (L2DoorInstance) target;
-		
-		if (!(activeChar.isInsideRadius(door, INTERACTION_DISTANCE, false, false)))
-		{
-			activeChar.sendMessage("Too far.");
-			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
-			return false;
-		}
-		if ((activeChar.getAbnormalEffect() > 0) || activeChar.isInCombat())
-		{
-			activeChar.sendMessage("You cannot use the key now.");
-			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
-			return false;
-		}
-		
-		if (!playable.destroyItem("Consume", item.getObjectId(), 1, null, false))
-		{
-			return false;
-		}
-		
-		// TODO: Unhardcode these!
-		switch (itemId)
-		{
-			case 9698:
-				if (door.getDoorId() == 24220020)
-				{
-					if (activeChar.getInstanceId() != door.getInstanceId())
-					{
-						final L2DoorInstance instanceDoor = InstanceManager.getInstance().getInstance(activeChar.getInstanceId()).getDoor(door.getDoorId());
-						if (instanceDoor != null)
-						{
-							instanceDoor.openMe();
-						}
-					}
-					else
-					{
-						door.openMe();
-					}
-				}
-				else
-				{
-					activeChar.sendMessage("Incorrect Door.");
-				}
-				break;
-			case 9699:
-				if (door.getDoorId() == 24220022)
-				{
-					if (activeChar.getInstanceId() != door.getInstanceId())
-					{
-						final L2DoorInstance instanceDoor = InstanceManager.getInstance().getInstance(activeChar.getInstanceId()).getDoor(door.getDoorId());
-						if (instanceDoor != null)
-						{
-							instanceDoor.openMe();
-						}
-					}
-					else
-					{
-						door.openMe();
-					}
-				}
-				else
-				{
-					activeChar.sendMessage("Incorrect Door.");
-				}
-				break;
-			case 8056:
-				if ((door.getDoorId() == 23150004) || (door.getDoorId() == 23150003))
-				{
-					DoorTable.getInstance().getDoor(23150003).openMe();
-					DoorTable.getInstance().getDoor(23150004).openMe();
-				}
-				else
-				{
-					activeChar.sendMessage("Incorrect Door.");
-				}
-				break;
-		}
-		return true;
-	}
-}

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/stats/items/08000-08099.xml

@@ -537,7 +537,7 @@
 		<set name="default_action" val="skill_reduce" />
 		<set name="material" val="steel" />
 		<set name="is_stackable" val="true" />
-		<set name="handler" val="PaganKeys" />
+		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2238-1" />
 	</item>
 	<item id="8057" type="EtcItem" name="Silver Hemocyte">

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/stats/items/09600-09699.xml

@@ -1318,7 +1318,7 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="handler" val="PaganKeys" />
+		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2366-1" />
 	</item>
 	<item id="9699" type="EtcItem" name="Red Coral Key">
@@ -1330,7 +1330,7 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="handler" val="PaganKeys" />
+		<set name="handler" val="ItemSkills" />
 		<set name="item_skill" val="2367-1" />
 	</item>
 </list>