Fixed Refined Ring of Core usage.

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java

@@ -133,5 +133,6 @@ public class SkillConditionMasterHandler
 		SkillConditionHandler.getInstance().registerHandler("CanSummonMulti", CanSummonMultiSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("OpTargetMyPledgeAcademy", OpTargetMyPledgeAcademySkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("OpCheckFlag", OpCheckFlagSkillCondition::new);
+		SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new);
 	}
 }

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Fear.java

@@ -27,6 +27,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2DefenderInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2FortCommanderInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2SiegeFlagInstance;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
+import com.l2jmobius.gameserver.model.effects.EffectFlag;
 import com.l2jmobius.gameserver.model.skills.Skill;
 import com.l2jmobius.gameserver.util.Util;
 
@@ -43,6 +44,12 @@ public final class Fear extends AbstractEffect
 		
 	}
 	
+	@Override
+	public long getEffectFlags()
+	{
+		return EffectFlag.FEAR.getMask();
+	}
+	
 	@Override
 	public boolean canStart(L2Character effector, L2Character effected, Skill skill)
 	{

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java

@@ -0,0 +1,40 @@
+/*
+ * 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 com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.StatsSet;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.effects.EffectFlag;
+import com.l2jmobius.gameserver.model.skills.ISkillCondition;
+import com.l2jmobius.gameserver.model.skills.Skill;
+
+/**
+ * @author Mobius
+ */
+public class NotFearedSkillCondition implements ISkillCondition
+{
+	public NotFearedSkillCondition(StatsSet params)
+	{
+	}
+	
+	@Override
+	public boolean canUse(L2Character caster, Skill skill, L2Object target)
+	{
+		return (target != null) && target.isCharacter() && !((L2Character) target).isAffected(EffectFlag.FEAR);
+	}
+}

L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/04000-04099.xml

@@ -2581,7 +2581,9 @@
 					<value level="12">873</value>
 				</power>
 			</effect>
-			<effect name="BlockActions" />
+			<effect name="BlockActions">
+				<allowedSkills>10279;10517;10025;10776;11770;1904;11264;11093;13314;1912</allowedSkills>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4073" toLevel="12" name="Stun">
@@ -2650,7 +2652,9 @@
 					<value level="12">873</value>
 				</power>
 			</effect>
-			<effect name="BlockActions" />
+			<effect name="BlockActions">
+				<allowedSkills>10279;10517;10025;10776;11770;1904;11264;11093;13314;1912</allowedSkills>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4074" toLevel="2" name="Haste">

L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java

@@ -192,7 +192,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	private boolean _isFlying = false;
 	
 	private boolean _blockActions = false;
-	private volatile Map<Integer, AtomicInteger> _blockActionsAllowedSkills;
+	private volatile Map<Integer, AtomicInteger> _blockActionsAllowedSkills = new ConcurrentHashMap<>();
 	
 	private CharStat _stat;
 	private CharStatus _status;
@@ -5197,30 +5197,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	
 	public void addBlockActionsAllowedSkill(int skillId)
 	{
-		if (_blockActionsAllowedSkills == null)
-		{
-			synchronized (this)
-			{
-				if (_blockActionsAllowedSkills == null)
-				{
-					_blockActionsAllowedSkills = new ConcurrentHashMap<>();
-				}
-			}
-		}
 		_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
 	}
 	
 	public void removeBlockActionsAllowedSkill(int skillId)
 	{
-		if (_blockActionsAllowedSkills != null)
+		_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
-		{
-			_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
-		}
 	}
 	
 	public boolean isBlockedActionsAllowedSkill(Skill skill)
 	{
-		return (_blockActionsAllowedSkills != null) && _blockActionsAllowedSkills.containsKey(skill.getId());
+		return _blockActionsAllowedSkills.containsKey(skill.getId());
 	}
 	
 	/**

L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/effects/EffectFlag.java

@@ -56,7 +56,8 @@ public enum EffectFlag
 	PROTECT_DEATH_PENALTY,
 	CHAT_BLOCK,
 	FAKE_DEATH,
-	DUELIST_FURY;
+	DUELIST_FURY,
+	FEAR;
 	
 	public long getMask()
 	{

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java

@@ -133,5 +133,6 @@ public class SkillConditionMasterHandler
 		SkillConditionHandler.getInstance().registerHandler("CanSummonMulti", CanSummonMultiSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("OpTargetMyPledgeAcademy", OpTargetMyPledgeAcademySkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("OpCheckFlag", OpCheckFlagSkillCondition::new);
+		SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new);
 	}
 }

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Fear.java

@@ -27,6 +27,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2DefenderInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2FortCommanderInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2SiegeFlagInstance;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
+import com.l2jmobius.gameserver.model.effects.EffectFlag;
 import com.l2jmobius.gameserver.model.skills.Skill;
 import com.l2jmobius.gameserver.util.Util;
 
@@ -43,6 +44,12 @@ public final class Fear extends AbstractEffect
 		
 	}
 	
+	@Override
+	public long getEffectFlags()
+	{
+		return EffectFlag.FEAR.getMask();
+	}
+	
 	@Override
 	public boolean canStart(L2Character effector, L2Character effected, Skill skill)
 	{

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java

@@ -0,0 +1,40 @@
+/*
+ * 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 com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.StatsSet;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.effects.EffectFlag;
+import com.l2jmobius.gameserver.model.skills.ISkillCondition;
+import com.l2jmobius.gameserver.model.skills.Skill;
+
+/**
+ * @author Mobius
+ */
+public class NotFearedSkillCondition implements ISkillCondition
+{
+	public NotFearedSkillCondition(StatsSet params)
+	{
+	}
+	
+	@Override
+	public boolean canUse(L2Character caster, Skill skill, L2Object target)
+	{
+		return (target != null) && target.isCharacter() && !((L2Character) target).isAffected(EffectFlag.FEAR);
+	}
+}

L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/04000-04099.xml

@@ -2581,7 +2581,9 @@
 					<value level="12">873</value>
 				</power>
 			</effect>
-			<effect name="BlockActions" />
+			<effect name="BlockActions">
+				<allowedSkills>10279;10517;10025;10776;11770;1904;11264;11093;13314;1912</allowedSkills>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4073" toLevel="12" name="Stun">
@@ -2650,7 +2652,9 @@
 					<value level="12">873</value>
 				</power>
 			</effect>
-			<effect name="BlockActions" />
+			<effect name="BlockActions">
+				<allowedSkills>10279;10517;10025;10776;11770;1904;11264;11093;13314;1912</allowedSkills>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4074" toLevel="2" name="Haste">

L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java

@@ -192,7 +192,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	private boolean _isFlying = false;
 	
 	private boolean _blockActions = false;
-	private volatile Map<Integer, AtomicInteger> _blockActionsAllowedSkills;
+	private volatile Map<Integer, AtomicInteger> _blockActionsAllowedSkills = new ConcurrentHashMap<>();
 	
 	private CharStat _stat;
 	private CharStatus _status;
@@ -5197,30 +5197,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	
 	public void addBlockActionsAllowedSkill(int skillId)
 	{
-		if (_blockActionsAllowedSkills == null)
-		{
-			synchronized (this)
-			{
-				if (_blockActionsAllowedSkills == null)
-				{
-					_blockActionsAllowedSkills = new ConcurrentHashMap<>();
-				}
-			}
-		}
 		_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
 	}
 	
 	public void removeBlockActionsAllowedSkill(int skillId)
 	{
-		if (_blockActionsAllowedSkills != null)
+		_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
-		{
-			_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
-		}
 	}
 	
 	public boolean isBlockedActionsAllowedSkill(Skill skill)
 	{
-		return (_blockActionsAllowedSkills != null) && _blockActionsAllowedSkills.containsKey(skill.getId());
+		return _blockActionsAllowedSkills.containsKey(skill.getId());
 	}
 	
 	/**

L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/effects/EffectFlag.java

@@ -56,7 +56,8 @@ public enum EffectFlag
 	PROTECT_DEATH_PENALTY,
 	CHAT_BLOCK,
 	FAKE_DEATH,
-	DUELIST_FURY;
+	DUELIST_FURY,
+	FEAR;
 	
 	public long getMask()
 	{

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java

@@ -133,5 +133,6 @@ public class SkillConditionMasterHandler
 		SkillConditionHandler.getInstance().registerHandler("CanSummonMulti", CanSummonMultiSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("OpTargetMyPledgeAcademy", OpTargetMyPledgeAcademySkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("OpCheckFlag", OpCheckFlagSkillCondition::new);
+		SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new);
 	}
 }

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Fear.java

@@ -27,6 +27,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2DefenderInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2FortCommanderInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2SiegeFlagInstance;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
+import com.l2jmobius.gameserver.model.effects.EffectFlag;
 import com.l2jmobius.gameserver.model.skills.Skill;
 import com.l2jmobius.gameserver.util.Util;
 
@@ -43,6 +44,12 @@ public final class Fear extends AbstractEffect
 		
 	}
 	
+	@Override
+	public long getEffectFlags()
+	{
+		return EffectFlag.FEAR.getMask();
+	}
+	
 	@Override
 	public boolean canStart(L2Character effector, L2Character effected, Skill skill)
 	{

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java

@@ -0,0 +1,40 @@
+/*
+ * 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 com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.StatsSet;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.effects.EffectFlag;
+import com.l2jmobius.gameserver.model.skills.ISkillCondition;
+import com.l2jmobius.gameserver.model.skills.Skill;
+
+/**
+ * @author Mobius
+ */
+public class NotFearedSkillCondition implements ISkillCondition
+{
+	public NotFearedSkillCondition(StatsSet params)
+	{
+	}
+	
+	@Override
+	public boolean canUse(L2Character caster, Skill skill, L2Object target)
+	{
+		return (target != null) && target.isCharacter() && !((L2Character) target).isAffected(EffectFlag.FEAR);
+	}
+}

L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/04000-04099.xml

@@ -2581,7 +2581,9 @@
 					<value level="12">873</value>
 				</power>
 			</effect>
-			<effect name="BlockActions" />
+			<effect name="BlockActions">
+				<allowedSkills>10279;10517;10025;10776;11770;1904;11264;11093;13314;1912</allowedSkills>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4073" toLevel="12" name="Stun">
@@ -2650,7 +2652,9 @@
 					<value level="12">873</value>
 				</power>
 			</effect>
-			<effect name="BlockActions" />
+			<effect name="BlockActions">
+				<allowedSkills>10279;10517;10025;10776;11770;1904;11264;11093;13314;1912</allowedSkills>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4074" toLevel="2" name="Haste">

L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java

@@ -192,7 +192,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	private boolean _isFlying = false;
 	
 	private boolean _blockActions = false;
-	private volatile Map<Integer, AtomicInteger> _blockActionsAllowedSkills;
+	private volatile Map<Integer, AtomicInteger> _blockActionsAllowedSkills = new ConcurrentHashMap<>();
 	
 	private CharStat _stat;
 	private CharStatus _status;
@@ -5197,30 +5197,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	
 	public void addBlockActionsAllowedSkill(int skillId)
 	{
-		if (_blockActionsAllowedSkills == null)
-		{
-			synchronized (this)
-			{
-				if (_blockActionsAllowedSkills == null)
-				{
-					_blockActionsAllowedSkills = new ConcurrentHashMap<>();
-				}
-			}
-		}
 		_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
 	}
 	
 	public void removeBlockActionsAllowedSkill(int skillId)
 	{
-		if (_blockActionsAllowedSkills != null)
+		_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
-		{
-			_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
-		}
 	}
 	
 	public boolean isBlockedActionsAllowedSkill(Skill skill)
 	{
-		return (_blockActionsAllowedSkills != null) && _blockActionsAllowedSkills.containsKey(skill.getId());
+		return _blockActionsAllowedSkills.containsKey(skill.getId());
 	}
 	
 	/**

L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/effects/EffectFlag.java

@@ -56,7 +56,8 @@ public enum EffectFlag
 	PROTECT_DEATH_PENALTY,
 	CHAT_BLOCK,
 	FAKE_DEATH,
-	DUELIST_FURY;
+	DUELIST_FURY,
+	FEAR;
 	
 	public long getMask()
 	{

L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java

@@ -133,5 +133,6 @@ public class SkillConditionMasterHandler
 		SkillConditionHandler.getInstance().registerHandler("CanSummonMulti", CanSummonMultiSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("OpTargetMyPledgeAcademy", OpTargetMyPledgeAcademySkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("OpCheckFlag", OpCheckFlagSkillCondition::new);
+		SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new);
 	}
 }

L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Fear.java

@@ -27,6 +27,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2DefenderInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2FortCommanderInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2SiegeFlagInstance;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
+import com.l2jmobius.gameserver.model.effects.EffectFlag;
 import com.l2jmobius.gameserver.model.skills.Skill;
 import com.l2jmobius.gameserver.util.Util;
 
@@ -43,6 +44,12 @@ public final class Fear extends AbstractEffect
 		
 	}
 	
+	@Override
+	public long getEffectFlags()
+	{
+		return EffectFlag.FEAR.getMask();
+	}
+	
 	@Override
 	public boolean canStart(L2Character effector, L2Character effected, Skill skill)
 	{

L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java

@@ -0,0 +1,40 @@
+/*
+ * 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 com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.StatsSet;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.effects.EffectFlag;
+import com.l2jmobius.gameserver.model.skills.ISkillCondition;
+import com.l2jmobius.gameserver.model.skills.Skill;
+
+/**
+ * @author Mobius
+ */
+public class NotFearedSkillCondition implements ISkillCondition
+{
+	public NotFearedSkillCondition(StatsSet params)
+	{
+	}
+	
+	@Override
+	public boolean canUse(L2Character caster, Skill skill, L2Object target)
+	{
+		return (target != null) && target.isCharacter() && !((L2Character) target).isAffected(EffectFlag.FEAR);
+	}
+}

L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/04000-04099.xml

@@ -2581,7 +2581,9 @@
 					<value level="12">873</value>
 				</power>
 			</effect>
-			<effect name="BlockActions" />
+			<effect name="BlockActions">
+				<allowedSkills>10279;10517;10025;10776;11770;1904;11264;11093;13314;1912</allowedSkills>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4073" toLevel="12" name="Stun">
@@ -2650,7 +2652,9 @@
 					<value level="12">873</value>
 				</power>
 			</effect>
-			<effect name="BlockActions" />
+			<effect name="BlockActions">
+				<allowedSkills>10279;10517;10025;10776;11770;1904;11264;11093;13314;1912</allowedSkills>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4074" toLevel="2" name="Haste">

L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java

@@ -192,7 +192,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	private boolean _isFlying = false;
 	
 	private boolean _blockActions = false;
-	private volatile Map<Integer, AtomicInteger> _blockActionsAllowedSkills;
+	private volatile Map<Integer, AtomicInteger> _blockActionsAllowedSkills = new ConcurrentHashMap<>();
 	
 	private CharStat _stat;
 	private CharStatus _status;
@@ -5197,30 +5197,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	
 	public void addBlockActionsAllowedSkill(int skillId)
 	{
-		if (_blockActionsAllowedSkills == null)
-		{
-			synchronized (this)
-			{
-				if (_blockActionsAllowedSkills == null)
-				{
-					_blockActionsAllowedSkills = new ConcurrentHashMap<>();
-				}
-			}
-		}
 		_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
 	}
 	
 	public void removeBlockActionsAllowedSkill(int skillId)
 	{
-		if (_blockActionsAllowedSkills != null)
+		_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
-		{
-			_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
-		}
 	}
 	
 	public boolean isBlockedActionsAllowedSkill(Skill skill)
 	{
-		return (_blockActionsAllowedSkills != null) && _blockActionsAllowedSkills.containsKey(skill.getId());
+		return _blockActionsAllowedSkills.containsKey(skill.getId());
 	}
 	
 	/**

L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/effects/EffectFlag.java

@@ -56,7 +56,8 @@ public enum EffectFlag
 	PROTECT_DEATH_PENALTY,
 	CHAT_BLOCK,
 	FAKE_DEATH,
-	DUELIST_FURY;
+	DUELIST_FURY,
+	FEAR;
 	
 	public long getMask()
 	{

L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java

@@ -133,5 +133,6 @@ public class SkillConditionMasterHandler
 		SkillConditionHandler.getInstance().registerHandler("CanSummonMulti", CanSummonMultiSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("OpTargetMyPledgeAcademy", OpTargetMyPledgeAcademySkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("OpCheckFlag", OpCheckFlagSkillCondition::new);
+		SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new);
 	}
 }

L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Fear.java

@@ -27,6 +27,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2DefenderInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2FortCommanderInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2SiegeFlagInstance;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
+import com.l2jmobius.gameserver.model.effects.EffectFlag;
 import com.l2jmobius.gameserver.model.skills.Skill;
 import com.l2jmobius.gameserver.util.Util;
 
@@ -43,6 +44,12 @@ public final class Fear extends AbstractEffect
 		
 	}
 	
+	@Override
+	public long getEffectFlags()
+	{
+		return EffectFlag.FEAR.getMask();
+	}
+	
 	@Override
 	public boolean canStart(L2Character effector, L2Character effected, Skill skill)
 	{

L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java

@@ -0,0 +1,40 @@
+/*
+ * 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 com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.StatsSet;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.effects.EffectFlag;
+import com.l2jmobius.gameserver.model.skills.ISkillCondition;
+import com.l2jmobius.gameserver.model.skills.Skill;
+
+/**
+ * @author Mobius
+ */
+public class NotFearedSkillCondition implements ISkillCondition
+{
+	public NotFearedSkillCondition(StatsSet params)
+	{
+	}
+	
+	@Override
+	public boolean canUse(L2Character caster, Skill skill, L2Object target)
+	{
+		return (target != null) && target.isCharacter() && !((L2Character) target).isAffected(EffectFlag.FEAR);
+	}
+}

L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/04000-04099.xml

@@ -2581,7 +2581,9 @@
 					<value level="12">873</value>
 				</power>
 			</effect>
-			<effect name="BlockActions" />
+			<effect name="BlockActions">
+				<allowedSkills>10279;10517;10025;10776;11770;1904;11264;11093;13314;1912</allowedSkills>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4073" toLevel="12" name="Stun">
@@ -2650,7 +2652,9 @@
 					<value level="12">873</value>
 				</power>
 			</effect>
-			<effect name="BlockActions" />
+			<effect name="BlockActions">
+				<allowedSkills>10279;10517;10025;10776;11770;1904;11264;11093;13314;1912</allowedSkills>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4074" toLevel="2" name="Haste">

L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/L2Character.java

@@ -192,7 +192,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	private boolean _isFlying = false;
 	
 	private boolean _blockActions = false;
-	private volatile Map<Integer, AtomicInteger> _blockActionsAllowedSkills;
+	private volatile Map<Integer, AtomicInteger> _blockActionsAllowedSkills = new ConcurrentHashMap<>();
 	
 	private CharStat _stat;
 	private CharStatus _status;
@@ -5197,30 +5197,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	
 	public void addBlockActionsAllowedSkill(int skillId)
 	{
-		if (_blockActionsAllowedSkills == null)
-		{
-			synchronized (this)
-			{
-				if (_blockActionsAllowedSkills == null)
-				{
-					_blockActionsAllowedSkills = new ConcurrentHashMap<>();
-				}
-			}
-		}
 		_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
 	}
 	
 	public void removeBlockActionsAllowedSkill(int skillId)
 	{
-		if (_blockActionsAllowedSkills != null)
+		_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
-		{
-			_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
-		}
 	}
 	
 	public boolean isBlockedActionsAllowedSkill(Skill skill)
 	{
-		return (_blockActionsAllowedSkills != null) && _blockActionsAllowedSkills.containsKey(skill.getId());
+		return _blockActionsAllowedSkills.containsKey(skill.getId());
 	}
 	
 	/**

L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/effects/EffectFlag.java

@@ -56,7 +56,8 @@ public enum EffectFlag
 	PROTECT_DEATH_PENALTY,
 	CHAT_BLOCK,
 	FAKE_DEATH,
-	DUELIST_FURY;
+	DUELIST_FURY,
+	FEAR;
 	
 	public long getMask()
 	{

L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java

@@ -133,5 +133,6 @@ public class SkillConditionMasterHandler
 		SkillConditionHandler.getInstance().registerHandler("CanSummonMulti", CanSummonMultiSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("OpTargetMyPledgeAcademy", OpTargetMyPledgeAcademySkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("OpCheckFlag", OpCheckFlagSkillCondition::new);
+		SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new);
 	}
 }

L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Fear.java

@@ -27,6 +27,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2DefenderInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2FortCommanderInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2SiegeFlagInstance;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
+import com.l2jmobius.gameserver.model.effects.EffectFlag;
 import com.l2jmobius.gameserver.model.skills.Skill;
 import com.l2jmobius.gameserver.util.Util;
 
@@ -43,6 +44,12 @@ public final class Fear extends AbstractEffect
 		
 	}
 	
+	@Override
+	public long getEffectFlags()
+	{
+		return EffectFlag.FEAR.getMask();
+	}
+	
 	@Override
 	public boolean canStart(L2Character effector, L2Character effected, Skill skill)
 	{

L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java

@@ -0,0 +1,40 @@
+/*
+ * 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 com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.StatsSet;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.effects.EffectFlag;
+import com.l2jmobius.gameserver.model.skills.ISkillCondition;
+import com.l2jmobius.gameserver.model.skills.Skill;
+
+/**
+ * @author Mobius
+ */
+public class NotFearedSkillCondition implements ISkillCondition
+{
+	public NotFearedSkillCondition(StatsSet params)
+	{
+	}
+	
+	@Override
+	public boolean canUse(L2Character caster, Skill skill, L2Object target)
+	{
+		return (target != null) && target.isCharacter() && !((L2Character) target).isAffected(EffectFlag.FEAR);
+	}
+}

L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/04000-04099.xml

@@ -2581,7 +2581,9 @@
 					<value level="12">873</value>
 				</power>
 			</effect>
-			<effect name="BlockActions" />
+			<effect name="BlockActions">
+				<allowedSkills>10279;10517;10025;10776;11770;1904;11264;11093;13314;1912</allowedSkills>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4073" toLevel="12" name="Stun">
@@ -2650,7 +2652,9 @@
 					<value level="12">873</value>
 				</power>
 			</effect>
-			<effect name="BlockActions" />
+			<effect name="BlockActions">
+				<allowedSkills>10279;10517;10025;10776;11770;1904;11264;11093;13314;1912</allowedSkills>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4074" toLevel="2" name="Haste">

L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/L2Character.java

@@ -192,7 +192,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	private boolean _isFlying = false;
 	
 	private boolean _blockActions = false;
-	private volatile Map<Integer, AtomicInteger> _blockActionsAllowedSkills;
+	private volatile Map<Integer, AtomicInteger> _blockActionsAllowedSkills = new ConcurrentHashMap<>();
 	
 	private CharStat _stat;
 	private CharStatus _status;
@@ -5197,30 +5197,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	
 	public void addBlockActionsAllowedSkill(int skillId)
 	{
-		if (_blockActionsAllowedSkills == null)
-		{
-			synchronized (this)
-			{
-				if (_blockActionsAllowedSkills == null)
-				{
-					_blockActionsAllowedSkills = new ConcurrentHashMap<>();
-				}
-			}
-		}
 		_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
 	}
 	
 	public void removeBlockActionsAllowedSkill(int skillId)
 	{
-		if (_blockActionsAllowedSkills != null)
+		_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
-		{
-			_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
-		}
 	}
 	
 	public boolean isBlockedActionsAllowedSkill(Skill skill)
 	{
-		return (_blockActionsAllowedSkills != null) && _blockActionsAllowedSkills.containsKey(skill.getId());
+		return _blockActionsAllowedSkills.containsKey(skill.getId());
 	}
 	
 	/**

L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/effects/EffectFlag.java

@@ -56,7 +56,8 @@ public enum EffectFlag
 	PROTECT_DEATH_PENALTY,
 	CHAT_BLOCK,
 	FAKE_DEATH,
-	DUELIST_FURY;
+	DUELIST_FURY,
+	FEAR;
 	
 	public long getMask()
 	{

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java

@@ -133,5 +133,6 @@ public class SkillConditionMasterHandler
 		SkillConditionHandler.getInstance().registerHandler("CanSummonMulti", CanSummonMultiSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("OpTargetMyPledgeAcademy", OpTargetMyPledgeAcademySkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("OpCheckFlag", OpCheckFlagSkillCondition::new);
+		SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new);
 	}
 }

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Fear.java

@@ -27,6 +27,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2DefenderInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2FortCommanderInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2SiegeFlagInstance;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
+import com.l2jmobius.gameserver.model.effects.EffectFlag;
 import com.l2jmobius.gameserver.model.skills.Skill;
 import com.l2jmobius.gameserver.util.Util;
 
@@ -43,6 +44,12 @@ public final class Fear extends AbstractEffect
 		
 	}
 	
+	@Override
+	public long getEffectFlags()
+	{
+		return EffectFlag.FEAR.getMask();
+	}
+	
 	@Override
 	public boolean canStart(L2Character effector, L2Character effected, Skill skill)
 	{

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java

@@ -0,0 +1,40 @@
+/*
+ * 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 com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.StatsSet;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.effects.EffectFlag;
+import com.l2jmobius.gameserver.model.skills.ISkillCondition;
+import com.l2jmobius.gameserver.model.skills.Skill;
+
+/**
+ * @author Mobius
+ */
+public class NotFearedSkillCondition implements ISkillCondition
+{
+	public NotFearedSkillCondition(StatsSet params)
+	{
+	}
+	
+	@Override
+	public boolean canUse(L2Character caster, Skill skill, L2Object target)
+	{
+		return (target != null) && target.isCharacter() && !((L2Character) target).isAffected(EffectFlag.FEAR);
+	}
+}

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/04000-04099.xml

@@ -2570,7 +2570,9 @@
 					<value level="12">873</value>
 				</power>
 			</effect>
-			<effect name="BlockActions" />
+			<effect name="BlockActions">
+				<allowedSkills>35016</allowedSkills>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4073" toLevel="12" name="Stun">
@@ -2639,7 +2641,9 @@
 					<value level="12">873</value>
 				</power>
 			</effect>
-			<effect name="BlockActions" />
+			<effect name="BlockActions">
+				<allowedSkills>35016</allowedSkills>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4074" toLevel="2" name="Haste">

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/35000-35099.xml

@@ -218,6 +218,10 @@
 		<isMagic>1</isMagic>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<canCastWhileDisabled>true</canCastWhileDisabled>
+		<conditions>
+			<condition name="NotFeared" />
+		</conditions>
 		<effects>
 			<effect name="DispelByCategory">
 				<slot>DEBUFF</slot>

L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java

@@ -192,7 +192,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	private boolean _isFlying = false;
 	
 	private boolean _blockActions = false;
-	private volatile Map<Integer, AtomicInteger> _blockActionsAllowedSkills;
+	private volatile Map<Integer, AtomicInteger> _blockActionsAllowedSkills = new ConcurrentHashMap<>();
 	
 	private CharStat _stat;
 	private CharStatus _status;
@@ -5196,30 +5196,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	
 	public void addBlockActionsAllowedSkill(int skillId)
 	{
-		if (_blockActionsAllowedSkills == null)
-		{
-			synchronized (this)
-			{
-				if (_blockActionsAllowedSkills == null)
-				{
-					_blockActionsAllowedSkills = new ConcurrentHashMap<>();
-				}
-			}
-		}
 		_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
 	}
 	
 	public void removeBlockActionsAllowedSkill(int skillId)
 	{
-		if (_blockActionsAllowedSkills != null)
+		_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
-		{
-			_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
-		}
 	}
 	
 	public boolean isBlockedActionsAllowedSkill(Skill skill)
 	{
-		return (_blockActionsAllowedSkills != null) && _blockActionsAllowedSkills.containsKey(skill.getId());
+		return _blockActionsAllowedSkills.containsKey(skill.getId());
 	}
 	
 	/**

L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/effects/EffectFlag.java

@@ -56,7 +56,8 @@ public enum EffectFlag
 	PROTECT_DEATH_PENALTY,
 	CHAT_BLOCK,
 	FAKE_DEATH,
-	DUELIST_FURY;
+	DUELIST_FURY,
+	FEAR;
 	
 	public long getMask()
 	{

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java

@@ -133,5 +133,6 @@ public class SkillConditionMasterHandler
 		SkillConditionHandler.getInstance().registerHandler("CanSummonMulti", CanSummonMultiSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("OpTargetMyPledgeAcademy", OpTargetMyPledgeAcademySkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("OpCheckFlag", OpCheckFlagSkillCondition::new);
+		SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new);
 	}
 }

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Fear.java

@@ -27,6 +27,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2DefenderInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2FortCommanderInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2SiegeFlagInstance;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
+import com.l2jmobius.gameserver.model.effects.EffectFlag;
 import com.l2jmobius.gameserver.model.skills.Skill;
 import com.l2jmobius.gameserver.util.Util;
 
@@ -43,6 +44,12 @@ public final class Fear extends AbstractEffect
 		
 	}
 	
+	@Override
+	public long getEffectFlags()
+	{
+		return EffectFlag.FEAR.getMask();
+	}
+	
 	@Override
 	public boolean canStart(L2Character effector, L2Character effected, Skill skill)
 	{

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java

@@ -0,0 +1,40 @@
+/*
+ * 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 com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.StatsSet;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.effects.EffectFlag;
+import com.l2jmobius.gameserver.model.skills.ISkillCondition;
+import com.l2jmobius.gameserver.model.skills.Skill;
+
+/**
+ * @author Mobius
+ */
+public class NotFearedSkillCondition implements ISkillCondition
+{
+	public NotFearedSkillCondition(StatsSet params)
+	{
+	}
+	
+	@Override
+	public boolean canUse(L2Character caster, Skill skill, L2Object target)
+	{
+		return (target != null) && target.isCharacter() && !((L2Character) target).isAffected(EffectFlag.FEAR);
+	}
+}

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/04000-04099.xml

@@ -2570,7 +2570,9 @@
 					<value level="12">873</value>
 				</power>
 			</effect>
-			<effect name="BlockActions" />
+			<effect name="BlockActions">
+				<allowedSkills>35016</allowedSkills>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4073" toLevel="12" name="Stun">
@@ -2639,7 +2641,9 @@
 					<value level="12">873</value>
 				</power>
 			</effect>
-			<effect name="BlockActions" />
+			<effect name="BlockActions">
+				<allowedSkills>35016</allowedSkills>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4074" toLevel="2" name="Haste">

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/35000-35099.xml

@@ -218,6 +218,10 @@
 		<isMagic>1</isMagic>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<canCastWhileDisabled>true</canCastWhileDisabled>
+		<conditions>
+			<condition name="NotFeared" />
+		</conditions>
 		<effects>
 			<effect name="DispelByCategory">
 				<slot>DEBUFF</slot>

L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java

@@ -192,7 +192,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	private boolean _isFlying = false;
 	
 	private boolean _blockActions = false;
-	private volatile Map<Integer, AtomicInteger> _blockActionsAllowedSkills;
+	private volatile Map<Integer, AtomicInteger> _blockActionsAllowedSkills = new ConcurrentHashMap<>();
 	
 	private CharStat _stat;
 	private CharStatus _status;
@@ -5196,30 +5196,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	
 	public void addBlockActionsAllowedSkill(int skillId)
 	{
-		if (_blockActionsAllowedSkills == null)
-		{
-			synchronized (this)
-			{
-				if (_blockActionsAllowedSkills == null)
-				{
-					_blockActionsAllowedSkills = new ConcurrentHashMap<>();
-				}
-			}
-		}
 		_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
 	}
 	
 	public void removeBlockActionsAllowedSkill(int skillId)
 	{
-		if (_blockActionsAllowedSkills != null)
+		_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
-		{
-			_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
-		}
 	}
 	
 	public boolean isBlockedActionsAllowedSkill(Skill skill)
 	{
-		return (_blockActionsAllowedSkills != null) && _blockActionsAllowedSkills.containsKey(skill.getId());
+		return _blockActionsAllowedSkills.containsKey(skill.getId());
 	}
 	
 	/**

L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/effects/EffectFlag.java

@@ -56,7 +56,8 @@ public enum EffectFlag
 	PROTECT_DEATH_PENALTY,
 	CHAT_BLOCK,
 	FAKE_DEATH,
-	DUELIST_FURY;
+	DUELIST_FURY,
+	FEAR;
 	
 	public long getMask()
 	{

L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java

@@ -133,5 +133,6 @@ public class SkillConditionMasterHandler
 		SkillConditionHandler.getInstance().registerHandler("CanSummonMulti", CanSummonMultiSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("OpTargetMyPledgeAcademy", OpTargetMyPledgeAcademySkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("OpCheckFlag", OpCheckFlagSkillCondition::new);
+		SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new);
 	}
 }

L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Fear.java

@@ -27,6 +27,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2DefenderInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2FortCommanderInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2SiegeFlagInstance;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
+import com.l2jmobius.gameserver.model.effects.EffectFlag;
 import com.l2jmobius.gameserver.model.skills.Skill;
 import com.l2jmobius.gameserver.util.Util;
 
@@ -43,6 +44,12 @@ public final class Fear extends AbstractEffect
 		
 	}
 	
+	@Override
+	public long getEffectFlags()
+	{
+		return EffectFlag.FEAR.getMask();
+	}
+	
 	@Override
 	public boolean canStart(L2Character effector, L2Character effected, Skill skill)
 	{

L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java

@@ -0,0 +1,40 @@
+/*
+ * 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 com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.StatsSet;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.effects.EffectFlag;
+import com.l2jmobius.gameserver.model.skills.ISkillCondition;
+import com.l2jmobius.gameserver.model.skills.Skill;
+
+/**
+ * @author Mobius
+ */
+public class NotFearedSkillCondition implements ISkillCondition
+{
+	public NotFearedSkillCondition(StatsSet params)
+	{
+	}
+	
+	@Override
+	public boolean canUse(L2Character caster, Skill skill, L2Object target)
+	{
+		return (target != null) && target.isCharacter() && !((L2Character) target).isAffected(EffectFlag.FEAR);
+	}
+}

L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/04000-04099.xml

@@ -2570,7 +2570,9 @@
 					<value level="12">873</value>
 				</power>
 			</effect>
-			<effect name="BlockActions" />
+			<effect name="BlockActions">
+				<allowedSkills>35016</allowedSkills>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4073" toLevel="12" name="Stun">
@@ -2639,7 +2641,9 @@
 					<value level="12">873</value>
 				</power>
 			</effect>
-			<effect name="BlockActions" />
+			<effect name="BlockActions">
+				<allowedSkills>35016</allowedSkills>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4074" toLevel="2" name="Haste">

L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/35000-35099.xml

@@ -218,6 +218,10 @@
 		<isMagic>1</isMagic>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<canCastWhileDisabled>true</canCastWhileDisabled>
+		<conditions>
+			<condition name="NotFeared" />
+		</conditions>
 		<effects>
 			<effect name="DispelByCategory">
 				<slot>DEBUFF</slot>

L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java

@@ -192,7 +192,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	private boolean _isFlying = false;
 	
 	private boolean _blockActions = false;
-	private volatile Map<Integer, AtomicInteger> _blockActionsAllowedSkills;
+	private volatile Map<Integer, AtomicInteger> _blockActionsAllowedSkills = new ConcurrentHashMap<>();
 	
 	private CharStat _stat;
 	private CharStatus _status;
@@ -5196,30 +5196,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	
 	public void addBlockActionsAllowedSkill(int skillId)
 	{
-		if (_blockActionsAllowedSkills == null)
-		{
-			synchronized (this)
-			{
-				if (_blockActionsAllowedSkills == null)
-				{
-					_blockActionsAllowedSkills = new ConcurrentHashMap<>();
-				}
-			}
-		}
 		_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
 	}
 	
 	public void removeBlockActionsAllowedSkill(int skillId)
 	{
-		if (_blockActionsAllowedSkills != null)
+		_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
-		{
-			_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
-		}
 	}
 	
 	public boolean isBlockedActionsAllowedSkill(Skill skill)
 	{
-		return (_blockActionsAllowedSkills != null) && _blockActionsAllowedSkills.containsKey(skill.getId());
+		return _blockActionsAllowedSkills.containsKey(skill.getId());
 	}
 	
 	/**

L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/effects/EffectFlag.java

@@ -56,7 +56,8 @@ public enum EffectFlag
 	PROTECT_DEATH_PENALTY,
 	CHAT_BLOCK,
 	FAKE_DEATH,
-	DUELIST_FURY;
+	DUELIST_FURY,
+	FEAR;
 	
 	public long getMask()
 	{

L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java

@@ -133,5 +133,6 @@ public class SkillConditionMasterHandler
 		SkillConditionHandler.getInstance().registerHandler("CanSummonMulti", CanSummonMultiSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("OpTargetMyPledgeAcademy", OpTargetMyPledgeAcademySkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("OpCheckFlag", OpCheckFlagSkillCondition::new);
+		SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new);
 	}
 }

L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Fear.java

@@ -27,6 +27,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2DefenderInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2FortCommanderInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2SiegeFlagInstance;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
+import com.l2jmobius.gameserver.model.effects.EffectFlag;
 import com.l2jmobius.gameserver.model.skills.Skill;
 import com.l2jmobius.gameserver.util.Util;
 
@@ -43,6 +44,12 @@ public final class Fear extends AbstractEffect
 		
 	}
 	
+	@Override
+	public long getEffectFlags()
+	{
+		return EffectFlag.FEAR.getMask();
+	}
+	
 	@Override
 	public boolean canStart(L2Character effector, L2Character effected, Skill skill)
 	{

L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java

@@ -0,0 +1,40 @@
+/*
+ * 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 com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.StatsSet;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.effects.EffectFlag;
+import com.l2jmobius.gameserver.model.skills.ISkillCondition;
+import com.l2jmobius.gameserver.model.skills.Skill;
+
+/**
+ * @author Mobius
+ */
+public class NotFearedSkillCondition implements ISkillCondition
+{
+	public NotFearedSkillCondition(StatsSet params)
+	{
+	}
+	
+	@Override
+	public boolean canUse(L2Character caster, Skill skill, L2Object target)
+	{
+		return (target != null) && target.isCharacter() && !((L2Character) target).isAffected(EffectFlag.FEAR);
+	}
+}

L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/04000-04099.xml

@@ -2571,7 +2571,9 @@
 					<value level="12">873</value>
 				</power>
 			</effect>
-			<effect name="BlockActions" />
+			<effect name="BlockActions">
+				<allowedSkills>35016</allowedSkills>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4073" toLevel="12" name="Stun">
@@ -2640,7 +2642,9 @@
 					<value level="12">873</value>
 				</power>
 			</effect>
-			<effect name="BlockActions" />
+			<effect name="BlockActions">
+				<allowedSkills>35016</allowedSkills>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="4074" toLevel="2" name="Haste">

L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/35000-35099.xml

@@ -218,6 +218,10 @@
 		<isMagic>1</isMagic>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<canCastWhileDisabled>true</canCastWhileDisabled>
+		<conditions>
+			<condition name="NotFeared" />
+		</conditions>
 		<effects>
 			<effect name="DispelByCategory">
 				<slot>DEBUFF</slot>

L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/L2Character.java

@@ -192,7 +192,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	private boolean _isFlying = false;
 	
 	private boolean _blockActions = false;
-	private volatile Map<Integer, AtomicInteger> _blockActionsAllowedSkills;
+	private volatile Map<Integer, AtomicInteger> _blockActionsAllowedSkills = new ConcurrentHashMap<>();
 	
 	private CharStat _stat;
 	private CharStatus _status;
@@ -5196,30 +5196,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	
 	public void addBlockActionsAllowedSkill(int skillId)
 	{
-		if (_blockActionsAllowedSkills == null)
-		{
-			synchronized (this)
-			{
-				if (_blockActionsAllowedSkills == null)
-				{
-					_blockActionsAllowedSkills = new ConcurrentHashMap<>();
-				}
-			}
-		}
 		_blockActionsAllowedSkills.computeIfAbsent(skillId, k -> new AtomicInteger()).incrementAndGet();
 	}
 	
 	public void removeBlockActionsAllowedSkill(int skillId)
 	{
-		if (_blockActionsAllowedSkills != null)
+		_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
-		{
-			_blockActionsAllowedSkills.computeIfPresent(skillId, (k, v) -> v.decrementAndGet() != 0 ? v : null);
-		}
 	}
 	
 	public boolean isBlockedActionsAllowedSkill(Skill skill)
 	{
-		return (_blockActionsAllowedSkills != null) && _blockActionsAllowedSkills.containsKey(skill.getId());
+		return _blockActionsAllowedSkills.containsKey(skill.getId());
 	}
 	
 	/**

L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/effects/EffectFlag.java

@@ -56,7 +56,8 @@ public enum EffectFlag
 	PROTECT_DEATH_PENALTY,
 	CHAT_BLOCK,
 	FAKE_DEATH,
-	DUELIST_FURY;
+	DUELIST_FURY,
+	FEAR;
 	
 	public long getMask()
 	{