diff --git a/Changelog.txt b/Changelog.txt index 336f6c7f8..738606b96 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,3 +1,6 @@ +Version 2.1.98 + Fixed a bug that prevented Taming XP from combat + Version 2.1.97 mcMMO is compatible with 1.14.4 (Didn't require any changes) Fixed a NPE that could occur if a pet participated in combat and its master's mcMMO data was not available diff --git a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java index b15917943..06583d8fc 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java @@ -173,7 +173,7 @@ public final class CombatUtils { double initialDamage = event.getDamage(); double finalDamage = initialDamage; - if(master != null && !master.isOnline() && master.isValid()) { + if(master != null && master.isOnline() && master.isValid()) { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(master); //Make sure the profiles been loaded