EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-02-18 07:39:36 +01:00
Code Issues Projects Releases Wiki Activity

Fix CombatUtils NPE due to arrows from unloaded players

Browse Source
This commit is contained in:
Shane Freeder 2020-01-28 16:32:28 +00:00
parent 8094be46c8
commit dceee5554d
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/gmail/nossr50/listeners/EntityListener.java
View File

@ -381,14 +381,17 @@ public class EntityListener implements Listener {
}
//Deflect checks
UnarmedManager unarmedManager = UserManager.getPlayer(defendingPlayer).getUnarmedManager();
final McMMOPlayer mcMMOPlayer = UserManager.getPlayer(defendingPlayer);
if (mcMMOPlayer != null) {
UnarmedManager unarmedManager = mcMMOPlayer.getUnarmedManager();
if (unarmedManager.canDeflect()) {
if(unarmedManager.deflectCheck()) {
if (unarmedManager.deflectCheck()) {
event.setCancelled(true);
return;
}
}
}
} else {
attackingPlayer = (Player) attacker;
//Check for party friendly fire and cancel the event