From fb8213d87c7dd00b5b35e180af099e105040665b Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Mon, 21 Jan 2019 04:39:22 -0800
Subject: [PATCH] Swords Counter-Attacks no longer require blocking

---
 Changelog.txt                                                 | 1 +
 src/main/java/com/gmail/nossr50/config/AdvancedConfig.java    | 1 -
 src/main/java/com/gmail/nossr50/skills/swords/Swords.java     | 1 -
 .../java/com/gmail/nossr50/skills/swords/SwordsManager.java   | 4 ----
 src/main/resources/advanced.yml                               | 2 --
 5 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index 166a2af64..8a6ad1f37 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -72,6 +72,7 @@ Version 2.1.0
  ! (Experience) Skills now start at level 1 (configurable in advanced.yml)
  ! (Item) Improved some of the messages sent to the player regarding the Chimaera Wing
  ! (Party) Party member list will only include members of the party that you can see (aren't vanished)
+ ! (Skills) Swords no longer require blocking with a shield to trigger counter attacks
  ! (Skills) Stripping wood and right clicking on stripped wood will no longer ready your Axe
  ! (Skills) Some skill level rank requirements have changed
  ! (Skills) Green Thumb now uses a rank system
diff --git a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java
index 03edd0a13..3e6a138b1 100644
--- a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java
@@ -926,7 +926,6 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
     public int getBleedMaxTicks() { return config.getInt("Skills.Swords.Bleed.MaxTicks", 3); }
     public int getBleedBaseTicks() { return config.getInt("Skills.Swords.Bleed.BaseTicks", 2); }
 
-    public boolean getCounterRequiresBlock() { return config.getBoolean("Skills.Swords.CounterAttack.RequiresBlock"); }
     public double getCounterModifier() { return config.getDouble("Skills.Swords.CounterAttack.DamageModifier", 2.0D); }
 
     public double getSerratedStrikesModifier() { return config.getDouble("Skills.Swords.SerratedStrikes.DamageModifier", 4.0D); }
diff --git a/src/main/java/com/gmail/nossr50/skills/swords/Swords.java b/src/main/java/com/gmail/nossr50/skills/swords/Swords.java
index 2fb8a6831..ce7839435 100644
--- a/src/main/java/com/gmail/nossr50/skills/swords/Swords.java
+++ b/src/main/java/com/gmail/nossr50/skills/swords/Swords.java
@@ -6,7 +6,6 @@ public class Swords {
     public static int    bleedMaxTicks      = AdvancedConfig.getInstance().getBleedMaxTicks();
     public static int    bleedBaseTicks     = AdvancedConfig.getInstance().getBleedBaseTicks();
 
-    public static boolean counterAttackRequiresBlock = AdvancedConfig.getInstance().getCounterRequiresBlock();
     public static double  counterAttackModifier      = AdvancedConfig.getInstance().getCounterModifier();
 
     public static double serratedStrikesModifier   = AdvancedConfig.getInstance().getSerratedStrikesModifier();
diff --git a/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java b/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java
index 8608a0242..bff6c78d1 100644
--- a/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java
@@ -79,10 +79,6 @@ public class SwordsManager extends SkillManager {
      * @param damage The amount of damage initially dealt by the event
      */
     public void counterAttackChecks(LivingEntity attacker, double damage) {
-        if (Swords.counterAttackRequiresBlock && !getPlayer().isBlocking()) {
-            return;
-        }
-
         if (SkillUtils.isActivationSuccessful(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, SubSkillType.SWORDS_COUNTER_ATTACK, getPlayer(), this.skill, getSkillLevel(), activationChance)) {
             CombatUtils.dealDamage(attacker, damage / Swords.counterAttackModifier, getPlayer());
 
diff --git a/src/main/resources/advanced.yml b/src/main/resources/advanced.yml
index 83981c241..2916b95ad 100644
--- a/src/main/resources/advanced.yml
+++ b/src/main/resources/advanced.yml
@@ -456,8 +456,6 @@ Skills:
             BaseTicks: 2
 
         CounterAttack:
-            # RequiresBlock: Determines if blocking is required to trigger counter attack
-            RequiresBlock: true
 
             # ChanceMax: Maximum chance of triggering a counter attack
             # MaxBonusLevel: On this level, the chance to Counter will be <ChanceMax>