EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-26 07:06:45 +01:00
Code Issues Projects Releases Wiki Activity

Fixing Taming XP

Browse Source
This commit is contained in:
nossr50 2019-07-24 19:57:58 -07:00
parent 3155550931
commit 952ee9556a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog.txt
View File

@ -1,3 +1,6 @@
Version 2.1.98
Fixed a bug that prevented Taming XP from combat
Version 2.1.97 Version 2.1.97
mcMMO is compatible with 1.14.4 (Didn't require any changes) 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 Fixed a NPE that could occur if a pet participated in combat and its master's mcMMO data was not available

2
src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
View File

@ -173,7 +173,7 @@ public final class CombatUtils {
double initialDamage = event.getDamage(); double initialDamage = event.getDamage();
double finalDamage = initialDamage; double finalDamage = initialDamage;
if(master != null && !master.isOnline() && master.isValid()) { if(master != null && master.isOnline() && master.isValid()) {
McMMOPlayer mcMMOPlayer = UserManager.getPlayer(master); McMMOPlayer mcMMOPlayer = UserManager.getPlayer(master);
//Make sure the profiles been loaded //Make sure the profiles been loaded