소스 검색

Dodge no longer triggers while blocking
Fixes #4543

nossr50 4 년 전
부모
커밋
de6ba4fb6a
3개의 변경된 파일7개의 추가작업 그리고 1개의 파일을 삭제
  1. 3 0
      Changelog.txt
  2. 1 1
      pom.xml
  3. 3 0
      src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java

+ 3 - 0
Changelog.txt

@@ -1,3 +1,6 @@
+Version 2.1.200
+    Dodge will no longer trigger while blocking
+
 Version 2.1.199
     Fixed IndexOutOfBounds error for servers running 1.17 or higher
     Fixed a bug that caused MySQL/MariaDB to malfunction for 1.17 (see notes)

+ 1 - 1
pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>2.1.199</version>
+    <version>2.1.200-SNAPSHOT</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>

+ 3 - 0
src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java

@@ -64,6 +64,9 @@ public class AcrobaticsManager extends SkillManager {
     }
 
     public boolean canDodge(Entity damager) {
+        if(getPlayer().isBlocking())
+            return false;
+
         if(!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.ACROBATICS_DODGE))
             return false;