Merge pull request #4039 from Mixpa/master

simply if code

src/main/java/com/gmail/nossr50/api/DatabaseAPI.java

@@ -24,10 +24,7 @@ public class DatabaseAPI {
     public boolean doesPlayerExistInDB(UUID uuid) {
         PlayerProfile playerProfile = mcMMO.getDatabaseManager().loadPlayerProfile(uuid);
 
-        if(playerProfile.isLoaded())
+        return playerProfile.isLoaded();
-            return true;
-        else
-            return false;
     }
 
 }

src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java

@@ -491,10 +491,7 @@ public class McMMOPlayer {
         if(hasReachedPowerLevelCap())
             return true;
 
-        if(getSkillLevel(primarySkillType) >= Config.getInstance().getLevelCap(primarySkillType))
+        return getSkillLevel(primarySkillType) >= Config.getInstance().getLevelCap(primarySkillType);
-            return true;
-
-        return false;
     }
 
     /**

src/main/java/com/gmail/nossr50/util/EventUtils.java

@@ -62,10 +62,7 @@ public class EventUtils {
      * @return true if damage is NOT from an unnatural mcMMO skill (such as bleed DOTs)
      */
     public static boolean isDamageFromMcMMOComplexBehaviour(Event event) {
-        if (event instanceof FakeEntityDamageEvent) {
+        return event instanceof FakeEntityDamageEvent;
-            return true;
-        }
-        return false;
     }
 
     /**

src/main/java/com/gmail/nossr50/util/random/RandomChanceUtil.java

@@ -80,10 +80,7 @@ public class RandomChanceUtil
     public static boolean rollDice(double chanceOfSuccess, int bound) {
         Random random = new Random();
 
-        if (chanceOfSuccess > random.nextInt(bound))
+        return chanceOfSuccess > random.nextInt(bound);
-            return true;
-        else
-            return false;
     }
 
     /**

src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java

@@ -777,18 +777,14 @@ public final class CombatUtils {
             }
 
             // It may seem a bit redundant but we need a check here to prevent bleed from being applied in applyAbilityAoE()
-            if (getFakeDamageFinalResult(player, entity, 1.0) == 0) {
+            return getFakeDamageFinalResult(player, entity, 1.0) != 0;
-                return false;
-            }
         }
         else if (entity instanceof Tameable) {
             if (isFriendlyPet(player, (Tameable) entity)) {
                 // isFriendlyPet ensures that the Tameable is: Tamed, owned by a player, and the owner is in the same party
                 // So we can make some assumptions here, about our casting and our check
                 Player owner = (Player) ((Tameable) entity).getOwner();
-                if (!(Permissions.friendlyFire(player) && Permissions.friendlyFire(owner))) {
+                return Permissions.friendlyFire(player) && Permissions.friendlyFire(owner);
-                    return false;
-                }
             }
         }
 
@@ -850,11 +846,7 @@ public final class CombatUtils {
     public static boolean canDamage(Entity attacker, Entity target, DamageCause damageCause, double damage) {
         EntityDamageEvent damageEvent = sendEntityDamageEvent(attacker, target, damageCause, damage);
 
-        if (damageEvent.isCancelled()) {
+        return !damageEvent.isCancelled();
-            return false;
-        }
-
-        return true;
     }
 
     public static EntityDamageEvent sendEntityDamageEvent(Entity attacker, Entity target, DamageCause damageCause, double damage) {