Small cleanup

L2_GameServer/java/net/sf/l2j/gameserver/model/L2Attackable.java

@@ -32,8 +32,6 @@ import net.sf.l2j.gameserver.datatables.ItemTable;
 import net.sf.l2j.gameserver.datatables.SkillTable;
 import net.sf.l2j.gameserver.datatables.EventDroplist.DateDrop;
 import net.sf.l2j.gameserver.instancemanager.CursedWeaponsManager;
-import net.sf.l2j.gameserver.model.L2Summon;
-import net.sf.l2j.gameserver.model.L2Attackable.OnKillNotifyTask;
 import net.sf.l2j.gameserver.model.actor.instance.L2DoorInstance;
 import net.sf.l2j.gameserver.model.actor.instance.L2FolkInstance;
 import net.sf.l2j.gameserver.model.actor.instance.L2GrandBossInstance;

L2_GameServer/java/net/sf/l2j/gameserver/model/L2Potion.java

@@ -1,223 +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 net.sf.l2j.gameserver.model;
-
-import java.util.concurrent.Future;
-import java.util.logging.Logger;
-
-import net.sf.l2j.Config;
-import net.sf.l2j.gameserver.ThreadPoolManager;
-
-
-/**
- *
- * This class ...
- *
- * @version $Revision: 1.2.2.1.2.5 $ $Date: 2005/03/27 15:29:30 $
- */
-public class L2Potion extends L2Object
-{
-    protected static final Logger _log = Logger.getLogger(L2Character.class.getName());
-
-
-    @SuppressWarnings("unused")
-	private L2Character _target;
-
-	private Future<?> _potionhpRegTask;
-	private Future<?> _potionmpRegTask;
-	protected int _milliseconds;
-    protected double _effect;
-    protected int _duration;
-	private int _potion;
-    protected Object _mpLock = new Object();
-    protected Object _hpLock = new Object();
-
-
-	class PotionHpHealing implements Runnable
-	{
-		L2Character _instance;
-
-		public PotionHpHealing(L2Character instance)
-		{
-			_instance = instance;
-		}
-
-		public void run()
-		{
-			try
-			{
-				synchronized(_hpLock)
-				{
-					double nowHp = _instance.getCurrentHp();
-					if(_duration == 0)
-					{
-						stopPotionHpRegeneration();
-					}
-					if (_duration != 0)
-					{
-						nowHp     += _effect;
-						_instance.setCurrentHp(nowHp);
-						_duration = _duration - (_milliseconds / 1000);
-						setCurrentHpPotion2();
-					}
-				}
-			}
-			catch (Exception e)
-			{
-				_log.warning("Error in hp potion task:"+e);
-			}
-		}
-	}
-
-
-	public L2Potion(int objectId)
-	{
-		super(objectId);
-	}
-
-	public void stopPotionHpRegeneration()
-	{
-		if (_potionhpRegTask != null)
-		{
-			_potionhpRegTask.cancel(false);
-		}
-		_potionhpRegTask = null;
-		if (Config.DEBUG) _log.fine("Potion HP regen stop");
-	}
-
-	public void setCurrentHpPotion2()
-	{
-		if (_duration == 0)
-		{
-			stopPotionHpRegeneration();
-		}
-	}
-	public void setCurrentHpPotion1(L2Character activeChar, int item)
-	{
-		_potion = item;
-		_target = activeChar;
-
-		switch (_potion)
-		{
-			case (1540):
-				double nowHp = activeChar.getCurrentHp();
-				nowHp+=435;
-				if (nowHp>= activeChar.getMaxHp())
-				{
-					nowHp = activeChar.getMaxHp();
-				}
-				activeChar.setCurrentHp(nowHp);
-				break;
-			case (728):
-				double nowMp = activeChar.getMaxMp();
-				nowMp+=435;
-				if (nowMp>= activeChar.getMaxMp())
-				{
-					nowMp = activeChar.getMaxMp();
-				}
-				activeChar.setCurrentMp(nowMp);
-				break;
-			case (726):
-				_milliseconds = 500;
-				_duration = 15;
-				_effect = 1.5;
-				startPotionMpRegeneration(activeChar);
-				break;
-		}
-	}
-
-	class PotionMpHealing implements Runnable
-	{
-		L2Character _instance;
-
-		public PotionMpHealing(L2Character instance)
-		{
-			_instance = instance;
-		}
-
-		public void run()
-		{
-			try
-			{
-				synchronized(_mpLock)
-				{
-					double nowMp = _instance.getCurrentMp();
-					if(_duration == 0)
-					{
-						stopPotionMpRegeneration();
-					}
-					if (_duration != 0)
-					{
-						nowMp+=_effect;
-						_instance.setCurrentMp(nowMp);
-						_duration=(_duration-(_milliseconds/1000));
-						setCurrentMpPotion2();
-
-					}
-				}
-			}
-			catch (Exception e)
-			{
-				_log.warning("error in mp potion task:"+e);
-			}
-		}
-	}
-
-	private void startPotionMpRegeneration(L2Character activeChar)
-	{
-		_potionmpRegTask = ThreadPoolManager.getInstance().scheduleEffectAtFixedRate(
-				new PotionMpHealing(activeChar), 1000, _milliseconds);
-		if (Config.DEBUG) _log.fine("Potion MP regen Started");
-	}
-
-	public void stopPotionMpRegeneration()
-	{
-		if (_potionmpRegTask != null)
-		{
-			_potionmpRegTask.cancel(false);
-		}
-
-		_potionmpRegTask = null;
-		if (Config.DEBUG) _log.fine("Potion MP regen stop");
-	}
-
-	public void setCurrentMpPotion2()
-	{
-		if (_duration == 0)
-		{
-			stopPotionMpRegeneration();
-		}
-	}
-
-	public void setCurrentMpPotion1(L2Character activeChar, int item)
-	{
-		_potion = item;
-		_target = activeChar;
-
-		switch (_potion)
-		{
-
-		}
-	}
-
-    /* (non-Javadoc)
-     * @see net.sf.l2j.gameserver.model.L2Object#isAttackable()
-     */
-    @Override
-	public boolean isAutoAttackable(@SuppressWarnings("unused") L2Character attacker)
-    {
-        return false;
-    }
-}