Ver Fonte

BETA: Moving Christmas Tree instance to dp scripts.

Adry_85 há 12 anos atrás
pai
commit
e624a972d4

+ 0 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Object.java

@@ -164,7 +164,6 @@ public abstract class L2Object
 		L2TransformManagerInstance(L2MerchantInstance),
 		L2VillageMasterInstance(L2NpcInstance),
 		L2WyvernManagerInstance(L2NpcInstance),
-		L2XmassTreeInstance(L2NpcInstance),
 		// Doormens
 		L2DoormenInstance(L2NpcInstance),
 		L2CastleDoormenInstance(L2DoormenInstance),

+ 0 - 103
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2XmassTreeInstance.java

@@ -1,103 +0,0 @@
-/*
- * This program 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.
- * 
- * This program 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 com.l2jserver.gameserver.model.actor.instance;
-
-import java.util.Collection;
-import java.util.concurrent.ScheduledFuture;
-
-import com.l2jserver.gameserver.ThreadPoolManager;
-import com.l2jserver.gameserver.datatables.SkillTable;
-import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.L2Npc;
-import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
-import com.l2jserver.gameserver.model.skills.L2Skill;
-import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
-
-/**
- * @author Drunkard Zabb0x
- * Lets drink2code!
- */
-public class L2XmassTreeInstance extends L2Npc
-{
-	public static final int SPECIAL_TREE_ID = 13007;
-	protected ScheduledFuture<?> _aiTask;
-	
-	private final class XmassAI implements Runnable
-	{
-		private final L2XmassTreeInstance _caster;
-		private final L2Skill _skill;
-		
-		protected XmassAI(L2XmassTreeInstance caster, L2Skill skill)
-		{
-			_caster = caster;
-			_skill = skill;
-		}
-		
-		@Override
-		public void run()
-		{
-			if (_skill == null || _caster.isInsideZone(ZONE_PEACE))
-			{
-				_caster._aiTask.cancel(false);
-				_caster._aiTask = null;
-				return;
-			}
-			
-			Collection<L2PcInstance> plrs = getKnownList().getKnownPlayersInRadius(_skill.getSkillRadius());
-			for (L2PcInstance player : plrs)
-			{
-				if (player.getFirstEffect(_skill.getId()) == null)
-				{
-					_skill.getEffects(player, player);
-				}
-			}
-		}
-	}
-	
-	public L2XmassTreeInstance(int objectId, L2NpcTemplate template)
-	{
-		super(objectId, template);
-		setInstanceType(InstanceType.L2XmassTreeInstance);
-		if (template.getNpcId() == SPECIAL_TREE_ID)
-			_aiTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new XmassAI(this,SkillTable.getInstance().getInfo(2139, 1)), 3000, 3000);
-	}
-	
-	@Override
-	public void deleteMe()
-	{
-		if (_aiTask != null) _aiTask.cancel(true);
-		
-		super.deleteMe();
-	}
-	
-	@Override
-	public int getDistanceToWatchObject(L2Object object)
-	{
-		return 900;
-	}
-	
-	@Override
-	public boolean isAutoAttackable(L2Character attacker)
-	{
-		return false;
-	}
-	
-	@Override
-	public void onAction(L2PcInstance player, boolean interact)
-	{
-		player.sendPacket(ActionFailed.STATIC_PACKET);
-	}
-}

+ 0 - 9
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/templates/L2NpcTemplate.java

@@ -29,7 +29,6 @@ import com.l2jserver.gameserver.model.L2DropData;
 import com.l2jserver.gameserver.model.L2MinionData;
 import com.l2jserver.gameserver.model.L2NpcAIData;
 import com.l2jserver.gameserver.model.StatsSet;
-import com.l2jserver.gameserver.model.actor.instance.L2XmassTreeInstance;
 import com.l2jserver.gameserver.model.base.ClassId;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.Quest.QuestEventType;
@@ -869,14 +868,6 @@ public final class L2NpcTemplate extends L2CharTemplate
 		return _serverSideTitle;
 	}
 	
-	/**
-	 * @return {@code true} if the NPC is Christmas Special Tree, {@code false} otherwise.
-	 */
-	public boolean isSpecialTree()
-	{
-		return _npcId == L2XmassTreeInstance.SPECIAL_TREE_ID;
-	}
-	
 	/**
 	 * Checks types, ignore case.
 	 * @param t the type to check.