Dodge no longer triggers while blocking

Fixes #4543
This commit is contained in:
nossr50 2021-06-22 14:59:40 -07:00
parent e35bfe758c
commit de6ba4fb6a
3 changed files with 7 additions and 1 deletions

View File

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

View File

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

View File

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