merge: branch 'hotfix/disable-player-pvp' into develop

Author: zetastormy

gradle.properties

@@ -1,5 +1,5 @@
 org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
-projectVersion=1.9.1
+projectVersion=1.9.2
 libsPackage=team.devblook.akropolis.libs

src/main/java/me/zetastormy/akropolis/module/modules/world/WorldProtect.java

@@ -554,11 +554,14 @@ public void onEntityDamage(EntityDamageByEntityEvent event) {
             return;
 
         FightModeManager fightModeManager = getPlugin().getFightModeManager();
-        boolean attackedInFightMode = fightModeManager.isInFightMode(player.getUniqueId());
-        boolean attackerInFightMode = fightModeManager.isInFightMode(event.getDamager().getUniqueId());
 
-        if (attackedInFightMode && attackerInFightMode) {
-            return;
+        if (fightModeManager != null) {
+            boolean attackedInFightMode = fightModeManager.isInFightMode(player.getUniqueId());
+            boolean attackerInFightMode = fightModeManager.isInFightMode(event.getDamager().getUniqueId());
+
+            if (attackedInFightMode && attackerInFightMode) {
+                return;
+            }
         }
 
         if (event.getDamager().hasPermission(Permissions.EVENT_PLAYER_PVP.getPermission()))