Vitality related skill condition handlers rework.
Thanks to CostyKiller.
This commit is contained in:
		@@ -36,7 +36,6 @@ public class SkillConditionMasterHandler
 | 
			
		||||
		SkillConditionHandler.getInstance().registerHandler("CanMountForEvent", CanMountForEventSkillCondition::new);
 | 
			
		||||
		SkillConditionHandler.getInstance().registerHandler("CannotUseInTransform", CannotUseInTransformSkillCondition::new);
 | 
			
		||||
		SkillConditionHandler.getInstance().registerHandler("CanRefuelAirship", CanRefuelAirshipSkillCondition::new);
 | 
			
		||||
		SkillConditionHandler.getInstance().registerHandler("CanRestoreVitalPoint", CanRestoreVitalPointSkillCondition::new);
 | 
			
		||||
		SkillConditionHandler.getInstance().registerHandler("CanSummon", CanSummonSkillCondition::new);
 | 
			
		||||
		SkillConditionHandler.getInstance().registerHandler("CanSummonCubic", CanSummonCubicSkillCondition::new);
 | 
			
		||||
		SkillConditionHandler.getInstance().registerHandler("CanSummonMulti", CanSummonMultiSkillCondition::new);
 | 
			
		||||
 
 | 
			
		||||
@@ -1,36 +0,0 @@
 | 
			
		||||
/*
 | 
			
		||||
 * This file is part of the L2J Mobius project.
 | 
			
		||||
 * 
 | 
			
		||||
 * 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 handlers.skillconditionhandlers;
 | 
			
		||||
 | 
			
		||||
import org.l2jmobius.gameserver.model.StatSet;
 | 
			
		||||
import org.l2jmobius.gameserver.model.WorldObject;
 | 
			
		||||
import org.l2jmobius.gameserver.model.actor.Creature;
 | 
			
		||||
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
 | 
			
		||||
import org.l2jmobius.gameserver.model.skills.Skill;
 | 
			
		||||
 | 
			
		||||
public class CanRestoreVitalPointSkillCondition implements ISkillCondition
 | 
			
		||||
{
 | 
			
		||||
	public CanRestoreVitalPointSkillCondition(StatSet params)
 | 
			
		||||
	{
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	@Override
 | 
			
		||||
	public boolean canUse(Creature caster, Skill skill, WorldObject target)
 | 
			
		||||
	{
 | 
			
		||||
		return true;
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -19,7 +19,6 @@ package handlers.skillconditionhandlers;
 | 
			
		||||
import org.l2jmobius.gameserver.model.StatSet;
 | 
			
		||||
import org.l2jmobius.gameserver.model.WorldObject;
 | 
			
		||||
import org.l2jmobius.gameserver.model.actor.Creature;
 | 
			
		||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 | 
			
		||||
import org.l2jmobius.gameserver.model.actor.stat.PlayerStat;
 | 
			
		||||
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
 | 
			
		||||
import org.l2jmobius.gameserver.model.skills.Skill;
 | 
			
		||||
@@ -33,20 +32,12 @@ public class CanUseVitalityIncreaseItemSkillCondition implements ISkillCondition
 | 
			
		||||
	
 | 
			
		||||
	public CanUseVitalityIncreaseItemSkillCondition(StatSet params)
 | 
			
		||||
	{
 | 
			
		||||
		_amount = params.getInt("amount");
 | 
			
		||||
		_amount = params.getInt("amount", 0);
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	@Override
 | 
			
		||||
	public boolean canUse(Creature caster, Skill skill, WorldObject target)
 | 
			
		||||
	{
 | 
			
		||||
		if (caster.isPlayer())
 | 
			
		||||
		{
 | 
			
		||||
			PlayerInstance player = caster.getActingPlayer();
 | 
			
		||||
			if ((player.getVitalityPoints() + _amount) <= PlayerStat.MAX_VITALITY_POINTS)
 | 
			
		||||
			{
 | 
			
		||||
				return true;
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
		return false;
 | 
			
		||||
		return caster.isPlayer() && ((caster.getActingPlayer().getVitalityPoints() + _amount) <= PlayerStat.MAX_VITALITY_POINTS);
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -31,19 +31,12 @@ public class HasVitalityPointsSkillCondition implements ISkillCondition
 | 
			
		||||
	
 | 
			
		||||
	public HasVitalityPointsSkillCondition(StatSet params)
 | 
			
		||||
	{
 | 
			
		||||
		_amount = params.getInt("amount");
 | 
			
		||||
		_amount = params.getInt("amount", 1);
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	@Override
 | 
			
		||||
	public boolean canUse(Creature caster, Skill skill, WorldObject target)
 | 
			
		||||
	{
 | 
			
		||||
		if (caster.isPlayer())
 | 
			
		||||
		{
 | 
			
		||||
			if (caster.getActingPlayer().getVitalityPoints() >= _amount)
 | 
			
		||||
			{
 | 
			
		||||
				return true;
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
		return false;
 | 
			
		||||
		return caster.isPlayer() && (caster.getActingPlayer().getVitalityPoints() >= _amount);
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user