ソースを参照

Effects clean up

Charus 15 年 前
コミット
2283234a31
43 ファイル変更30 行追加105 行削除
  1. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectAfroHaircut.java
  2. 4 2
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectBetray.java
  3. 0 1
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectBigHead.java
  4. 0 1
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectBluff.java
  5. 0 1
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectBuff.java
  6. 14 23
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectChameleonRest.java
  7. 0 1
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectChanceSkillTrigger.java
  8. 0 1
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectCharmOfCourage.java
  9. 0 1
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectClanGate.java
  10. 1 2
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectCombatPointHealOverTime.java
  11. 0 4
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectConfuseMob.java
  12. 0 3
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectConfusion.java
  13. 0 1
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectDebuff.java
  14. 0 1
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectDisarm.java
  15. 0 3
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectEnemyCharge.java
  16. 1 3
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectFakeDeath.java
  17. 0 1
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectFusion.java
  18. 0 1
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectGrow.java
  19. 1 2
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectHealOverTime.java
  20. 0 1
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectHide.java
  21. 0 1
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectImmobileBuff.java
  22. 0 1
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectImmobileUntilAttacked.java
  23. 1 2
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectManaDamOverTime.java
  24. 1 2
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectManaHealOverTime.java
  25. 1 2
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectMpConsumePerLevel.java
  26. 0 1
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectNoblesseBless.java
  27. 0 1
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectPetrification.java
  28. 0 1
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectPhysicalAttackMute.java
  29. 0 1
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectPhysicalMute.java
  30. 0 1
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectRecovery.java
  31. 1 5
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectRelax.java
  32. 0 1
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectRoot.java
  33. 0 3
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectSignet.java
  34. 0 3
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectSignetAntiSummon.java
  35. 0 3
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectSignetMDam.java
  36. 2 3
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectSignetNoise.java
  37. 0 1
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectSilenceMagicPhysical.java
  38. 1 3
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectSilentMove.java
  39. 0 1
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectSleep.java
  40. 0 7
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectSpoil.java
  41. 0 1
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectStun.java
  42. 0 1
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectThrowUp.java
  43. 1 6
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectWarp.java

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectAfroHaircut.java

@@ -49,7 +49,7 @@ public class EffectAfroHaircut extends L2Effect
 	{
 		if (getEffected() instanceof L2PcInstance)
 		{
-			((L2PcInstance) getEffected()).setAfroHaircutId(this.getSkill().getAfroColor());
+			((L2PcInstance) getEffected()).setAfroHaircutId(getSkill().getAfroColor());
 			return true;
 		}
 		return false;

+ 4 - 2
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectBetray.java

@@ -56,7 +56,8 @@ public class EffectBetray extends L2Effect
 			L2PcInstance targetOwner = getEffected().getActingPlayer();
 			getEffected().getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, targetOwner);
 			getEffected().setIsBetrayed(true);
-			if (targetOwner != null) targetOwner.setIsBetrayed(true);
+			if (targetOwner != null)
+				targetOwner.setIsBetrayed(true);
 			return true;
 		}
 		return false;
@@ -72,7 +73,8 @@ public class EffectBetray extends L2Effect
 		getEffected().setIsBetrayed(false);
 		getEffected().getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 		L2PcInstance targetOwner = getEffected().getActingPlayer();
-		if (targetOwner != null) targetOwner.setIsBetrayed(false);
+		if (targetOwner != null)
+			targetOwner.setIsBetrayed(false);
 	}
 	
 	/**

+ 0 - 1
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectBigHead.java

@@ -26,7 +26,6 @@ import com.l2jserver.gameserver.templates.skills.L2EffectType;
  */
 public class EffectBigHead extends L2Effect
 {
-	
 	public EffectBigHead(Env env, EffectTemplate template)
 	{
 		super(env, template);

+ 0 - 1
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectBluff.java

@@ -31,7 +31,6 @@ import com.l2jserver.gameserver.templates.skills.L2EffectType;
  */
 public class EffectBluff extends L2Effect
 {
-	
 	public EffectBluff(Env env, EffectTemplate template)
 	{
 		super(env, template);

+ 0 - 1
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectBuff.java

@@ -27,7 +27,6 @@ import com.l2jserver.gameserver.templates.skills.L2EffectType;
  */
 public class EffectBuff extends L2Effect
 {
-	
 	public EffectBuff(Env env, EffectTemplate template)
 	{
 		super(env, template);

+ 14 - 23
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectChameleonRest.java

@@ -16,7 +16,6 @@ package com.l2jserver.gameserver.skills.effects;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.model.L2Effect;
-import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
@@ -42,7 +41,6 @@ public class EffectChameleonRest extends L2Effect
 		return L2EffectType.RELAXING;
 	}
 	
-	
 	/**
 	 * 
 	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
@@ -50,16 +48,14 @@ public class EffectChameleonRest extends L2Effect
 	@Override
 	public boolean onStart()
 	{
-		
-		L2Character effected = getEffected();
-		if (effected instanceof L2PcInstance)
+		if (getEffected() instanceof L2PcInstance)
 		{
 			setChameleon(true);
-			((L2PcInstance) effected).setSilentMoving(true);
-			((L2PcInstance) effected).sitDown();
+			((L2PcInstance) getEffected()).setSilentMoving(true);
+			((L2PcInstance) getEffected()).sitDown();
 		}
 		else
-			effected.getAI().setIntention(CtrlIntention.AI_INTENTION_REST);
+			getEffected().getAI().setIntention(CtrlIntention.AI_INTENTION_REST);
 		return super.onStart();
 	}
 	
@@ -71,10 +67,8 @@ public class EffectChameleonRest extends L2Effect
 	public void onExit()
 	{
 		setChameleon(false);
-		
-		L2Character effected = getEffected();
-		if (effected instanceof L2PcInstance)
-			((L2PcInstance) effected).setSilentMoving(false);
+		if (getEffected() instanceof L2PcInstance)
+			((L2PcInstance) getEffected()).setSilentMoving(false);
 		
 		super.onExit();
 	}
@@ -86,35 +80,33 @@ public class EffectChameleonRest extends L2Effect
 	@Override
 	public boolean onActionTime()
 	{
-		L2Character effected = getEffected();
 		boolean retval = true;
 		
-		if (effected.isDead())
+		if (getEffected().isDead())
 			retval = false;
 		
 		// Only cont skills shouldn't end
 		if (getSkill().getSkillType() != L2SkillType.CONT)
 			return false;
 		
-		if (effected instanceof L2PcInstance)
+		if (getEffected() instanceof L2PcInstance)
 		{
-			if (!((L2PcInstance) effected).isSitting())
+			if (!((L2PcInstance) getEffected()).isSitting())
 				retval = false;
 		}
 		
 		double manaDam = calc();
 		
-		if (manaDam > effected.getCurrentMp())
+		if (manaDam > getEffected().getCurrentMp())
 		{
-			SystemMessage sm = new SystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
-			effected.sendPacket(sm);
+			getEffected().sendPacket(new SystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP));
 			return false;
 		}
 		
 		if (!retval)
 			setChameleon(retval);
 		else
-			effected.reduceCurrentMp(manaDam);
+			getEffected().reduceCurrentMp(manaDam);
 		
 		return retval;
 	}
@@ -125,8 +117,7 @@ public class EffectChameleonRest extends L2Effect
 	 */
 	private void setChameleon(boolean val)
 	{
-		L2Character effected = getEffected();
-		if (effected instanceof L2PcInstance)
-			((L2PcInstance) effected).setRelax(val);
+		if (getEffected() instanceof L2PcInstance)
+			((L2PcInstance) getEffected()).setRelax(val);
 	}
 }

+ 0 - 1
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectChanceSkillTrigger.java

@@ -82,5 +82,4 @@ public class EffectChanceSkillTrigger extends L2Effect implements IChanceSkillTr
     {
 	    return _chanceCondition;
     }
-	
 }

+ 0 - 1
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectCharmOfCourage.java

@@ -73,5 +73,4 @@ public class EffectCharmOfCourage extends L2Effect
 	{
 		return false;
 	}
-	
 }

+ 0 - 1
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectClanGate.java

@@ -27,7 +27,6 @@ import com.l2jserver.gameserver.templates.skills.L2EffectType;
 /**
  * @author ZaKaX (Ghost @ L2D)
  */
-
 public class EffectClanGate extends L2Effect
 {
 	public EffectClanGate(Env env, EffectTemplate template)

+ 1 - 2
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectCombatPointHealOverTime.java

@@ -51,9 +51,8 @@ public class EffectCombatPointHealOverTime extends L2Effect
 		double maxcp = getEffected().getMaxCp();
 		cp += calc();
 		if (cp > maxcp)
-		{
 			cp = maxcp;
-		}
+		
 		getEffected().setCurrentCp(cp);
 		StatusUpdate sump = new StatusUpdate(getEffected().getObjectId());
 		sump.addAttribute(StatusUpdate.CUR_CP, (int) cp);

+ 0 - 4
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectConfuseMob.java

@@ -36,7 +36,6 @@ import javolution.util.FastList;
  */
 public class EffectConfuseMob extends L2Effect
 {
-	
 	public EffectConfuseMob(Env env, EffectTemplate template)
 	{
 		super(env, template);
@@ -96,16 +95,13 @@ public class EffectConfuseMob extends L2Effect
 		}
 		// if there is no target, exit function
 		if (targetList.isEmpty())
-		{
 			return true;
-		}
 		
 		// Choosing randomly a new target
 		int nextTargetIdx = Rnd.nextInt(targetList.size());
 		L2Object target = targetList.get(nextTargetIdx);
 		
 		// Attacking the target
-		// getEffected().setTarget(target);
 		getEffected().setTarget(target);
 		getEffected().getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
 		

+ 0 - 3
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectConfusion.java

@@ -95,16 +95,13 @@ public class EffectConfusion extends L2Effect
 		}
 		// if there is no target, exit function
 		if (targetList.isEmpty())
-		{
 			return true;
-		}
 		
 		// Choosing randomly a new target
 		int nextTargetIdx = Rnd.nextInt(targetList.size());
 		L2Object target = targetList.get(nextTargetIdx);
 		
 		// Attacking the target
-		// getEffected().setTarget(target);
 		getEffected().setTarget(target);
 		getEffected().getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
 		

+ 0 - 1
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectDebuff.java

@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 public class EffectDebuff extends L2Effect
 {
-	
 	public EffectDebuff(Env env, EffectTemplate template)
 	{
 		super(env, template);

+ 0 - 1
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectDisarm.java

@@ -24,7 +24,6 @@ import com.l2jserver.gameserver.templates.skills.L2EffectType;
  * 
  * @author nBd
  */
-
 public class EffectDisarm extends L2Effect
 {
 	public EffectDisarm(Env env, EffectTemplate template)

+ 0 - 3
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectEnemyCharge.java

@@ -27,7 +27,6 @@ import com.l2jserver.gameserver.skills.Env;
 import com.l2jserver.gameserver.templates.effects.EffectTemplate;
 import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
-
 public class EffectEnemyCharge extends L2Effect
 {
 	static final Logger _log = Logger.getLogger(EffectEnemyCharge.class.getName());
@@ -102,8 +101,6 @@ public class EffectEnemyCharge extends L2Effect
 			_y = destiny.getY();
 		}
 		getEffector().broadcastPacket(new FlyToLocation(getEffector(), _x, _y, _z, FlyType.CHARGE));
-		// getEffector().abortAttack();
-		// getEffector().abortCast();
 		
 		// maybe is need force set X,Y,Z
 		getEffector().setXYZ(_x, _y, _z);

+ 1 - 3
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectFakeDeath.java

@@ -27,7 +27,6 @@ import com.l2jserver.gameserver.templates.skills.L2EffectType;
  */
 public class EffectFakeDeath extends L2Effect
 {
-	
 	public EffectFakeDeath(Env env, EffectTemplate template)
 	{
 		super(env, template);
@@ -80,8 +79,7 @@ public class EffectFakeDeath extends L2Effect
 		{
 			if (getSkill().isToggle())
 			{
-				SystemMessage sm = new SystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
-				getEffected().sendPacket(sm);
+				getEffected().sendPacket(new SystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP));
 				return false;
 			}
 		}

+ 0 - 1
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectFusion.java

@@ -23,7 +23,6 @@ import com.l2jserver.gameserver.templates.skills.L2EffectType;
 /**
  * @author Kerberos
  */
-
 public class EffectFusion extends L2Effect
 {
 	public int _effect;

+ 0 - 1
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectGrow.java

@@ -23,7 +23,6 @@ import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 public class EffectGrow extends L2Effect
 {
-	
 	public EffectGrow(Env env, EffectTemplate template)
 	{
 		super(env, template);

+ 1 - 2
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectHealOverTime.java

@@ -67,9 +67,8 @@ public class EffectHealOverTime extends L2Effect
 		double maxhp = getEffected().getMaxHp();
 		hp += calc();
 		if (hp > maxhp)
-		{
 			hp = maxhp;
-		}
+		
 		getEffected().setCurrentHp(hp);
 		StatusUpdate suhp = new StatusUpdate(getEffected().getObjectId());
 		suhp.addAttribute(StatusUpdate.CUR_HP, (int) hp);

+ 0 - 1
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectHide.java

@@ -26,7 +26,6 @@ import com.l2jserver.gameserver.templates.effects.EffectTemplate;
 import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 /**
- * 
  *
  * @author ZaKaX - nBd
  */

+ 0 - 1
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectImmobileBuff.java

@@ -24,7 +24,6 @@ import com.l2jserver.gameserver.templates.skills.L2EffectType;
  */
 public class EffectImmobileBuff extends EffectBuff
 {
-	
 	public EffectImmobileBuff(Env env, EffectTemplate template)
 	{
 		super(env, template);

+ 0 - 1
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectImmobileUntilAttacked.java

@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.skills.Env;
 import com.l2jserver.gameserver.templates.effects.EffectTemplate;
 import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
-
 /**
  * @author Ahmed
  * 

+ 1 - 2
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectManaDamOverTime.java

@@ -54,8 +54,7 @@ public class EffectManaDamOverTime extends L2Effect
 		{
 			if (getSkill().isToggle())
 			{
-				SystemMessage sm = new SystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
-				getEffected().sendPacket(sm);
+				getEffected().sendPacket(new SystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP));
 				return false;
 			}
 		}

+ 1 - 2
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectManaHealOverTime.java

@@ -51,9 +51,8 @@ public class EffectManaHealOverTime extends L2Effect
 		double maxmp = getEffected().getMaxMp();
 		mp += calc();
 		if (mp > maxmp)
-		{
 			mp = maxmp;
-		}
+		
 		getEffected().setCurrentMp(mp);
 		StatusUpdate sump = new StatusUpdate(getEffected().getObjectId());
 		sump.addAttribute(StatusUpdate.CUR_MP, (int) mp);

+ 1 - 2
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectMpConsumePerLevel.java

@@ -54,8 +54,7 @@ public class EffectMpConsumePerLevel extends L2Effect
 		
 		if (consume > getEffected().getCurrentMp())
 		{
-			SystemMessage sm = new SystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
-			getEffected().sendPacket(sm);
+			getEffected().sendPacket(new SystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP));
 			return false;
 		}
 		

+ 0 - 1
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectNoblesseBless.java

@@ -26,7 +26,6 @@ import com.l2jserver.gameserver.templates.skills.L2EffectType;
  */
 public class EffectNoblesseBless extends L2Effect
 {
-	
 	public EffectNoblesseBless(Env env, EffectTemplate template)
 	{
 		super(env, template);

+ 0 - 1
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectPetrification.java

@@ -12,7 +12,6 @@
  * 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.skills.effects;
 
 import com.l2jserver.gameserver.model.L2Effect;

+ 0 - 1
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectPhysicalAttackMute.java

@@ -25,7 +25,6 @@ import com.l2jserver.gameserver.templates.skills.L2EffectType;
  */
 public class EffectPhysicalAttackMute extends L2Effect
 {
-	
 	public EffectPhysicalAttackMute(Env env, EffectTemplate template)
 	{
 		super(env, template);

+ 0 - 1
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectPhysicalMute.java

@@ -25,7 +25,6 @@ import com.l2jserver.gameserver.templates.skills.L2EffectType;
  */
 public class EffectPhysicalMute extends L2Effect
 {
-	
 	public EffectPhysicalMute(Env env, EffectTemplate template)
 	{
 		super(env, template);

+ 0 - 1
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectRecovery.java

@@ -26,7 +26,6 @@ import com.l2jserver.gameserver.templates.skills.L2EffectType;
  */
 public class EffectRecovery extends L2Effect
 {
-	
 	public EffectRecovery(Env env, EffectTemplate template)
 	{
 		super(env, template);

+ 1 - 5
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectRelax.java

@@ -47,7 +47,6 @@ public class EffectRelax extends L2Effect
 	@Override
 	public boolean onStart()
 	{
-		
 		if (getEffected() instanceof L2PcInstance)
 		{
 			setRelax(true);
@@ -101,10 +100,7 @@ public class EffectRelax extends L2Effect
 		{
 			if (getSkill().isToggle())
 			{
-				SystemMessage sm = new SystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
-				getEffected().sendPacket(sm);
-				// if (getEffected() instanceof L2PcInstance)
-				// ((L2PcInstance)getEffected()).standUp();
+				getEffected().sendPacket(new SystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP));
 				retval = false;
 			}
 		}

+ 0 - 1
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectRoot.java

@@ -27,7 +27,6 @@ import com.l2jserver.gameserver.templates.skills.L2EffectType;
  */
 public class EffectRoot extends L2Effect
 {
-	
 	public EffectRoot(Env env, EffectTemplate template)
 	{
 		super(env, template);

+ 0 - 3
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectSignet.java

@@ -31,7 +31,6 @@ import com.l2jserver.gameserver.templates.skills.L2EffectType;
 /**
  * @authors Forsaiken, Sami
  */
-
 public class EffectSignet extends L2Effect
 {
 	private L2Skill _skill;
@@ -105,8 +104,6 @@ public class EffectSignet extends L2Effect
 	public void onExit()
 	{
 		if (_actor != null)
-		{
 			_actor.deleteMe();
-		}
 	}
 }

+ 0 - 3
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectSignetAntiSummon.java

@@ -30,7 +30,6 @@ import com.l2jserver.gameserver.templates.skills.L2EffectType;
 /**
  * @author Forsaiken
  */
-
 public class EffectSignetAntiSummon extends L2Effect
 {
 	private L2EffectPointInstance _actor;
@@ -112,8 +111,6 @@ public class EffectSignetAntiSummon extends L2Effect
 	public void onExit()
 	{
 		if (_actor != null)
-		{
 			_actor.deleteMe();
-		}
 	}
 }

+ 0 - 3
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectSignetMDam.java

@@ -16,7 +16,6 @@
 /**
  * @author Forsaiken
  */
-
 package com.l2jserver.gameserver.skills.effects;
 
 import com.l2jserver.gameserver.ai.CtrlEvent;
@@ -207,8 +206,6 @@ public class EffectSignetMDam extends L2Effect
 	public void onExit()
 	{
 		if (_actor != null)
-		{
 			_actor.deleteMe();
-		}
 	}
 }

+ 2 - 3
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectSignetNoise.java

@@ -25,7 +25,6 @@ import com.l2jserver.gameserver.templates.skills.L2EffectType;
 /**
  * @authors Forsaiken, Sami
  */
-
 public class EffectSignetNoise extends L2Effect
 {
 	private L2EffectPointInstance _actor;
@@ -73,11 +72,13 @@ public class EffectSignetNoise extends L2Effect
 			
 			L2Effect[] effects = target.getAllEffects();
 			if (effects != null)
+			{
 				for (L2Effect effect : effects)
 				{
 					if (effect.getSkill().isDance())
 						effect.exit();
 				}
+			}
 			// there doesn't seem to be a visible effect?
 		}
 		return true;
@@ -91,8 +92,6 @@ public class EffectSignetNoise extends L2Effect
 	public void onExit()
 	{
 		if (_actor != null)
-		{
 			_actor.deleteMe();
-		}
 	}
 }

+ 0 - 1
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectSilenceMagicPhysical.java

@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 public class EffectSilenceMagicPhysical extends L2Effect
 {
-	
 	public EffectSilenceMagicPhysical(Env env, EffectTemplate template)
 	{
 		super(env, template);

+ 1 - 3
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectSilentMove.java

@@ -88,13 +88,11 @@ public class EffectSilentMove extends L2Effect
 		
 		if (manaDam > getEffected().getCurrentMp())
 		{
-			SystemMessage sm = new SystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
-			getEffected().sendPacket(sm);
+			getEffected().sendPacket(new SystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP));
 			return false;
 		}
 		
 		getEffected().reduceCurrentMp(manaDam);
 		return true;
 	}
-	
 }

+ 0 - 1
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectSleep.java

@@ -25,7 +25,6 @@ import com.l2jserver.gameserver.templates.skills.L2EffectType;
  */
 public class EffectSleep extends L2Effect
 {
-	
 	public EffectSleep(Env env, EffectTemplate template)
 	{
 		super(env, template);

+ 0 - 7
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectSpoil.java

@@ -87,13 +87,6 @@ public class EffectSpoil extends L2Effect
 				target.setIsSpoiledBy(getEffector().getObjectId());
 				getEffector().sendPacket(new SystemMessage(SystemMessageId.SPOIL_SUCCESS));
 			}
-			else
-			{
-				SystemMessage sm = new SystemMessage(SystemMessageId.C1_RESISTED_YOUR_S2);
-				sm.addCharName(target);
-				sm.addSkillName(getSkill().getDisplayId());
-				getEffector().sendPacket(sm);
-			}
 			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, getEffector());
 		}
 		return true;

+ 0 - 1
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectStun.java

@@ -27,7 +27,6 @@ import com.l2jserver.gameserver.templates.skills.L2EffectType;
  */
 public class EffectStun extends L2Effect
 {
-	
 	public EffectStun(Env env, EffectTemplate template)
 	{
 		super(env, template);

+ 0 - 1
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectThrowUp.java

@@ -27,7 +27,6 @@ import com.l2jserver.gameserver.skills.Env;
 import com.l2jserver.gameserver.templates.effects.EffectTemplate;
 import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
-
 public class EffectThrowUp extends L2Effect
 {
 	static final Logger _log = Logger.getLogger(EffectThrowUp.class.getName());

+ 1 - 6
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectWarp.java

@@ -50,7 +50,6 @@ import com.l2jserver.gameserver.util.Util;
  */
 public class EffectWarp extends L2Effect
 {
-	
 	private int x, y, z;
 	private L2Character _actor;
 	
@@ -76,11 +75,7 @@ public class EffectWarp extends L2Effect
 	@Override
 	public boolean onStart()
 	{
-		
-		if (isSelfEffect())
-			_actor = getEffector();
-		else
-			_actor = getEffected();
+		_actor = isSelfEffect() ? getEffector() : getEffected();
 		
 		int _radius = getSkill().getFlyRadius();