Retained some schemas

forge-gui/src/main/java/forge/achievement/VariantWins.java

@@ -23,7 +23,9 @@ public class VariantWins extends ProgressiveAchievement {
             if (game.getRules().hasAppliedVariant(variant)) {
                 return true;
             }
-            return variant == GameType.Archenemy && game.getRules().hasAppliedVariant(GameType.ArchenemyRumble); //lump Archenemy Rumble into same achievement as Archenemy
+            if (variant == GameType.Archenemy && game.getRules().hasAppliedVariant(GameType.ArchenemyRumble)) {
+                return true; //lump Archenemy Rumble into same achievement as Archenemy
+            }
         }
         return false;
     }

forge-gui/src/main/java/forge/card/CardScriptParser.java

@@ -119,7 +119,10 @@ public final class CardScriptParser {
             if (!(part.startsWith("P") || part.startsWith("2") || isManaSymbol(part.charAt(0)))) {
                 return false;
             }
-            return (isManaSymbol(part.charAt(1))) && part.charAt(0) != part.charAt(1);
+            if ((!isManaSymbol(part.charAt(1))) || part.charAt(0) == part.charAt(1)) {
+                return false;
+            }
+            return true;
         }
         return false;
     }

forge-gui/src/main/java/forge/model/CardBlock.java

@@ -181,7 +181,10 @@ public final class CardBlock implements Comparable<CardBlock> {
         if (!this.landSet.equals(other.landSet)) {
             return false;
         }
-        return this.name.equals(other.name);
+        if (!this.name.equals(other.name)) {
+            return false;
+        }
+        return true;
     }
 
     /*

forge-gui/src/main/java/forge/player/HumanPlay.java

@@ -562,7 +562,9 @@ public class HumanPlay {
                 }
                 else { // Tainted Specter, Gurzigost, etc.
                     boolean hasPaid = payCostPart(controller, sourceAbility, (CostPartWithList)part, amount, list, "put into library." + orString);
-                    return hasPaid;
+                    if (!hasPaid) {
+                        return false;
+                    }
                 }
                 return true;
             }

forge-gui/src/main/java/forge/quest/data/StarRating.java

@@ -44,6 +44,10 @@ public class StarRating {
             return false;
         }
 
-        return rating == other.rating;
+        if (rating != other.rating) {
+            return false;
+        }
+
+        return true;
     }
 }