BETA: Cleanup of useless methods and name fixing.

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2PlayableAI.java

@@ -46,7 +46,7 @@ public abstract class L2PlayableAI extends L2CharacterAI
 	{
 		if (target instanceof L2Playable)
 		{
-			if (target.getActingPlayer().getProtectionBlessing() && ((_actor.getActingPlayer().getLevel() - target.getActingPlayer().getLevel()) >= 10) && (_actor.getActingPlayer().getKarma() > 0) && !(target.isInsideZone(ZoneId.PVP)))
+			if (target.getActingPlayer().isProtectionBlessingAffected() && ((_actor.getActingPlayer().getLevel() - target.getActingPlayer().getLevel()) >= 10) && (_actor.getActingPlayer().getKarma() > 0) && !(target.isInsideZone(ZoneId.PVP)))
 			{
 				// If attacker have karma and have level >= 10 than his target and target have
 				// Newbie Protection Buff,
@@ -55,7 +55,7 @@ public abstract class L2PlayableAI extends L2CharacterAI
 				return;
 			}
 			
-			if (_actor.getActingPlayer().getProtectionBlessing() && ((target.getActingPlayer().getLevel() - _actor.getActingPlayer().getLevel()) >= 10) && (target.getActingPlayer().getKarma() > 0) && !(target.isInsideZone(ZoneId.PVP)))
+			if (_actor.getActingPlayer().isProtectionBlessingAffected() && ((target.getActingPlayer().getLevel() - _actor.getActingPlayer().getLevel()) >= 10) && (target.getActingPlayer().getKarma() > 0) && !(target.isInsideZone(ZoneId.PVP)))
 			{
 				// If target have karma and have level >= 10 than his target and actor have
 				// Newbie Protection Buff,
@@ -87,7 +87,7 @@ public abstract class L2PlayableAI extends L2CharacterAI
 	{
 		if ((target instanceof L2Playable) && skill.isOffensive())
 		{
-			if (target.getActingPlayer().getProtectionBlessing() && ((_actor.getActingPlayer().getLevel() - target.getActingPlayer().getLevel()) >= 10) && (_actor.getActingPlayer().getKarma() > 0) && !target.isInsideZone(ZoneId.PVP))
+			if (target.getActingPlayer().isProtectionBlessingAffected() && ((_actor.getActingPlayer().getLevel() - target.getActingPlayer().getLevel()) >= 10) && (_actor.getActingPlayer().getKarma() > 0) && !target.isInsideZone(ZoneId.PVP))
 			{
 				// If attacker have karma and have level >= 10 than his target and target have
 				// Newbie Protection Buff,
@@ -97,7 +97,7 @@ public abstract class L2PlayableAI extends L2CharacterAI
 				return;
 			}
 			
-			if (_actor.getActingPlayer().getProtectionBlessing() && ((target.getActingPlayer().getLevel() - _actor.getActingPlayer().getLevel()) >= 10) && (target.getActingPlayer().getKarma() > 0) && !target.isInsideZone(ZoneId.PVP))
+			if (_actor.getActingPlayer().isProtectionBlessingAffected() && ((target.getActingPlayer().getLevel() - _actor.getActingPlayer().getLevel()) >= 10) && (target.getActingPlayer().getKarma() > 0) && !target.isInsideZone(ZoneId.PVP))
 			{
 				// If target have karma and have level >= 10 than his target and actor have
 				// Newbie Protection Buff,

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -2274,23 +2274,23 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
 		// if the Character isn't affected by Soul of The Phoenix or Salvation
 		if (isPlayable() && ((L2Playable) this).isPhoenixBlessed())
 		{
-			if (((L2Playable) this).getCharmOfLuck())
+			if (((L2Playable) this).isCharmOfLuckAffected())
 			{
-				((L2Playable) this).stopCharmOfLuck(null);
+				stopEffects(L2EffectType.CHARM_OF_LUCK);
 			}
 			if (((L2Playable) this).isNoblesseBlessed())
 			{
-				((L2Playable) this).stopNoblesseBlessing(null);
+				stopEffects(L2EffectType.NOBLESSE_BLESSING);
 			}
 		}
 		// Same thing if the Character isn't a Noblesse Blessed L2Playable
 		else if (isPlayable() && ((L2Playable) this).isNoblesseBlessed())
 		{
-			((L2Playable) this).stopNoblesseBlessing(null);
+			stopEffects(L2EffectType.NOBLESSE_BLESSING);
 			
-			if (((L2Playable) this).getCharmOfLuck())
+			if (((L2Playable) this).isCharmOfLuckAffected())
 			{
-				((L2Playable) this).stopCharmOfLuck(null);
+				stopEffects(L2EffectType.CHARM_OF_LUCK);
 			}
 		}
 		else
@@ -2392,7 +2392,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
 			if (isPlayable() && ((L2Playable) this).isPhoenixBlessed())
 			{
 				restorefull = true;
-				((L2Playable) this).stopPhoenixBlessing(null);
+				stopEffects(L2EffectType.PHOENIX_BLESSING);
 			}
 			if (restorefull)
 			{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Playable.java

@@ -26,7 +26,6 @@ import com.l2jserver.gameserver.model.actor.stat.PlayableStat;
 import com.l2jserver.gameserver.model.actor.status.PlayableStatus;
 import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate;
 import com.l2jserver.gameserver.model.effects.EffectFlag;
-import com.l2jserver.gameserver.model.effects.L2Effect;
 import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.entity.Instance;
 import com.l2jserver.gameserver.model.quest.QuestState;
@@ -133,23 +132,23 @@ public abstract class L2Playable extends L2Character
 		// if the Character isn't affected by Soul of The Phoenix or Salvation
 		if (isPhoenixBlessed())
 		{
-			if (getCharmOfLuck())
+			if (isCharmOfLuckAffected())
 			{
-				stopCharmOfLuck(null);
+				stopEffects(L2EffectType.CHARM_OF_LUCK);
 			}
 			if (isNoblesseBlessed())
 			{
-				stopNoblesseBlessing(null);
+				stopEffects(L2EffectType.NOBLESSE_BLESSING);
 			}
 		}
 		// Same thing if the Character isn't a Noblesse Blessed L2Playable
 		else if (isNoblesseBlessed())
 		{
-			stopNoblesseBlessing(null);
+			stopEffects(L2EffectType.NOBLESSE_BLESSING);
 			
-			if (getCharmOfLuck())
+			if (isCharmOfLuckAffected())
 			{
-				stopCharmOfLuck(null);
+				stopEffects(L2EffectType.CHARM_OF_LUCK);
 			}
 		}
 		else
@@ -277,87 +276,38 @@ public abstract class L2Playable extends L2Character
 		return isAffected(EffectFlag.NOBLESS_BLESSING);
 	}
 	
-	public final void stopNoblesseBlessing(L2Effect effect)
-	{
-		if (effect == null)
-		{
-			stopEffects(L2EffectType.NOBLESSE_BLESSING);
-		}
-		else
-		{
-			getEffectList().remove(effect);
-		}
-		updateAbnormalEffect();
-	}
-	
 	// Support for Soul of the Phoenix and Salvation skills
 	public final boolean isPhoenixBlessed()
 	{
 		return isAffected(EffectFlag.PHOENIX_BLESSING);
 	}
 	
-	public final void stopPhoenixBlessing(L2Effect effect)
-	{
-		if (effect == null)
-		{
-			stopEffects(L2EffectType.PHOENIX_BLESSING);
-		}
-		else
-		{
-			getEffectList().remove(effect);
-		}
-		updateAbnormalEffect();
-	}
-	
 	/**
-	 * @return True if the Silent Moving mode is active.
+	 * @return {@code true} if the Silent Moving mode is active, {@code false} otherwise
 	 */
 	public boolean isSilentMoving()
 	{
 		return isAffected(EffectFlag.SILENT_MOVE);
 	}
 	
-	// for Newbie Protection Blessing skill, keeps you safe from an attack by a chaotic character >= 10 levels apart from you
-	public final boolean getProtectionBlessing()
+	/**
+	 * For Newbie Protection Blessing skill, keeps you safe from an attack by a chaotic character >= 10 levels apart from you.
+	 * @return
+	 */
+	public final boolean isProtectionBlessingAffected()
 	{
 		return isAffected(EffectFlag.PROTECTION_BLESSING);
 	}
 	
 	/**
-	 * @param effect
+	 * Charm of Luck - During a Raid/Boss war, decreased chance for death penalty.
+	 * @return
 	 */
-	public void stopProtectionBlessing(L2Effect effect)
-	{
-		if (effect == null)
-		{
-			stopEffects(L2EffectType.PROTECTION_BLESSING);
-		}
-		else
-		{
-			getEffectList().remove(effect);
-		}
-		updateAbnormalEffect();
-	}
-	
-	// Charm of Luck - During a Raid/Boss war, decreased chance for death penalty
-	public final boolean getCharmOfLuck()
+	public final boolean isCharmOfLuckAffected()
 	{
 		return isAffected(EffectFlag.CHARM_OF_LUCK);
 	}
 	
-	public final void stopCharmOfLuck(L2Effect effect)
-	{
-		if (effect == null)
-		{
-			stopEffects(L2EffectType.CHARM_OF_LUCK);
-		}
-		else
-		{
-			getEffectList().remove(effect);
-		}
-		updateAbnormalEffect();
-	}
-	
 	@Override
 	public void updateEffectIcons(boolean partyOnly)
 	{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Summon.java

@@ -41,6 +41,7 @@ import com.l2jserver.gameserver.model.actor.knownlist.SummonKnownList;
 import com.l2jserver.gameserver.model.actor.stat.SummonStat;
 import com.l2jserver.gameserver.model.actor.status.SummonStatus;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.itemcontainer.PetInventory;
 import com.l2jserver.gameserver.model.items.L2EtcItem;
 import com.l2jserver.gameserver.model.items.L2Weapon;
@@ -317,7 +318,7 @@ public abstract class L2Summon extends L2Playable
 	{
 		if (isNoblesseBlessed())
 		{
-			stopNoblesseBlessing(null);
+			stopEffects(L2EffectType.NOBLESSE_BLESSING);
 			storeEffect(true);
 		}
 		else

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -11681,7 +11681,7 @@ public final class L2PcInstance extends L2Playable
 		// If character refuses a PhoenixBless autoress, cancel all buffs he had
 		if ((answer == 0) && isPhoenixBlessed())
 		{
-			stopPhoenixBlessing(null);
+			stopEffects(L2EffectType.PHOENIX_BLESSING);
 			stopAllEffectsExceptThoseThatLastThroughDeath();
 		}
 		if (answer == 1)
@@ -13831,7 +13831,7 @@ public final class L2PcInstance extends L2Playable
 	
 	public void calculateDeathPenaltyBuffLevel(L2Character killer)
 	{
-		if (((getKarma() > 0) || (Rnd.get(1, 100) <= Config.DEATH_PENALTY_CHANCE)) && !(killer instanceof L2PcInstance) && !(canOverrideCond(PcCondOverride.DEATH_PENALTY)) && !(getCharmOfLuck() && killer.isRaid()) && !isPhoenixBlessed() && !isLucky() && !isBlockedFromDeathPenalty() && !(isInsideZone(ZoneId.PVP) || isInsideZone(ZoneId.SIEGE)))
+		if (((getKarma() > 0) || (Rnd.get(1, 100) <= Config.DEATH_PENALTY_CHANCE)) && !(killer instanceof L2PcInstance) && !(canOverrideCond(PcCondOverride.DEATH_PENALTY)) && !(isCharmOfLuckAffected() && killer.isRaid()) && !isPhoenixBlessed() && !isLucky() && !isBlockedFromDeathPenalty() && !(isInsideZone(ZoneId.PVP) || isInsideZone(ZoneId.SIEGE)))
 		{
 			increaseDeathPenaltyBuffLevel();
 		}