From fc54c0156ca75af3c0bacadbd2cba7da2338e906 Mon Sep 17 00:00:00 2001 From: vraskulin Date: Fri, 27 Jan 2017 16:04:56 +0300 Subject: [PATCH] list.size > 0 changed to !list.isEmpty We care about if it's empty or not, not about it's size --- .../src/main/java/mage/client/cards/Card.java | 12 +++--- .../main/java/mage/client/cards/CardArea.java | 2 +- .../main/java/mage/client/cards/Cards.java | 2 +- .../java/mage/client/cards/CardsList.java | 2 +- .../java/mage/client/cards/DragCardGrid.java | 6 +-- .../java/mage/client/cards/Permanent.java | 4 +- .../mage/client/components/MageTextArea.java | 2 +- .../components/ability/AbilityPicker.java | 2 +- .../client/deckeditor/table/CardHelper.java | 2 +- .../client/dialog/CardInfoWindowDialog.java | 2 +- .../mage/client/dialog/NewTableDialog.java | 2 +- .../client/dialog/NewTournamentDialog.java | 4 +- .../main/java/mage/client/game/GamePanel.java | 8 ++-- .../java/mage/client/table/TablesPanel.java | 2 +- .../java/mage/client/util/ImageHelper.java | 2 +- .../mage/client/util/MageTableRowSorter.java | 2 +- .../mage/client/util/gui/ArrowBuilder.java | 2 +- .../mage/client/util/gui/GuiDisplayUtil.java | 6 +-- .../client/util/stats/UpdateMemUsageTask.java | 2 +- .../java/org/mage/card/arcane/CardPanel.java | 6 +-- .../org/mage/card/arcane/CardRenderer.java | 2 +- .../org/mage/card/arcane/TextboxRule.java | 2 +- .../org/mage/plugins/card/CardPluginImpl.java | 4 +- Mage.Common/src/mage/constants/Constants.java | 2 +- Mage.Common/src/mage/view/CardView.java | 2 +- Mage.Common/src/mage/view/CardsView.java | 2 +- Mage.Common/src/mage/view/ChatMessage.java | 6 +-- Mage.Common/src/mage/view/GameView.java | 2 +- Mage.Common/src/mage/view/MatchView.java | 2 +- Mage.Common/src/mage/view/PermanentView.java | 2 +- Mage.Common/src/mage/view/PlayerView.java | 2 +- .../src/mage/view/StackAbilityView.java | 4 +- .../src/mage/player/ai/ComputerPlayer6.java | 22 +++++----- .../src/mage/player/ai/ComputerPlayer7.java | 14 +++---- .../src/mage/player/ai/SimulatedAction2.java | 2 +- .../src/mage/player/ai/SimulatedPlayer2.java | 6 +-- .../java/mage/player/ai/ComputerPlayer.java | 40 +++++++++---------- .../src/mage/player/ai/MCTSPlayer.java | 6 +-- .../mage/player/ai/SimulatedPlayerMCTS.java | 4 +- .../src/mage/player/ai/ComputerPlayer2.java | 16 ++++---- .../src/mage/player/ai/ComputerPlayer3.java | 10 ++--- .../src/mage/player/ai/SimulatedAction.java | 2 +- .../src/mage/player/ai/SimulatedPlayer.java | 4 +- .../src/mage/player/human/HumanPlayer.java | 10 ++--- .../src/main/java/mage/server/User.java | 6 +-- .../java/mage/server/game/GameController.java | 4 +- .../mage/server/game/GameSessionPlayer.java | 3 +- Mage.Sets/src/mage/cards/a/ActOnImpulse.java | 2 +- .../src/mage/cards/a/AgonizingMemories.java | 2 +- Mage.Sets/src/mage/cards/a/AladdinsLamp.java | 2 +- .../src/mage/cards/a/AltarOfDementia.java | 2 +- .../src/mage/cards/a/AmassTheComponents.java | 2 +- .../src/mage/cards/a/AncestralMemories.java | 2 +- .../src/mage/cards/a/AngelOfSerenity.java | 6 +-- .../src/mage/cards/a/AngelicArbiter.java | 2 +- .../src/mage/cards/a/AnimalBoneyard.java | 2 +- .../src/mage/cards/a/AnimationModule.java | 4 +- .../src/mage/cards/a/AnimistsAwakening.java | 2 +- .../src/mage/cards/a/AnyaMercilessAngel.java | 2 +- .../src/mage/cards/b/BaneAlleyBroker.java | 4 +- Mage.Sets/src/mage/cards/b/BirthingPod.java | 2 +- .../src/mage/cards/b/BitterRevelation.java | 2 +- .../mage/cards/b/BlessedReincarnation.java | 2 +- .../src/mage/cards/b/BorderlandExplorer.java | 2 +- Mage.Sets/src/mage/cards/b/BrionStoutarm.java | 2 +- Mage.Sets/src/mage/cards/b/Browse.java | 2 +- .../src/mage/cards/c/ChandraPyromaster.java | 2 +- Mage.Sets/src/mage/cards/c/ChimneyImp.java | 2 +- .../src/mage/cards/c/ChitteringRats.java | 2 +- Mage.Sets/src/mage/cards/c/ChromeMox.java | 6 +-- .../mage/cards/c/CircleOfProtectionWhite.java | 2 +- Mage.Sets/src/mage/cards/c/CitanulFlute.java | 2 +- Mage.Sets/src/mage/cards/c/Clockspinning.java | 4 +- Mage.Sets/src/mage/cards/c/CloneShell.java | 4 +- Mage.Sets/src/mage/cards/c/CobraTrap.java | 2 +- Mage.Sets/src/mage/cards/c/Conflux.java | 10 ++--- .../src/mage/cards/c/CongregationAtDawn.java | 2 +- .../src/mage/cards/c/CorpseConnoisseur.java | 2 +- .../src/mage/cards/c/CorruptedGrafstone.java | 2 +- Mage.Sets/src/mage/cards/c/Cultivate.java | 2 +- Mage.Sets/src/mage/cards/c/CurseOfChaos.java | 2 +- Mage.Sets/src/mage/cards/c/CurseOfEchoes.java | 2 +- Mage.Sets/src/mage/cards/c/CursedScroll.java | 2 +- .../src/mage/cards/d/DanceOfTheDead.java | 2 +- .../src/mage/cards/d/DarkSupplicant.java | 2 +- Mage.Sets/src/mage/cards/d/DarthTyranus.java | 2 +- .../src/mage/cards/d/DementiaSliver.java | 2 +- .../src/mage/cards/d/DeployTheGatewatch.java | 2 +- .../mage/cards/d/DescendantOfMasumaro.java | 4 +- .../src/mage/cards/d/DevoutInvocation.java | 2 +- Mage.Sets/src/mage/cards/d/DimirCharm.java | 2 +- .../src/mage/cards/d/DimirMachinations.java | 2 +- .../cards/d/DivergentTransformations.java | 2 +- Mage.Sets/src/mage/cards/d/Dracoplasm.java | 2 +- Mage.Sets/src/mage/cards/d/DralnusPet.java | 2 +- Mage.Sets/src/mage/cards/d/Duplicant.java | 2 +- .../src/mage/cards/e/EldritchEvolution.java | 2 +- Mage.Sets/src/mage/cards/e/EliteArcanist.java | 2 +- .../src/mage/cards/e/EndlessHorizons.java | 2 +- .../src/mage/cards/e/EpicExperiment.java | 2 +- Mage.Sets/src/mage/cards/e/Excavator.java | 4 +- .../src/mage/cards/e/ExclusionRitual.java | 2 +- Mage.Sets/src/mage/cards/e/EyeOfTheStorm.java | 2 +- Mage.Sets/src/mage/cards/f/Firestorm.java | 2 +- .../src/mage/cards/f/FlamesOfRemembrance.java | 2 +- Mage.Sets/src/mage/cards/f/Fleshwrither.java | 2 +- Mage.Sets/src/mage/cards/f/Fling.java | 2 +- .../src/mage/cards/f/ForbiddenAlchemy.java | 2 +- Mage.Sets/src/mage/cards/f/ForkInTheRoad.java | 4 +- Mage.Sets/src/mage/cards/f/FriendlyFire.java | 2 +- Mage.Sets/src/mage/cards/f/FromTheAshes.java | 2 +- Mage.Sets/src/mage/cards/g/GaeasCradle.java | 2 - .../src/mage/cards/g/GallowsAtWillowHill.java | 2 +- .../src/mage/cards/g/GarrukTheVeilCursed.java | 2 +- Mage.Sets/src/mage/cards/g/GatherThePack.java | 4 +- Mage.Sets/src/mage/cards/g/GenesisHydra.java | 2 +- Mage.Sets/src/mage/cards/g/GenesisWave.java | 2 +- Mage.Sets/src/mage/cards/g/GhastlyDemise.java | 2 +- Mage.Sets/src/mage/cards/g/GiftsUngiven.java | 2 +- .../src/mage/cards/g/GlimpseTheFuture.java | 2 +- Mage.Sets/src/mage/cards/g/Godsend.java | 2 +- Mage.Sets/src/mage/cards/g/GrinningTotem.java | 2 +- Mage.Sets/src/mage/cards/g/GripOfChaos.java | 2 +- Mage.Sets/src/mage/cards/g/Grozoth.java | 2 +- Mage.Sets/src/mage/cards/g/GurmagDrowner.java | 2 +- .../src/mage/cards/h/HarmonyOfNature.java | 2 +- Mage.Sets/src/mage/cards/h/HeartOfKiran.java | 2 +- .../src/mage/cards/h/HellcarverDemon.java | 2 +- Mage.Sets/src/mage/cards/h/HeroesPodium.java | 2 +- Mage.Sets/src/mage/cards/h/HiredTorturer.java | 2 +- Mage.Sets/src/mage/cards/h/HisokasGuard.java | 2 +- .../src/mage/cards/h/HoardingDragon.java | 2 +- .../src/mage/cards/h/HopeOfGhirapur.java | 2 +- .../src/mage/cards/i/IgniteMemories.java | 2 +- .../src/mage/cards/i/InameDeathAspect.java | 2 +- .../src/mage/cards/i/IncreasingAmbition.java | 2 +- .../mage/cards/i/IndomitableCreativity.java | 2 +- Mage.Sets/src/mage/cards/i/InfernalKirin.java | 2 +- Mage.Sets/src/mage/cards/i/InfernalTutor.java | 2 +- .../src/mage/cards/i/InvaderParasite.java | 2 +- .../src/mage/cards/i/IsochronScepter.java | 2 +- .../src/mage/cards/j/JacesMindseeker.java | 2 +- Mage.Sets/src/mage/cards/j/JaradsOrders.java | 2 +- .../src/mage/cards/j/JestersScepter.java | 2 +- .../src/mage/cards/k/KaaliaOfTheVast.java | 2 +- .../src/mage/cards/k/KahoMinamoHistorian.java | 4 +- .../src/mage/cards/k/KangeeAerieKeeper.java | 4 +- Mage.Sets/src/mage/cards/k/KodamasReach.java | 2 +- .../src/mage/cards/k/KrovikanSorcerer.java | 2 +- Mage.Sets/src/mage/cards/l/Leashling.java | 2 +- Mage.Sets/src/mage/cards/l/LifesLegacy.java | 2 +- Mage.Sets/src/mage/cards/l/LordOfTheVoid.java | 2 +- .../src/mage/cards/m/MadcapExperiment.java | 2 +- .../src/mage/cards/m/MagneticMountain.java | 2 +- Mage.Sets/src/mage/cards/m/MagusOfTheJar.java | 2 +- .../src/mage/cards/m/MagusOfTheScroll.java | 2 +- Mage.Sets/src/mage/cards/m/ManaSeverance.java | 2 +- .../src/mage/cards/m/ManifoldInsights.java | 2 +- .../src/mage/cards/m/MarshalingTheTroops.java | 2 +- .../mage/cards/m/MasterOfPredicaments.java | 2 +- Mage.Sets/src/mage/cards/m/MemoryJar.java | 2 +- Mage.Sets/src/mage/cards/m/MerfolkSpy.java | 2 +- Mage.Sets/src/mage/cards/m/Metamorphosis.java | 2 +- Mage.Sets/src/mage/cards/m/MeteorBlast.java | 2 +- Mage.Sets/src/mage/cards/m/MeteorCrater.java | 2 +- Mage.Sets/src/mage/cards/m/MimicVat.java | 2 +- .../src/mage/cards/m/MindclawShaman.java | 2 +- Mage.Sets/src/mage/cards/m/MindleechMass.java | 4 +- .../src/mage/cards/m/MizzixsMastery.java | 2 +- Mage.Sets/src/mage/cards/m/MomentousFall.java | 2 +- .../src/mage/cards/m/MoonringMirror.java | 2 +- .../src/mage/cards/m/MyrBattlesphere.java | 2 +- .../src/mage/cards/n/NahiriTheHarbinger.java | 2 +- .../src/mage/cards/n/NezumiShortfang.java | 3 +- .../src/mage/cards/n/NissaNaturesArtisan.java | 2 +- .../src/mage/cards/n/NissaWorldwaker.java | 2 +- .../src/mage/cards/o/OrcishLibrarian.java | 6 +-- .../src/mage/cards/p/PainfulMemories.java | 2 +- .../src/mage/cards/p/PanopticMirror.java | 2 +- Mage.Sets/src/mage/cards/p/Peregrination.java | 2 +- .../src/mage/cards/p/PerishTheThought.java | 2 +- .../src/mage/cards/p/PhyrexianDelver.java | 2 +- .../src/mage/cards/p/PhyrexianGrimoire.java | 2 +- .../src/mage/cards/p/PlaneswalkersFavor.java | 2 +- .../src/mage/cards/p/PlaneswalkersFury.java | 2 +- .../src/mage/cards/p/PlaneswalkersMirth.java | 2 +- .../src/mage/cards/p/PlaneswalkersScorn.java | 2 +- .../mage/cards/p/PolukranosWorldEater.java | 2 +- Mage.Sets/src/mage/cards/p/Polymorph.java | 2 +- .../src/mage/cards/p/PreeminentCaptain.java | 2 +- Mage.Sets/src/mage/cards/p/ProteusStaff.java | 2 +- .../src/mage/cards/p/PrototypePortal.java | 6 +-- .../src/mage/cards/p/PryingQuestions.java | 2 +- .../src/mage/cards/q/QasaliAmbusher.java | 4 +- .../src/mage/cards/q/QuietSpeculation.java | 2 +- .../src/mage/cards/r/RealmsUncharted.java | 2 +- .../src/mage/cards/r/ReflectingPool.java | 2 +- .../src/mage/cards/r/RenownedWeaponsmith.java | 2 +- Mage.Sets/src/mage/cards/r/Reweave.java | 2 +- Mage.Sets/src/mage/cards/r/RiseFall.java | 2 +- Mage.Sets/src/mage/cards/r/RoninWarclub.java | 2 +- .../src/mage/cards/r/RootwaterThief.java | 2 +- .../src/mage/cards/s/SadisticAugermage.java | 2 +- .../src/mage/cards/s/SanguinePraetor.java | 2 +- .../mage/cards/s/SasayaOrochiAscendant.java | 2 +- .../src/mage/cards/s/SavageSummoning.java | 1 - Mage.Sets/src/mage/cards/s/SecretSalvage.java | 2 +- Mage.Sets/src/mage/cards/s/SeeBeyond.java | 2 +- .../src/mage/cards/s/SemblanceAnvil.java | 4 +- Mage.Sets/src/mage/cards/s/SerrasSanctum.java | 2 +- .../mage/cards/s/ShimatsuTheBloodcloaked.java | 2 +- .../src/mage/cards/s/SignalTheClans.java | 2 +- .../src/mage/cards/s/SilentBladeOni.java | 2 +- .../src/mage/cards/s/SkyshipWeatherlight.java | 2 +- .../src/mage/cards/s/SlumberingTora.java | 2 +- Mage.Sets/src/mage/cards/s/SoldeviSage.java | 2 +- Mage.Sets/src/mage/cards/s/SoulFoundry.java | 4 +- Mage.Sets/src/mage/cards/s/Spellbinder.java | 2 +- Mage.Sets/src/mage/cards/s/Spellshift.java | 2 +- .../src/mage/cards/s/SpiritOfResistance.java | 2 +- .../src/mage/cards/s/SquanderedResources.java | 4 +- Mage.Sets/src/mage/cards/s/StarCompass.java | 2 +- .../src/mage/cards/s/StarlitSanctum.java | 4 +- .../src/mage/cards/s/SteelcladSerpent.java | 2 +- Mage.Sets/src/mage/cards/s/StompingSlabs.java | 2 +- Mage.Sets/src/mage/cards/s/StrataScythe.java | 4 +- .../src/mage/cards/s/StrategicPlanning.java | 2 +- Mage.Sets/src/mage/cards/s/StripBare.java | 2 +- .../src/mage/cards/s/StrongholdGambit.java | 2 +- .../src/mage/cards/s/SuddenDisappearance.java | 2 +- .../src/mage/cards/s/SultaiSoothsayer.java | 2 +- Mage.Sets/src/mage/cards/s/SummonersEgg.java | 2 +- Mage.Sets/src/mage/cards/s/SummoningTrap.java | 2 +- Mage.Sets/src/mage/cards/s/SuturedGhoul.java | 2 +- Mage.Sets/src/mage/cards/s/SyphonMind.java | 2 +- .../src/mage/cards/t/TalentOfTheTelepath.java | 4 +- .../mage/cards/t/TemptWithReflections.java | 2 +- .../src/mage/cards/t/TestamentOfFaith.java | 6 +-- .../src/mage/cards/t/ThadaAdelAcquisitor.java | 2 +- Mage.Sets/src/mage/cards/t/ThoughtGorger.java | 2 +- .../src/mage/cards/t/ThoughtpickerWitch.java | 2 +- .../src/mage/cards/t/TransmuteArtifact.java | 2 +- Mage.Sets/src/mage/cards/v/VastwoodHydra.java | 2 +- .../src/mage/cards/v/VerdelothTheAncient.java | 4 +- .../src/mage/cards/v/VeteranExplorer.java | 2 +- Mage.Sets/src/mage/cards/w/WaveOfVitriol.java | 2 +- Mage.Sets/src/mage/cards/w/WeirdHarvest.java | 2 +- .../src/mage/cards/w/WerewolfRansacker.java | 2 +- .../src/mage/cards/w/WidespreadPanic.java | 2 +- Mage.Sets/src/mage/cards/w/WildEvocation.java | 2 +- Mage.Sets/src/mage/cards/w/WildPair.java | 2 +- Mage.Sets/src/mage/cards/w/WildResearch.java | 2 +- .../src/mage/cards/w/WoodlandBellower.java | 2 +- .../src/mage/cards/x/XenagosTheReveler.java | 2 +- Mage.Sets/src/mage/cards/y/YavimayaDryad.java | 2 +- .../abilities/equipped/HeavyArbalestTest.java | 2 +- .../org/mage/test/player/RandomPlayer.java | 4 +- .../java/org/mage/test/player/TestPlayer.java | 4 +- .../base/impl/CardTestPlayerAPIImpl.java | 2 +- .../java/mage/abilities/AbilitiesImpl.java | 4 +- .../main/java/mage/abilities/AbilityImpl.java | 12 +++--- .../abilities/DelayedTriggeredAbility.java | 2 - Mage/src/main/java/mage/abilities/Modes.java | 2 +- .../common/EntersBattlefieldAbility.java | 2 +- .../common/CardsInHandCondition.java | 2 +- .../condition/common/FerociousCondition.java | 2 +- .../OpponentControlsPermanentCondition.java | 4 +- .../common/PermanentHasCounterCondition.java | 2 +- .../PermanentsOnTheBattlefieldCondition.java | 3 +- .../common/TenOrLessLifeCondition.java | 2 +- .../common/TopLibraryCardTypeCondition.java | 2 +- .../abilities/costs/AlternativeCost2Impl.java | 2 - .../java/mage/abilities/costs/CostsImpl.java | 2 +- .../costs/OptionalAdditionalCostImpl.java | 8 ---- .../costs/common/PutCountersSourceCost.java | 2 +- .../costs/common/RemoveCounterCost.java | 2 +- .../abilities/costs/mana/ManaCostsImpl.java | 2 +- .../dynamicvalue/common/MultikickerCount.java | 6 +-- .../abilities/effects/ContinuousEffects.java | 4 +- .../AddManaOfAnyTypeProducedEffect.java | 2 +- .../CopySpellForEachItCouldTargetEffect.java | 2 +- .../effects/common/CreateTokenEffect.java | 2 +- .../common/CreateTokenTargetEffect.java | 2 +- .../effects/common/DamageAllEffect.java | 2 +- .../common/DamageControllerEffect.java | 2 +- .../effects/common/DamageMultiEffect.java | 2 +- .../effects/common/DamageTargetEffect.java | 4 +- .../effects/common/DevourEffect.java | 2 +- .../effects/common/DoIfCostPaid.java | 2 +- ...nControllersNextUntapStepTargetEffect.java | 2 +- .../DrawCardSourceControllerEffect.java | 2 +- .../effects/common/DrawCardTargetEffect.java | 4 +- ...ExileAndReturnTransformedSourceEffect.java | 2 +- .../effects/common/GainLifeEffect.java | 2 +- .../effects/common/GainLifeTargetEffect.java | 4 +- .../LoseLifeControllerAttachedEffect.java | 2 +- .../common/LoseLifeOpponentsEffect.java | 2 +- .../LoseLifeSourceControllerEffect.java | 2 +- .../effects/common/LoseLifeTargetEffect.java | 4 +- .../effects/common/PhaseOutTargetEffect.java | 2 +- .../PlayTargetWithoutPayingManaEffect.java | 2 +- .../effects/common/PopulateEffect.java | 2 +- .../PutLibraryIntoGraveTargetEffect.java | 2 +- .../effects/common/RecruiterEffect.java | 2 +- .../RevealCardsFromLibraryUntilEffect.java | 4 +- .../common/SkipNextPlayerUntapStepEffect.java | 4 +- .../effects/common/TapTargetEffect.java | 2 +- .../effects/common/TransformTargetEffect.java | 2 +- .../AddCardSubTypeTargetEffect.java | 2 +- .../AssignNoCombatDamageSourceEffect.java | 2 +- .../BecomesColorOrColorsTargetEffect.java | 4 +- .../continuous/BecomesCreatureAllEffect.java | 8 ++-- .../BecomesCreatureAttachedEffect.java | 10 ++--- .../BecomesCreatureSourceEffect.java | 8 ++-- .../BecomesCreatureTargetEffect.java | 6 +-- .../continuous/BoostEquippedEffect.java | 2 +- .../continuous/GainAbilityAllEffect.java | 2 +- .../continuous/GainAbilityTargetEffect.java | 2 +- .../MaximumHandSizeControllerEffect.java | 2 +- .../counter/AddCountersAttachedEffect.java | 2 +- .../counter/AddCountersTargetEffect.java | 4 +- .../counter/DistributeCountersEffect.java | 4 +- .../common/counter/ProliferateEffect.java | 4 +- .../counter/RemoveCounterTargetEffect.java | 2 +- .../discard/DiscardControllerEffect.java | 2 +- .../discard/DiscardHandTargetEffect.java | 2 +- .../common/discard/DiscardTargetEffect.java | 2 +- ...SearchLibraryGraveyardPutInHandEffect.java | 4 +- .../search/SearchLibraryPutInHandEffect.java | 2 +- .../search/SearchLibraryPutInPlayEffect.java | 2 +- ...rchLibraryPutInPlayTargetPlayerEffect.java | 2 +- ...archLibraryWithLessCMCPutInPlayEffect.java | 2 +- .../effects/keyword/FatesealEffect.java | 2 +- .../abilities/keyword/CascadeAbility.java | 2 +- .../abilities/keyword/ConvokeAbility.java | 2 +- .../mage/abilities/keyword/DelveAbility.java | 6 +-- .../abilities/keyword/FlashbackAbility.java | 8 ++-- .../abilities/keyword/HideawayAbility.java | 2 +- .../abilities/keyword/TransmuteAbility.java | 2 +- .../mana/ActivatedManaAbilityImpl.java | 2 +- .../mana/AnyColorLandsProduceManaAbility.java | 2 +- .../CommanderColorIdentityManaAbility.java | 2 +- .../java/mage/abilities/mana/ManaOptions.java | 2 - .../abilities/mana/TriggeredManaAbility.java | 2 +- Mage/src/main/java/mage/cards/Sets.java | 4 +- .../cards/decks/importer/DckDeckImporter.java | 2 +- .../src/main/java/mage/filter/FilterCard.java | 2 +- .../java/mage/game/GameCommanderImpl.java | 2 +- Mage/src/main/java/mage/game/GameImpl.java | 2 +- Mage/src/main/java/mage/game/GameStates.java | 6 +-- .../src/main/java/mage/game/ZonesHandler.java | 2 +- .../main/java/mage/game/combat/Combat.java | 2 +- .../java/mage/game/combat/CombatGroup.java | 6 +-- .../main/java/mage/game/draft/DraftCube.java | 2 +- .../mage/game/draft/RandomBoosterDraft.java | 2 +- .../java/mage/game/match/MatchPlayer.java | 2 +- .../java/mage/game/permanent/token/Token.java | 2 +- Mage/src/main/java/mage/game/stack/Spell.java | 2 +- .../java/mage/game/stack/StackAbility.java | 2 +- .../mage/game/tournament/TournamentImpl.java | 2 +- .../pairing/SwissPairingSimple.java | 2 +- .../main/java/mage/players/PlayerImpl.java | 22 +++++----- .../src/main/java/mage/target/TargetImpl.java | 6 +-- .../targetpointer/FirstTargetPointer.java | 4 +- .../main/java/mage/util/TournamentUtil.java | 2 +- .../main/java/mage/util/trace/TraceUtil.java | 2 +- 366 files changed, 532 insertions(+), 548 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/cards/Card.java b/Mage.Client/src/main/java/mage/client/cards/Card.java index 96aff7602a6..b3ddbadeec2 100644 --- a/Mage.Client/src/main/java/mage/client/cards/Card.java +++ b/Mage.Client/src/main/java/mage/client/cards/Card.java @@ -181,7 +181,7 @@ public class Card extends MagePermanent implements MouseMotionListener, MouseLis gImage.setColor(Color.BLACK); gImage.drawImage(background, 0, 0, this); - if (card.getManaCost().size() > 0) { + if (!card.getManaCost().isEmpty()) { ImageHelper.drawCosts(card.getManaCost(), gImage, FRAME_MAX_WIDTH - SYMBOL_MAX_XOFFSET, SYMBOL_MAX_YOFFSET, this); } @@ -197,7 +197,7 @@ public class Card extends MagePermanent implements MouseMotionListener, MouseLis gImage.drawString(card.getLoyalty(), POWBOX_TEXT_MAX_LEFT, POWBOX_TEXT_MAX_TOP); } - if (card.getCardTypes().size() > 0) { + if (!card.getCardTypes().isEmpty()) { gImage.drawString(cardType, CONTENT_MAX_XOFFSET, TYPE_MAX_YOFFSET); } @@ -211,7 +211,7 @@ public class Card extends MagePermanent implements MouseMotionListener, MouseLis gSmall.drawString(card.getLoyalty(), Config.dimensions.powBoxTextLeft, Config.dimensions.powBoxTextTop); } - if (card.getCardTypes().size() > 0) { + if (!card.getCardTypes().isEmpty()) { gSmall.drawString(cardType, Config.dimensions.contentXOffset, Config.dimensions.typeYOffset); } drawText(); @@ -232,7 +232,7 @@ public class Card extends MagePermanent implements MouseMotionListener, MouseLis } } else { sb.append(card.getName()); - if (card.getManaCost().size() > 0) { + if (!card.getManaCost().isEmpty()) { sb.append('\n').append(card.getManaCost()); } sb.append('\n').append(cardType); @@ -247,7 +247,7 @@ public class Card extends MagePermanent implements MouseMotionListener, MouseLis for (String rule : getRules()) { sb.append('\n').append(rule); } - if (card.getExpansionSetCode() != null && card.getExpansionSetCode().length() > 0) { + if (card.getExpansionSetCode() != null && !card.getExpansionSetCode().isEmpty()) { sb.append('\n').append(card.getCardNumber()).append(" - "); sb.append(Sets.getInstance().get(card.getExpansionSetCode()).getName()).append(" - "); sb.append(card.getRarity().toString()); @@ -308,7 +308,7 @@ public class Card extends MagePermanent implements MouseMotionListener, MouseLis sbType.append(cardType.toString()).append(' '); } - if (card.getSubTypes().size() > 0) { + if (!card.getSubTypes().isEmpty()) { sbType.append("- "); for (String subType : card.getSubTypes()) { sbType.append(subType).append(' '); diff --git a/Mage.Client/src/main/java/mage/client/cards/CardArea.java b/Mage.Client/src/main/java/mage/client/cards/CardArea.java index 531cf10eb2c..4ead4cf4dd2 100644 --- a/Mage.Client/src/main/java/mage/client/cards/CardArea.java +++ b/Mage.Client/src/main/java/mage/client/cards/CardArea.java @@ -163,7 +163,7 @@ public class CardArea extends JPanel implements MouseListener { private void loadCardsMany(CardsView showCards, BigCard bigCard, UUID gameId) { int rowsOfCards = 20; int columns = 1; - if (showCards != null && showCards.size() > 0) { + if (showCards != null && !showCards.isEmpty()) { Rectangle rectangle = new Rectangle(cardDimension.width, cardDimension.height); int count = 0; for (CardView card : showCards.values()) { diff --git a/Mage.Client/src/main/java/mage/client/cards/Cards.java b/Mage.Client/src/main/java/mage/client/cards/Cards.java index d6a3363db77..6996657d74c 100644 --- a/Mage.Client/src/main/java/mage/client/cards/Cards.java +++ b/Mage.Client/src/main/java/mage/client/cards/Cards.java @@ -225,7 +225,7 @@ public class Cards extends javax.swing.JPanel { } if (!isVisibleIfEmpty) { - cardArea.setVisible(cards.size() > 0); + cardArea.setVisible(!cards.isEmpty()); } sizeCards(getCardDimension()); diff --git a/Mage.Client/src/main/java/mage/client/cards/CardsList.java b/Mage.Client/src/main/java/mage/client/cards/CardsList.java index bec809a416c..5c16d1c9bb4 100644 --- a/Mage.Client/src/main/java/mage/client/cards/CardsList.java +++ b/Mage.Client/src/main/java/mage/client/cards/CardsList.java @@ -322,7 +322,7 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar cardArea.remove(card); } - if (cards != null && cards.size() > 0) { + if (cards != null && !cards.isEmpty()) { Rectangle rectangle = new Rectangle(cardDimension.width, cardDimension.height); List sortedCards = new ArrayList<>(cards.values()); switch (sortSetting.getSortBy()) { diff --git a/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java b/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java index 8a4d3a17717..83dd8bc9da1 100644 --- a/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java +++ b/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java @@ -1077,7 +1077,7 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg for (Sort s : sortMenuItems.keySet()) { sortMenuItems.get(s).setSelected(cardSort == s); } - hideSelected.setEnabled(dragCardList().size() > 0); + hideSelected.setEnabled(!dragCardList().isEmpty()); separateButton.setSelected(separateCreatures); menu.show(e.getComponent(), e.getX(), e.getY()); } @@ -1534,7 +1534,7 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg List cardPool = CardRepository.instance.findCards(cardCriteria); - if (cardPool.size() > 0) { + if (!cardPool.isEmpty()) { Card acard = cardPool.get(RandomUtil.nextInt(cardPool.size())).getMockCard(); if (acard.getName().equals(card.getName())) { @@ -1656,7 +1656,7 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg if (trackedCards.containsKey(info.getSetCode()) && trackedCards.get(info.getSetCode()).containsKey(info.getCardNum())) { ArrayList candidates = trackedCards.get(info.getSetCode()).get(info.getCardNum()); - if (candidates.size() > 0) { + if (!candidates.isEmpty()) { gridStack.add(candidates.remove(0)); thisMaxStackSize = Math.max(thisMaxStackSize, gridStack.size()); } diff --git a/Mage.Client/src/main/java/mage/client/cards/Permanent.java b/Mage.Client/src/main/java/mage/client/cards/Permanent.java index f9f8fa9b968..f23c01cc885 100644 --- a/Mage.Client/src/main/java/mage/client/cards/Permanent.java +++ b/Mage.Client/src/main/java/mage/client/cards/Permanent.java @@ -106,7 +106,7 @@ public class Permanent extends Card { if (permanent.getOriginal() != null) { sb.append("\n----- Originally -------\n"); sb.append(permanent.getOriginal().getName()); - if (permanent.getOriginal().getManaCost().size() > 0) { + if (!permanent.getOriginal().getManaCost().isEmpty()) { sb.append('\n').append(permanent.getOriginal().getManaCost()); } sb.append('\n').append(getType(permanent.getOriginal())); @@ -122,7 +122,7 @@ public class Permanent extends Card { for (String rule: getRules()) { sb.append('\n').append(rule); } - if (permanent.getOriginal().getExpansionSetCode().length() > 0) { + if (!permanent.getOriginal().getExpansionSetCode().isEmpty()) { sb.append('\n').append(permanent.getCardNumber()).append(" - "); sb.append('\n').append(Sets.getInstance().get(permanent.getOriginal().getExpansionSetCode()).getName()).append(" - "); sb.append(permanent.getOriginal().getRarity().toString()); diff --git a/Mage.Client/src/main/java/mage/client/components/MageTextArea.java b/Mage.Client/src/main/java/mage/client/components/MageTextArea.java index 9f2f6975df0..6928297878e 100644 --- a/Mage.Client/src/main/java/mage/client/components/MageTextArea.java +++ b/Mage.Client/src/main/java/mage/client/components/MageTextArea.java @@ -51,7 +51,7 @@ public class MageTextArea extends JEditorPane { text = text.replace("\r\n", "
"); final String basicText = ManaSymbols.replaceSymbolsWithHTML(text, ManaSymbols.Type.DIALOG); - if (text.length() > 0) { + if (!text.isEmpty()) { buffer.append(basicText); } diff --git a/Mage.Client/src/main/java/mage/client/components/ability/AbilityPicker.java b/Mage.Client/src/main/java/mage/client/components/ability/AbilityPicker.java index 574b6036c93..fa4e43e60dc 100644 --- a/Mage.Client/src/main/java/mage/client/components/ability/AbilityPicker.java +++ b/Mage.Client/src/main/java/mage/client/components/ability/AbilityPicker.java @@ -296,7 +296,7 @@ public class AbilityPicker extends JXPanel implements MouseWheelListener { text = text.replace("\r\n", "
"); //text += "
"; - if (text.length() > 0) { + if (!text.isEmpty()) { buffer.append(ManaSymbols.replaceSymbolsWithHTML(text, ManaSymbols.Type.DIALOG)); } diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/table/CardHelper.java b/Mage.Client/src/main/java/mage/client/deckeditor/table/CardHelper.java index fce95ec0f86..67126f9170f 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/table/CardHelper.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/table/CardHelper.java @@ -62,7 +62,7 @@ public class CardHelper { type.append(cardType.toString()); type.append(' '); } - if (c.getSubTypes().size() > 0) { + if (!c.getSubTypes().isEmpty()) { type.append("- "); for (String subType : c.getSubTypes()) { type.append(subType); diff --git a/Mage.Client/src/main/java/mage/client/dialog/CardInfoWindowDialog.java b/Mage.Client/src/main/java/mage/client/dialog/CardInfoWindowDialog.java index 71ad41544ec..4141d4832bc 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/CardInfoWindowDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/CardInfoWindowDialog.java @@ -137,7 +137,7 @@ public class CardInfoWindowDialog extends MageDialog { String titel = name + " (" + exile.size() + ')'; setTitle(titel); this.setTitelBarToolTip(titel); - if (exile.size() > 0) { + if (!exile.isEmpty()) { show(); if (changed) { try { diff --git a/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java b/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java index 9cb6b7a3eed..be43daee886 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java @@ -507,7 +507,7 @@ public class NewTableDialog extends MageDialog { while (players.size() != numPlayers) { TablePlayerPanel playerPanel = new TablePlayerPanel(); String playerType = "Human"; - if (prefPlayerTypes.size() >= players.size() && players.size() > 0) { + if (prefPlayerTypes.size() >= players.size() && !players.isEmpty()) { playerType = prefPlayerTypes.get(players.size() - 1); } playerPanel.init(players.size() + 2, playerType); diff --git a/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java b/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java index a67491bd0f5..bc7584eed99 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java @@ -826,7 +826,7 @@ public class NewTournamentDialog extends MageDialog { txtRandomPacks.setEnabled(false); txtRandomPacks.setLineWrap(true); String randomPrefs = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_NEW_TOURNAMENT_PACKS_RANDOM_DRAFT, ""); - if (randomPrefs.length() > 0) { + if (!randomPrefs.isEmpty()) { txtRandomPacks.setText(randomPrefs); ArrayList theList = new ArrayList<>(); theList.addAll(Arrays.asList(randomPrefs.split(";"))); @@ -1026,7 +1026,7 @@ public class NewTournamentDialog extends MageDialog { } private void loadBoosterPacks(String packString) { - if (packString.length()>0) { + if (!packString.isEmpty()) { String[] packsArray = packString.substring(1, packString.length() - 1).split(","); int packNumber = 0; for (String pack : packsArray ){ diff --git a/Mage.Client/src/main/java/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java index 966e036ae66..85435f2fe3f 100644 --- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java +++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java @@ -723,7 +723,7 @@ public final class GamePanel extends javax.swing.JPanel { if (!handCards.containsKey(chosenHandKey)) { chosenHandKey = YOUR_HAND; } - } else if (chosenHandKey.isEmpty() && handCards.size() > 0) { + } else if (chosenHandKey.isEmpty() && !handCards.isEmpty()) { chosenHandKey = handCards.keySet().iterator().next(); } if (chosenHandKey != null && handCards.containsKey(chosenHandKey)) { @@ -854,7 +854,7 @@ public final class GamePanel extends javax.swing.JPanel { showRevealed(game); showLookedAt(game); - if (game.getCombat().size() > 0) { + if (!game.getCombat().isEmpty()) { CombatManager.getInstance().showCombat(game.getCombat(), gameId); } else { CombatManager.getInstance().hideCombat(gameId); @@ -1164,7 +1164,7 @@ public final class GamePanel extends javax.swing.JPanel { updateGame(gameView); Map options0 = options == null ? new HashMap<>() : options; ShowCardsDialog dialog = null; - if (cardView != null && cardView.size() > 0) { + if (cardView != null && !cardView.isEmpty()) { dialog = showCards(message, cardView, required, options0, popupMenuType); options0.put("dialog", dialog); } @@ -2130,7 +2130,7 @@ public final class GamePanel extends javax.swing.JPanel { choices, this.chosenHandKey); - if (newChosenHandKey != null && newChosenHandKey.length() > 0) { + if (newChosenHandKey != null && !newChosenHandKey.isEmpty()) { this.chosenHandKey = newChosenHandKey; CardsView cards = handCards.get(chosenHandKey); handContainer.loadCards(cards, bigCard, gameId); diff --git a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java index 72cc9d9e94d..731e5cff2ba 100644 --- a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java +++ b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java @@ -259,7 +259,7 @@ public class TablesPanel extends javax.swing.JPanel { switch (action) { case "Replay": List gameList = matchesModel.getListofGames(modelRow); - if (gameList != null && gameList.size() > 0) { + if (gameList != null && !gameList.isEmpty()) { if (gameList.size() == 1) { SessionHandler.replayGame(gameList.get(0)); } else { diff --git a/Mage.Client/src/main/java/mage/client/util/ImageHelper.java b/Mage.Client/src/main/java/mage/client/util/ImageHelper.java index 64c727257fe..dfb6340b33a 100644 --- a/Mage.Client/src/main/java/mage/client/util/ImageHelper.java +++ b/Mage.Client/src/main/java/mage/client/util/ImageHelper.java @@ -86,7 +86,7 @@ public class ImageHelper { } public static void drawCosts(List costs, Graphics2D g, int xOffset, int yOffset, ImageObserver o) { - if (costs.size() > 0) { + if (!costs.isEmpty()) { int costLeft = xOffset; for (int i = costs.size() - 1; i >= 0; i--) { String symbol = costs.get(i); diff --git a/Mage.Client/src/main/java/mage/client/util/MageTableRowSorter.java b/Mage.Client/src/main/java/mage/client/util/MageTableRowSorter.java index 43f74c7a800..b8b182940c2 100644 --- a/Mage.Client/src/main/java/mage/client/util/MageTableRowSorter.java +++ b/Mage.Client/src/main/java/mage/client/util/MageTableRowSorter.java @@ -49,7 +49,7 @@ public class MageTableRowSorter extends TableRowSorter { @Override public void toggleSortOrder(int column) { List sortKeys = getSortKeys(); - if (sortKeys.size() > 0) { + if (!sortKeys.isEmpty()) { if (sortKeys.get(0).getSortOrder() == SortOrder.DESCENDING) { setSortKeys(null); return; diff --git a/Mage.Client/src/main/java/mage/client/util/gui/ArrowBuilder.java b/Mage.Client/src/main/java/mage/client/util/gui/ArrowBuilder.java index 1f0c3d67643..f8760c5165d 100644 --- a/Mage.Client/src/main/java/mage/client/util/gui/ArrowBuilder.java +++ b/Mage.Client/src/main/java/mage/client/util/gui/ArrowBuilder.java @@ -135,7 +135,7 @@ public class ArrowBuilder { if (map.containsKey(gameId)) { Map> innerMap = map.get(gameId); java.util.List arrows = innerMap.get(type); - if (arrows != null && arrows.size() > 0) { + if (arrows != null && !arrows.isEmpty()) { JPanel p = getArrowsPanel(gameId); synchronized (map) { for (Arrow arrow : arrows) { diff --git a/Mage.Client/src/main/java/mage/client/util/gui/GuiDisplayUtil.java b/Mage.Client/src/main/java/mage/client/util/gui/GuiDisplayUtil.java index 9dbdb8e3a78..f70bd5ec0e3 100644 --- a/Mage.Client/src/main/java/mage/client/util/gui/GuiDisplayUtil.java +++ b/Mage.Client/src/main/java/mage/client/util/gui/GuiDisplayUtil.java @@ -330,7 +330,7 @@ public class GuiDisplayUtil { } } } - if (textLines.lines.size() > 0) { + if (!textLines.lines.isEmpty()) { for (String textLine : textLines.lines) { if (textLine != null && !textLine.replace(".", "").trim().isEmpty()) { rule.append("

").append(textLine).append("

"); @@ -339,7 +339,7 @@ public class GuiDisplayUtil { } String legal = rule.toString(); - if (legal.length() > 0) { + if (!legal.isEmpty()) { legal = legal.replaceAll("\\{this\\}", card.getName().isEmpty() ? "this" : card.getName()); legal = legal.replaceAll("\\{source\\}", card.getName().isEmpty() ? "this" : card.getName()); buffer.append(ManaSymbols.replaceSymbolsWithHTML(legal, ManaSymbols.Type.TOOLTIP)); @@ -366,7 +366,7 @@ public class GuiDisplayUtil { for (CardType cardType : card.getCardTypes()) { types += cardType.toString() + ' '; } - if (card.getSubTypes().size() > 0) { + if (!card.getSubTypes().isEmpty()) { types += "- "; } for (String subType : card.getSubTypes()) { diff --git a/Mage.Client/src/main/java/mage/client/util/stats/UpdateMemUsageTask.java b/Mage.Client/src/main/java/mage/client/util/stats/UpdateMemUsageTask.java index b3c6366b56e..cc6907b6145 100644 --- a/Mage.Client/src/main/java/mage/client/util/stats/UpdateMemUsageTask.java +++ b/Mage.Client/src/main/java/mage/client/util/stats/UpdateMemUsageTask.java @@ -36,7 +36,7 @@ public class UpdateMemUsageTask extends SwingWorker { @Override protected void process(List chunks) { - if (chunks != null && chunks.size() > 0) { + if (chunks != null && !chunks.isEmpty()) { Float memUsage = chunks.get(chunks.size() - 1); if (memUsage != null) { jLabelToDisplayInfo.setText(Math.round(memUsage) + "% Mem free"); diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java index 81dfd069899..f55acc778c8 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java @@ -688,7 +688,7 @@ public abstract class CardPanel extends MagePermanent implements MouseListener, sbType.append(cardType.toString()).append(' '); } - if (card.getSubTypes().size() > 0) { + if (!card.getSubTypes().isEmpty()) { sbType.append("- "); for (String subType : card.getSubTypes()) { sbType.append(subType).append(' '); @@ -706,7 +706,7 @@ public abstract class CardPanel extends MagePermanent implements MouseListener, } } else { sb.append(card.getName()); - if (card.getManaCost().size() > 0) { + if (!card.getManaCost().isEmpty()) { sb.append('\n').append(card.getManaCost()); } sb.append('\n').append(cardType); @@ -724,7 +724,7 @@ public abstract class CardPanel extends MagePermanent implements MouseListener, for (String rule : card.getRules()) { sb.append('\n').append(rule); } - if (card.getExpansionSetCode() != null && card.getExpansionSetCode().length() > 0) { + if (card.getExpansionSetCode() != null && !card.getExpansionSetCode().isEmpty()) { sb.append('\n').append(card.getCardNumber()).append(" - "); sb.append(card.getExpansionSetCode()).append(" - "); sb.append(card.getRarity().toString()); diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/CardRenderer.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardRenderer.java index fb883c04c99..fa568e13b73 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/CardRenderer.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/CardRenderer.java @@ -385,7 +385,7 @@ public abstract class CardRenderer { for (CardType cardType : cardView.getCardTypes()) { sbType.append(cardType.toString()).append(' '); } - if (cardView.getSubTypes().size() > 0) { + if (!cardView.getSubTypes().isEmpty()) { sbType.append("- "); for (String subType : cardView.getSubTypes()) { sbType.append(subType).append(' '); diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/TextboxRule.java b/Mage.Client/src/main/java/org/mage/card/arcane/TextboxRule.java index 807e03d6547..0e4b8360429 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/TextboxRule.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/TextboxRule.java @@ -87,7 +87,7 @@ public class TextboxRule { // Do it in reverse order for proper handling of regions where // there are multiple attributes stacked (EG: bold + italic) AttributedString attributedRule = new AttributedString(text); - if (text.length() != 0) { + if (!text.isEmpty()) { attributedRule.addAttribute(TextAttribute.FONT, normal); for (int i = regions.size() - 1; i >= 0; --i) { regions.get(i).applyToAttributedString(attributedRule, normal, italic); diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java b/Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java index 29195aa2f0b..f41304525f4 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java @@ -179,7 +179,7 @@ public class CardPluginImpl implements CardPlugin { break; } List counters = firstPanel.getOriginalPermanent().getCounters(); - if (counters != null && counters.size() > 0) { + if (counters != null && !counters.isEmpty()) { // don't put to first panel if it has counters insertIndex = i; break; @@ -191,7 +191,7 @@ public class CardPluginImpl implements CardPlugin { continue; } counters = permanent.getOriginalPermanent().getCounters(); - if (counters != null && counters.size() > 0) { + if (counters != null && !counters.isEmpty()) { // if a land has counter, put it to the right insertIndex = i + 1; continue; diff --git a/Mage.Common/src/mage/constants/Constants.java b/Mage.Common/src/mage/constants/Constants.java index fd8bf95052c..c2617b522b5 100644 --- a/Mage.Common/src/mage/constants/Constants.java +++ b/Mage.Common/src/mage/constants/Constants.java @@ -78,7 +78,7 @@ public final class Constants { public enum SessionState { - DISCONNECTED, CONNECTED, CONNECTING, DISCONNECTING, SERVER_STARTING; + DISCONNECTED, CONNECTED, CONNECTING, DISCONNECTING, SERVER_STARTING } public enum Option { diff --git a/Mage.Common/src/mage/view/CardView.java b/Mage.Common/src/mage/view/CardView.java index 0548837a35e..e20c27d4a12 100644 --- a/Mage.Common/src/mage/view/CardView.java +++ b/Mage.Common/src/mage/view/CardView.java @@ -397,7 +397,7 @@ public class CardView extends SimpleCardView { for (SpellAbility spellAbility : spell.getSpellAbilities()) { for (UUID modeId : spellAbility.getModes().getSelectedModes()) { Mode mode = spellAbility.getModes().get(modeId); - if (mode.getTargets().size() > 0) { + if (!mode.getTargets().isEmpty()) { setTargets(mode.getTargets()); } } diff --git a/Mage.Common/src/mage/view/CardsView.java b/Mage.Common/src/mage/view/CardsView.java index 4d8518493d7..e37b9801a66 100644 --- a/Mage.Common/src/mage/view/CardsView.java +++ b/Mage.Common/src/mage/view/CardsView.java @@ -133,7 +133,7 @@ public class CardsView extends LinkedHashMap { } abilityView = new AbilityView(ability, sourceObject.getName(), sourceCardView); } - if (ability.getTargets().size() > 0) { + if (!ability.getTargets().isEmpty()) { abilityView.setTargets(ability.getTargets()); } else { List abilityTargets = new ArrayList<>(); diff --git a/Mage.Common/src/mage/view/ChatMessage.java b/Mage.Common/src/mage/view/ChatMessage.java index 487e2fbf1c4..d13dccddb32 100644 --- a/Mage.Common/src/mage/view/ChatMessage.java +++ b/Mage.Common/src/mage/view/ChatMessage.java @@ -45,15 +45,15 @@ public class ChatMessage implements Serializable { private MessageType messageType; public enum MessageColor { - BLACK, RED, GREEN, BLUE, ORANGE, YELLOW; + BLACK, RED, GREEN, BLUE, ORANGE, YELLOW } public enum MessageType { - USER_INFO, STATUS, GAME, TALK, WHISPER; + USER_INFO, STATUS, GAME, TALK, WHISPER } public enum SoundToPlay { - PlayerLeft, PlayerQuitTournament, PlayerSubmittedDeck, PlayerWhispered; + PlayerLeft, PlayerQuitTournament, PlayerSubmittedDeck, PlayerWhispered } public ChatMessage(String username, String message, String time, MessageColor color) { diff --git a/Mage.Common/src/mage/view/GameView.java b/Mage.Common/src/mage/view/GameView.java index 1c55dac8424..a9f7bfa9ee9 100644 --- a/Mage.Common/src/mage/view/GameView.java +++ b/Mage.Common/src/mage/view/GameView.java @@ -191,7 +191,7 @@ public class GameView implements Serializable { if (priorityPlayer != null && createdForPlayer != null && createdForPlayerId != null && createdForPlayer.isGameUnderControl() && (createdForPlayerId.equals(priorityPlayer.getId()) // player controls the turn || createdForPlayer.getPlayersUnderYourControl().contains(priorityPlayer.getId()))) { // player controls active players turn - this.special = state.getSpecialActions().getControlledBy(priorityPlayer.getId(), priorityPlayer.isInPayManaMode()).size() > 0; + this.special = !state.getSpecialActions().getControlledBy(priorityPlayer.getId(), priorityPlayer.isInPayManaMode()).isEmpty(); } } else { this.special = false; diff --git a/Mage.Common/src/mage/view/MatchView.java b/Mage.Common/src/mage/view/MatchView.java index 47fc3d66251..23cf644ff57 100644 --- a/Mage.Common/src/mage/view/MatchView.java +++ b/Mage.Common/src/mage/view/MatchView.java @@ -143,7 +143,7 @@ public class MatchView implements Serializable { } this.players = sb1.toString(); StringBuilder sb2 = new StringBuilder(); - if (table.getTournament().getRounds().size() > 0) { + if (!table.getTournament().getRounds().isEmpty()) { for (TournamentPlayer tPlayer : table.getTournament().getPlayers()) { sb2.append(tPlayer.getPlayer().getName()).append(": ").append(tPlayer.getResults()).append(' '); } diff --git a/Mage.Common/src/mage/view/PermanentView.java b/Mage.Common/src/mage/view/PermanentView.java index 9e44be61692..003af1f6930 100644 --- a/Mage.Common/src/mage/view/PermanentView.java +++ b/Mage.Common/src/mage/view/PermanentView.java @@ -72,7 +72,7 @@ public class PermanentView extends CardView { this.morphed = permanent.isMorphed(); this.manifested = permanent.isManifested(); this.damage = permanent.getDamage(); - if (permanent.getAttachments().size() > 0) { + if (!permanent.getAttachments().isEmpty()) { attachments = new ArrayList<>(); attachments.addAll(permanent.getAttachments()); } diff --git a/Mage.Common/src/mage/view/PlayerView.java b/Mage.Common/src/mage/view/PlayerView.java index 86f87c0a704..0d08ff3cf38 100644 --- a/Mage.Common/src/mage/view/PlayerView.java +++ b/Mage.Common/src/mage/view/PlayerView.java @@ -258,7 +258,7 @@ public class PlayerView implements Serializable { } public boolean hasAttachments() { - return attachments != null && attachments.size() > 0; + return attachments != null && !attachments.isEmpty(); } public int getStatesSavedSize() { diff --git a/Mage.Common/src/mage/view/StackAbilityView.java b/Mage.Common/src/mage/view/StackAbilityView.java index 1c5c6914d52..a34de5abf5b 100644 --- a/Mage.Common/src/mage/view/StackAbilityView.java +++ b/Mage.Common/src/mage/view/StackAbilityView.java @@ -101,7 +101,7 @@ public class StackAbilityView extends CardView { List names = new ArrayList<>(); for (UUID modeId : ability.getModes().getSelectedModes()) { Mode mode = ability.getModes().get(modeId); - if (mode.getTargets().size() > 0) { + if (!mode.getTargets().isEmpty()) { setTargets(mode.getTargets()); } else { List targetList = new ArrayList<>(); @@ -111,7 +111,7 @@ public class StackAbilityView extends CardView { targetList.add(((FixedTarget) targetPointer).getTarget()); } } - if (targetList.size() > 0) { + if (!targetList.isEmpty()) { overrideTargets(targetList); for (UUID uuid : targetList) { diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java index 17b7cf9a506..cb5a4497469 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java @@ -272,7 +272,7 @@ public class ComputerPlayer6 extends ComputerPlayer /*implements Player*/ { while (actions.peek() != null) { Ability ability = actions.poll(); logger.info(new StringBuilder("===> Act [").append(game.getPlayer(playerId).getName()).append("] Action: ").append(ability.toString()).toString()); - if (ability.getTargets().size() > 0) { + if (!ability.getTargets().isEmpty()) { for (Target target : ability.getTargets()) { for (UUID id : target.getTargets()) { target.updateTarget(id, game); @@ -318,7 +318,7 @@ public class ComputerPlayer6 extends ComputerPlayer /*implements Player*/ { //int bestScore = addActionsTimed(new FilterAbility()); currentScore = GameStateEvaluator2.evaluate(playerId, game); addActionsTimed(); - if (root.children.size() > 0) { + if (!root.children.isEmpty()) { root = root.children.get(0); //GameStateEvaluator2.evaluate(playerId, root.getGame()); int bestScore = root.getScore(); @@ -335,10 +335,10 @@ public class ComputerPlayer6 extends ComputerPlayer /*implements Player*/ { } protected boolean getNextAction(Game game) { - if (root != null && root.children.size() > 0) { + if (root != null && !root.children.isEmpty()) { SimulationNode2 test = root; root = root.children.get(0); - while (root.children.size() > 0 && !root.playerId.equals(playerId)) { + while (!root.children.isEmpty() && !root.playerId.equals(playerId)) { test = root; root = root.children.get(0); } @@ -525,7 +525,7 @@ public class ComputerPlayer6 extends ComputerPlayer /*implements Player*/ { UUID currentPlayerId = node.getGame().getPlayerList().get(); //logger.info("reached - " + val + ", playerId=" + playerId + ", node.pid="+currentPlayerId); return val; - } else if (node.getChildren().size() > 0) { + } else if (!node.getChildren().isEmpty()) { logger.trace("Add actions -- something added children:" + node.getChildren().size()); val = minimaxAB(node, depth - 1, alpha, beta); return val; @@ -542,7 +542,7 @@ public class ComputerPlayer6 extends ComputerPlayer /*implements Player*/ { if (game.gameOver(null)) { val = GameStateEvaluator2.evaluate(playerId, game); - } else if (node.getChildren().size() > 0) { + } else if (!node.getChildren().isEmpty()) { //declared attackers or blockers or triggered abilities logger.debug("Add actions -- attack/block/trigger added children:" + node.getChildren().size()); val = minimaxAB(node, depth - 1, alpha, beta); @@ -568,7 +568,7 @@ public class ComputerPlayer6 extends ComputerPlayer /*implements Player*/ { SimulationNode2 bestNode = null; List allActions = currentPlayer.simulatePriority(game); optimize(game, allActions); - if (logger.isInfoEnabled() && allActions.size() > 0 && depth == maxDepth) { + if (logger.isInfoEnabled() && !allActions.isEmpty() && depth == maxDepth) { logger.info("ADDED ACTIONS (" + allActions.size() + ") " + ' ' + allActions); } int counter = 0; @@ -614,9 +614,9 @@ public class ComputerPlayer6 extends ComputerPlayer /*implements Player*/ { .append(listTargets(game, action.getTargets())).append(')') .append(logger.isTraceEnabled() ? " #" + newNode.hashCode() : ""); SimulationNode2 logNode = newNode; - while (logNode.getChildren() != null && logNode.getChildren().size() > 0) { + while (logNode.getChildren() != null && !logNode.getChildren().isEmpty()) { logNode = logNode.getChildren().get(0); - if (logNode.getAbilities() != null && logNode.getAbilities().size() > 0) { + if (logNode.getAbilities() != null && !logNode.getAbilities().isEmpty()) { sb.append(" -> [").append(logNode.getDepth()).append(']').append(logNode.getAbilities().toString()).append('<').append(logNode.getScore()).append('>'); } } @@ -634,7 +634,7 @@ public class ComputerPlayer6 extends ComputerPlayer /*implements Player*/ { alpha = val; bestNode = newNode; bestNode.setScore(val); - if (newNode.getChildren().size() > 0) { + if (!newNode.getChildren().isEmpty()) { bestNode.setCombat(newNode.getChildren().get(0).getCombat()); } /* @@ -660,7 +660,7 @@ public class ComputerPlayer6 extends ComputerPlayer /*implements Player*/ { beta = val; bestNode = newNode; bestNode.setScore(val); - if (newNode.getChildren().size() > 0) { + if (!newNode.getChildren().isEmpty()) { bestNode.setCombat(newNode.getChildren().get(0).getCombat()); } } diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer7.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer7.java index 9dc9c247668..99bce93ce88 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer7.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer7.java @@ -164,7 +164,7 @@ public class ComputerPlayer7 extends ComputerPlayer6 { addActionsTimed(); logger.trace("After add actions timed: root.children.size = " + root.children.size()); - if (root.children.size() > 0) { + if (!root.children.isEmpty()) { root = root.children.get(0); // int bestScore = root.getScore(); // if (bestScore > currentScore || allowBadMoves) { @@ -204,7 +204,7 @@ public class ComputerPlayer7 extends ComputerPlayer6 { logger.debug("Sim Calculate post combat actions ----------------------------------------------------------------------------------------"); addActionsTimed(); - if (root != null && root.children.size() > 0) { + if (root != null && !root.children.isEmpty()) { root = root.children.get(0); int bestScore = root.getScore(); if (bestScore > currentScore || allowBadMoves) { @@ -244,7 +244,7 @@ public class ComputerPlayer7 extends ComputerPlayer6 { } while ((logNode.getParent() != null)); logger.trace(sb); } - } else if (node.getChildren().size() > 0) { + } else if (!node.getChildren().isEmpty()) { if (logger.isDebugEnabled()) { StringBuilder sb = new StringBuilder("Add Action [").append(depth) .append("] -- something added children ") @@ -299,7 +299,7 @@ public class ComputerPlayer7 extends ComputerPlayer6 { val = GameStateEvaluator2.evaluate(playerId, game); */ } - } else if (node.getChildren().size() > 0) { + } else if (!node.getChildren().isEmpty()) { if (logger.isDebugEnabled()) { StringBuilder sb = new StringBuilder("Add Action [").append(depth) .append("] -- trigger ") @@ -411,7 +411,7 @@ public class ComputerPlayer7 extends ComputerPlayer6 { beta = val; bestNode = newNode; bestNode.setScore(val); - if (newNode.getChildren().size() > 0) { + if (!newNode.getChildren().isEmpty()) { bestNode.setCombat(newNode.getChildren().get(0).getCombat()); } } @@ -419,7 +419,7 @@ public class ComputerPlayer7 extends ComputerPlayer6 { alpha = val; bestNode = newNode; bestNode.setScore(val); - if (newNode.getChildren().size() > 0) { + if (!newNode.getChildren().isEmpty()) { bestNode.setCombat(newNode.getChildren().get(0).getCombat()); } } @@ -460,7 +460,7 @@ public class ComputerPlayer7 extends ComputerPlayer6 { } Game sim = game.copy(); for (CombatGroup group : engagement.getGroups()) { - if (group.getAttackers().size() > 0) { + if (!group.getAttackers().isEmpty()) { UUID attackerId = group.getAttackers().get(0); for (UUID blockerId : group.getBlockers()) { sim.getPlayer(defenderId).declareBlocker(defenderId, blockerId, attackerId, sim); diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedAction2.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedAction2.java index 521070a1834..d9ffaea9223 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedAction2.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedAction2.java @@ -60,7 +60,7 @@ public class SimulatedAction2 { } public boolean usesStack() { - if (abilities != null && abilities.size() > 0) { + if (abilities != null && !abilities.isEmpty()) { return abilities.get(abilities.size() -1).isUsesStack(); } return true; diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedPlayer2.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedPlayer2.java index 8699ba43a4a..dc113944d3d 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedPlayer2.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/SimulatedPlayer2.java @@ -103,7 +103,7 @@ public class SimulatedPlayer2 extends ComputerPlayer { if (logger.isTraceEnabled()) { for (Ability a : allActions) { logger.info("ability==" + a); - if (a.getTargets().size() > 0) { + if (!a.getTargets().isEmpty()) { MageObject mageObject = game.getObject(a.getFirstTarget()); if (mageObject != null) { logger.info(" target=" + mageObject.getName()); @@ -177,7 +177,7 @@ public class SimulatedPlayer2 extends ComputerPlayer { } card.adjustTargets(newAbility, game); // add the different possible target option for the specific X value - if (newAbility.getTargets().getUnchosen().size() > 0) { + if (!newAbility.getTargets().getUnchosen().isEmpty()) { addTargetOptions(options, newAbility, targetNum, game); } } @@ -240,7 +240,7 @@ public class SimulatedPlayer2 extends ComputerPlayer { } List filtered = new ArrayList<>(); for (Ability option : options) { - if (option.getTargets().size() > 0 && option.getTargets().get(0).getMaxNumberOfTargets() == 1) { + if (!option.getTargets().isEmpty() && option.getTargets().get(0).getMaxNumberOfTargets() == 1) { Card card = game.getCard(ability.getSourceId()); for (String s : suggested) { String[] groups = s.split(";"); diff --git a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java index 2ec47e1f004..4d285b8e277 100644 --- a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java @@ -212,7 +212,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { } if (target.getOriginalTarget() instanceof TargetDiscard) { findPlayables(game); - if (unplayable.size() > 0) { + if (!unplayable.isEmpty()) { for (int i = unplayable.size() - 1; i >= 0; i--) { if (target.canTarget(unplayable.values().toArray(new Card[0])[i].getId(), game)) { target.add(unplayable.values().toArray(new Card[0])[i].getId(), game); @@ -222,7 +222,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { } } } - if (hand.size() > 0) { + if (!hand.isEmpty()) { for (int i = 0; i < hand.size(); i++) { if (target.canTarget(hand.toArray(new UUID[0])[i], game)) { target.add(hand.toArray(new UUID[0])[i], game); @@ -467,7 +467,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { Cards cards = new CardsImpl(target.possibleTargets(source.getSourceId(), getId(), game)); ArrayList cardsInHand = new ArrayList<>(cards.getCards(game)); while (!target.isChosen() - && target.possibleTargets(source.getSourceId(), getId(), game).size() > 0 + && !target.possibleTargets(source.getSourceId(), getId(), game).isEmpty() && target.getMaxNumberOfTargets() > target.getTargets().size()) { Card card = pickBestCard(cardsInHand, null, target, source, game); if (card != null) { @@ -482,7 +482,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { } } else { findPlayables(game); - if (unplayable.size() > 0) { + if (!unplayable.isEmpty()) { for (int i = unplayable.size() - 1; i >= 0; i--) { if (target.canTarget(getId(), unplayable.values().toArray(new Card[0])[i].getId(), source, game)) { target.addTarget(unplayable.values().toArray(new Card[0])[i].getId(), source, game); @@ -492,7 +492,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { } } } - if (hand.size() > 0) { + if (!hand.isEmpty()) { for (int i = 0; i < hand.size(); i++) { if (target.canTarget(getId(), hand.toArray(new UUID[0])[i], source, game)) { target.addTarget(hand.toArray(new UUID[0])[i], source, game); @@ -674,7 +674,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { return target.isChosen(); } if (target.getOriginalTarget() instanceof TargetSpell) { - if (game.getStack().size() > 0) { + if (!game.getStack().isEmpty()) { Iterator it = game.getStack().iterator(); while (it.hasNext()) { StackObject o = it.next(); @@ -708,7 +708,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { } } } - if (game.getStack().size() > 0) { + if (!game.getStack().isEmpty()) { Iterator it = game.getStack().iterator(); while (it.hasNext()) { StackObject stackObject = it.next(); @@ -878,7 +878,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { break; case PRECOMBAT_MAIN: findPlayables(game); - if (playableAbilities.size() > 0) { + if (!playableAbilities.isEmpty()) { for (ActivatedAbility ability : playableAbilities) { if (ability.canActivate(playerId, game)) { if (ability.getEffects().hasOutcome(Outcome.PutLandInPlay)) { @@ -909,7 +909,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { case POSTCOMBAT_MAIN: findPlayables(game); if (game.getStack().isEmpty()) { - if (playableNonInstant.size() > 0) { + if (!playableNonInstant.isEmpty()) { for (Card card : playableNonInstant) { if (card.getSpellAbility().canActivate(playerId, game)) { if (this.activateAbility(card.getSpellAbility(), game)) { @@ -918,7 +918,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { } } } - if (playableAbilities.size() > 0) { + if (!playableAbilities.isEmpty()) { for (ActivatedAbility ability : playableAbilities) { if (ability.canActivate(playerId, game)) { if (!(ability.getEffects().get(0) instanceof BecomesCreatureSourceEffect)) { @@ -975,7 +975,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { } lands.add(landCard); } - while (lands.size() > 0 && this.canPlayLand()) { + while (!lands.isEmpty() && this.canPlayLand()) { if (lands.size() == 1) { this.playLand(lands.iterator().next(), game, false); } else { @@ -1030,7 +1030,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { for (Card card : nonLands) { ManaOptions options = card.getManaCost().getOptions(); - if (card.getManaCost().getVariableCosts().size() > 0) { + if (!card.getManaCost().getVariableCosts().isEmpty()) { //don't use variable mana costs unless there is at least 3 extra mana for X for (Mana option : options) { option.add(Mana.GenericMana(3)); @@ -1062,7 +1062,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { continue; } ManaOptions abilityOptions = ability.getManaCosts().getOptions(); - if (ability.getManaCosts().getVariableCosts().size() > 0) { + if (!ability.getManaCosts().getVariableCosts().isEmpty()) { //don't use variable mana costs unless there is at least 3 extra mana for X for (Mana option : abilityOptions) { option.add(Mana.GenericMana(3)); @@ -1386,7 +1386,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { for (Permanent permanent : game.getBattlefield().getActivePermanents(this.getId(), game)) { if (game.getOpponents(this.getId()).contains(permanent.getControllerId()) && permanent.getCardType().contains(CardType.CREATURE) - && permanent.getSubtype(game).size() > 0) { + && !permanent.getSubtype(game).isEmpty()) { if (choice.getChoices().contains(permanent.getSubtype(game).get(0))) { choice.setChoice(permanent.getSubtype(game).get(0)); break; @@ -1398,7 +1398,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { for (UUID opponentId : game.getOpponents(this.getId())) { Player opponent = game.getPlayer(opponentId); for (Card card : opponent.getGraveyard().getCards(game)) { - if (card != null && card.getCardType().contains(CardType.CREATURE) && card.getSubtype(game).size() > 0) { + if (card != null && card.getCardType().contains(CardType.CREATURE) && !card.getSubtype(game).isEmpty()) { if (choice.getChoices().contains(card.getSubtype(game).get(0))) { choice.setChoice(card.getSubtype(game).get(0)); break; @@ -1414,7 +1414,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { // choose a creature type of hand or library for (UUID cardId : this.getHand()) { Card card = game.getCard(cardId); - if (card != null && card.getCardType().contains(CardType.CREATURE) && card.getSubtype(game).size() > 0) { + if (card != null && card.getCardType().contains(CardType.CREATURE) && !card.getSubtype(game).isEmpty()) { if (choice.getChoices().contains(card.getSubtype(game).get(0))) { choice.setChoice(card.getSubtype(game).get(0)); break; @@ -1424,7 +1424,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { if (!choice.isChosen()) { for (UUID cardId : this.getLibrary().getCardList()) { Card card = game.getCard(cardId); - if (card != null && card.getCardType().contains(CardType.CREATURE) && card.getSubtype(game).size() > 0) { + if (card != null && card.getCardType().contains(CardType.CREATURE) && !card.getSubtype(game).isEmpty()) { if (choice.getChoices().contains(card.getSubtype(game).get(0))) { choice.setChoice(card.getSubtype(game).get(0)); break; @@ -1545,7 +1545,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { MageObject object = game.getObject(ability.getSourceId()); if (object != null) { LinkedHashMap useableAbilities = getSpellAbilities(object, game.getState().getZone(object.getId()), game); - if (useableAbilities != null && useableAbilities.size() > 0) { + if (useableAbilities != null && !useableAbilities.isEmpty()) { game.fireGetChoiceEvent(playerId, name, object, new ArrayList<>(useableAbilities.values())); // TODO: Improve this return (SpellAbility) useableAbilities.values().iterator().next(); @@ -1584,7 +1584,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { public TriggeredAbility chooseTriggeredAbility(List abilities, Game game) { log.debug("chooseTriggeredAbility: " + abilities.toString()); //TODO: improve this - if (abilities.size() > 0) { + if (!abilities.isEmpty()) { return abilities.get(0); } return null; @@ -1729,7 +1729,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { @Override public void construct(Tournament tournament, Deck deck) { - if (deck != null && deck.getCards().size() < 40 && deck.getSideboard().size() > 0) { + if (deck != null && deck.getCards().size() < 40 && !deck.getSideboard().isEmpty()) { //pick the top 23 cards if (chosenColors == null) { for (Card card : deck.getSideboard()) { diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSPlayer.java b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSPlayer.java index d7589f2636a..ad07de128bb 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/MCTSPlayer.java @@ -52,7 +52,7 @@ public class MCTSPlayer extends ComputerPlayer { private NextAction nextAction; public enum NextAction { - PRIORITY, SELECT_ATTACKERS, SELECT_BLOCKERS; + PRIORITY, SELECT_ATTACKERS, SELECT_BLOCKERS } public MCTSPlayer(UUID id) { @@ -83,7 +83,7 @@ public class MCTSPlayer extends ComputerPlayer { for (Ability ability: playables) { List options = game.getPlayer(playerId).getPlayableOptions(ability, game); if (options.isEmpty()) { - if (ability.getManaCosts().getVariableCosts().size() > 0) { + if (!ability.getManaCosts().getVariableCosts().isEmpty()) { simulateVariableCosts(ability, all, game); } else { @@ -92,7 +92,7 @@ public class MCTSPlayer extends ComputerPlayer { } else { for (Ability option: options) { - if (ability.getManaCosts().getVariableCosts().size() > 0) { + if (!ability.getManaCosts().getVariableCosts().isEmpty()) { simulateVariableCosts(option, all, game); } else { diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/SimulatedPlayerMCTS.java b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/SimulatedPlayerMCTS.java index 344964fb755..f2b59669e4e 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/SimulatedPlayerMCTS.java +++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/SimulatedPlayerMCTS.java @@ -124,7 +124,7 @@ public class SimulatedPlayerMCTS extends MCTSPlayer { ability = options.get(RandomUtil.nextInt(options.size())); } } - if (ability.getManaCosts().getVariableCosts().size() > 0) { + if (!ability.getManaCosts().getVariableCosts().isEmpty()) { int amount = getAvailableManaProducers(game).size() - ability.getManaCosts().convertedManaCost(); if (amount > 0) { ability = ability.copy(); @@ -221,7 +221,7 @@ public class SimulatedPlayerMCTS extends MCTSPlayer { int check = RandomUtil.nextInt(numGroups + 1); if (check < numGroups) { CombatGroup group = game.getCombat().getGroups().get(check); - if (group.getAttackers().size() > 0) { + if (!group.getAttackers().isEmpty()) { this.declareBlocker(this.getId(), blocker.getId(), group.getAttackers().get(0), game); } } diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer2.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer2.java index 3cba31ffd92..d37112a665a 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer2.java +++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer2.java @@ -161,7 +161,7 @@ public class ComputerPlayer2 extends ComputerPlayer implements Player { else addActions(root, Integer.MIN_VALUE, Integer.MAX_VALUE); logger.info(name + " simulated " + nodeCount + " nodes in " + thinkTime/1000000000.0 + "s - average " + nodeCount/(thinkTime/1000000000.0) + " nodes/s"); - if (root.children.size() > 0) { + if (!root.children.isEmpty()) { root = root.children.get(0); actions = new LinkedList(root.abilities); combat = root.combat; @@ -174,10 +174,10 @@ public class ComputerPlayer2 extends ComputerPlayer implements Player { } protected boolean getNextAction(Game game) { - if (root != null && root.children.size() > 0) { + if (root != null && !root.children.isEmpty()) { SimulationNode test = root; root = root.children.get(0); - while (root.children.size() > 0 && !root.playerId.equals(playerId)) { + while (!root.children.isEmpty() && !root.playerId.equals(playerId)) { test = root; root = root.children.get(0); } @@ -335,7 +335,7 @@ public class ComputerPlayer2 extends ComputerPlayer implements Player { logger.debug(indent(node.depth) + "simulating -- reached end state"); val = GameStateEvaluator.evaluate(playerId, game); } - else if (node.getChildren().size() > 0) { + else if (!node.getChildren().isEmpty()) { logger.debug(indent(node.depth) + "simulating -- somthing added children:" + node.getChildren().size()); val = minimaxAB(node, alpha, beta); } @@ -361,7 +361,7 @@ public class ComputerPlayer2 extends ComputerPlayer implements Player { if (game.gameOver(null)) { val = GameStateEvaluator.evaluate(playerId, game); } - else if (node.getChildren().size() > 0) { + else if (!node.getChildren().isEmpty()) { //declared attackers or blockers or triggered abilities logger.debug(indent(node.depth) + "simulating -- attack/block/trigger added children:" + node.getChildren().size()); val = minimaxAB(node, alpha, beta); @@ -430,9 +430,9 @@ public class ComputerPlayer2 extends ComputerPlayer implements Player { alpha = val; bestNode = newNode; node.setCombat(newNode.getCombat()); - if (node.getTargets().size() > 0) + if (!node.getTargets().isEmpty()) targets = node.getTargets(); - if (node.getChoices().size() > 0) + if (!node.getChoices().isEmpty()) choices = node.getChoices(); } if (val == GameStateEvaluator.WIN_SCORE) { @@ -673,7 +673,7 @@ public class ComputerPlayer2 extends ComputerPlayer implements Player { @Override public void selectBlockers(Game game, UUID defendingPlayerId) { logger.debug("selectBlockers"); - if (combat != null && combat.getGroups().size() > 0) { + if (combat != null && !combat.getGroups().isEmpty()) { List groups = game.getCombat().getGroups(); for (int i = 0; i < groups.size(); i++) { if (i < combat.getGroups().size()) { diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer3.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer3.java index 2ceb791e158..c38a835d74b 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer3.java +++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer3.java @@ -139,7 +139,7 @@ public class ComputerPlayer3 extends ComputerPlayer2 implements Player { else addActions(root, Integer.MIN_VALUE, Integer.MAX_VALUE); logger.info(name + " simulated " + nodeCount + " nodes in " + thinkTime/1000000000.0 + "s - average " + nodeCount/(thinkTime/1000000000.0) + " nodes/s"); - if (root.children.size() > 0) { + if (!root.children.isEmpty()) { root = root.children.get(0); actions = new LinkedList(root.abilities); combat = root.combat; @@ -163,7 +163,7 @@ public class ComputerPlayer3 extends ComputerPlayer2 implements Player { else addActions(root, Integer.MIN_VALUE, Integer.MAX_VALUE); logger.info(name + " simulated " + nodeCount + " nodes in " + thinkTime/1000000000.0 + "s - average " + nodeCount/(thinkTime/1000000000.0) + " nodes/s"); - if (root.children.size() > 0) { + if (!root.children.isEmpty()) { root = root.children.get(0); actions = new LinkedList(root.abilities); combat = root.combat; @@ -189,7 +189,7 @@ public class ComputerPlayer3 extends ComputerPlayer2 implements Player { logger.debug(indent(node.depth) + "simulating -- reached end state"); val = GameStateEvaluator.evaluate(playerId, game); } - else if (node.getChildren().size() > 0) { + else if (!node.getChildren().isEmpty()) { logger.debug(indent(node.depth) + "simulating -- somthing added children:" + node.getChildren().size()); val = minimaxAB(node, alpha, beta); } @@ -238,7 +238,7 @@ public class ComputerPlayer3 extends ComputerPlayer2 implements Player { val = GameStateEvaluator.evaluate(playerId, game); } } - else if (node.getChildren().size() > 0) { + else if (!node.getChildren().isEmpty()) { logger.debug(indent(node.depth) + "simulating -- trigger added children:" + node.getChildren().size()); val = minimaxAB(node, alpha, beta); } @@ -388,7 +388,7 @@ public class ComputerPlayer3 extends ComputerPlayer2 implements Player { } Game sim = game.copy(); for (CombatGroup group: engagement.getGroups()) { - if (group.getAttackers().size() > 0) { + if (!group.getAttackers().isEmpty()) { UUID attackerId = group.getAttackers().get(0); for (UUID blockerId: group.getBlockers()) { sim.getPlayer(defenderId).declareBlocker(defenderId, blockerId, attackerId, sim); diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulatedAction.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulatedAction.java index 855fa0c5680..11fac9f2645 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulatedAction.java +++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulatedAction.java @@ -60,7 +60,7 @@ public class SimulatedAction { } public boolean usesStack() { - if (abilities != null && abilities.size() > 0) { + if (abilities != null && !abilities.isEmpty()) { return abilities.get(abilities.size() -1).isUsesStack(); } return true; diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulatedPlayer.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulatedPlayer.java index fdefaa68d27..fb43fcb694e 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulatedPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulatedPlayer.java @@ -90,7 +90,7 @@ public class SimulatedPlayer extends ComputerPlayer { for (Ability ability: playables) { List options = game.getPlayer(playerId).getPlayableOptions(ability, game); if (options.isEmpty()) { - if (ability.getManaCosts().getVariableCosts().size() > 0) { + if (!ability.getManaCosts().getVariableCosts().isEmpty()) { simulateVariableCosts(ability, game); } else { @@ -101,7 +101,7 @@ public class SimulatedPlayer extends ComputerPlayer { else { // ExecutorService simulationExecutor = Executors.newFixedThreadPool(4); for (Ability option: options) { - if (ability.getManaCosts().getVariableCosts().size() > 0) { + if (!ability.getManaCosts().getVariableCosts().isEmpty()) { simulateVariableCosts(option, game); } else { diff --git a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java index c199fda2c56..d5749dce835 100644 --- a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java @@ -726,7 +726,7 @@ public class HumanPlayer extends PlayerImpl { } if (actingPlayer != null) { LinkedHashMap useableAbilities = actingPlayer.getUseableActivatedAbilities(object, zone, game); - if (useableAbilities != null && useableAbilities.size() > 0) { + if (useableAbilities != null && !useableAbilities.isEmpty()) { activateAbility(useableAbilities, object, game); result = true; } @@ -912,7 +912,7 @@ public class HumanPlayer extends PlayerImpl { Zone zone = game.getState().getZone(object.getId()); if (zone != null) { LinkedHashMap useableAbilities = getUseableManaAbilities(object, zone, game); - if (useableAbilities != null && useableAbilities.size() > 0) { + if (useableAbilities != null && !useableAbilities.isEmpty()) { useableAbilities = ManaUtil.tryToAutoPay(unpaid, useableAbilities); // eliminates other abilities if one fits perfectly currentlyUnpaidMana = unpaid; activateAbility(useableAbilities, object, game); @@ -940,7 +940,7 @@ public class HumanPlayer extends PlayerImpl { } } options.put(Constants.Option.POSSIBLE_ATTACKERS, (Serializable) possibleAttackers); - if (possibleAttackers.size() > 0) { + if (!possibleAttackers.isEmpty()) { options.put(Constants.Option.SPECIAL_BUTTON, (Serializable) "All attack"); } @@ -1330,7 +1330,7 @@ public class HumanPlayer extends PlayerImpl { LinkedHashMap useableAbilities = getSpellAbilities(object, game.getState().getZone(object.getId()), game); if (useableAbilities != null && useableAbilities.size() == 1) { return (SpellAbility) useableAbilities.values().iterator().next(); - } else if (useableAbilities != null && useableAbilities.size() > 0) { + } else if (useableAbilities != null && !useableAbilities.isEmpty()) { game.fireGetChoiceEvent(playerId, name, object, new ArrayList<>(useableAbilities.values())); waitForResponse(game); if (response.getUUID() != null) { @@ -1378,7 +1378,7 @@ public class HumanPlayer extends PlayerImpl { modeMap.put(mode.getId(), modeText); } } - if (modeMap.size() > 0) { + if (!modeMap.isEmpty()) { boolean done = false; while (!done) { game.fireGetModeEvent(playerId, "Choose Mode", modeMap); diff --git a/Mage.Server/src/main/java/mage/server/User.java b/Mage.Server/src/main/java/mage/server/User.java index ec97db37532..ed71a256cf1 100644 --- a/Mage.Server/src/main/java/mage/server/User.java +++ b/Mage.Server/src/main/java/mage/server/User.java @@ -554,7 +554,7 @@ public class User { if (tournament > 0) { sb.append("Tourn: ").append(tournament).append(' '); } - if (watchedGames.size() > 0) { + if (!watchedGames.isEmpty()) { sb.append("Watch: ").append(watchedGames.size()).append(' '); } return sb.toString(); @@ -655,7 +655,7 @@ public class User { if (proto.getMatchesQuit() > 0) { quit.add("Q:" + Integer.toString(proto.getMatchesQuit())); } - if (quit.size() > 0) { + if (!quit.isEmpty()) { builder.append(" ("); joinStrings(builder, quit, " "); builder.append(')'); @@ -687,7 +687,7 @@ public class User { if (proto.getTourneysQuitDuringRound() > 0) { quit.add("R:" + Integer.toString(proto.getTourneysQuitDuringRound())); } - if (quit.size() > 0) { + if (!quit.isEmpty()) { builder.append(" ("); joinStrings(builder, quit, " "); builder.append(')'); diff --git a/Mage.Server/src/main/java/mage/server/game/GameController.java b/Mage.Server/src/main/java/mage/server/game/GameController.java index 710a6cd8b4e..0dd85984d45 100644 --- a/Mage.Server/src/main/java/mage/server/game/GameController.java +++ b/Mage.Server/src/main/java/mage/server/game/GameController.java @@ -237,7 +237,7 @@ public class GameController implements GameCallback { break; case CHOOSE_ABILITY: String objectName = null; - if (event.getChoices() != null && event.getChoices().size() > 0) { + if (event.getChoices() != null && !event.getChoices().isEmpty()) { objectName = event.getChoices().iterator().next(); } chooseAbility(event.getPlayerId(), objectName, event.getAbilities()); @@ -816,7 +816,7 @@ public class GameController implements GameCallback { private void informOthers(List players) throws MageException { // first player is always original controller Player controller = null; - if (players != null && players.size() > 0) { + if (players != null && !players.isEmpty()) { controller = game.getPlayer(players.get(0)); } if (controller == null || game.getStep() == null || game.getStep().getType() == null) { diff --git a/Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java b/Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java index 3c85d08ce83..c595ae16473 100644 --- a/Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java +++ b/Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java @@ -87,7 +87,6 @@ public class GameSessionPlayer extends GameSessionWatcher { if (!killed) { UserManager.getInstance().getUser(userId).ifPresent(user -> user.fireCallback(new ClientCallback("gameSelect", game.getId(), new GameClientMessage(getGameView(), message, options)))); } - ; } public void chooseAbility(final AbilityPickerView abilities) { @@ -233,7 +232,7 @@ public class GameSessionPlayer extends GameSessionWatcher { } private void processControlledPlayers(Player player, GameView gameView) { - if (player.getPlayersUnderYourControl().size() > 0) { + if (!player.getPlayersUnderYourControl().isEmpty()) { Map handCards = new HashMap<>(); for (UUID controlledPlayerId : player.getPlayersUnderYourControl()) { Player opponent = game.getPlayer(controlledPlayerId); diff --git a/Mage.Sets/src/mage/cards/a/ActOnImpulse.java b/Mage.Sets/src/mage/cards/a/ActOnImpulse.java index 67e5ac1587e..8fba52dd918 100644 --- a/Mage.Sets/src/mage/cards/a/ActOnImpulse.java +++ b/Mage.Sets/src/mage/cards/a/ActOnImpulse.java @@ -98,7 +98,7 @@ class ActOnImpulseExileEffect extends OneShotEffect { cards.add(card); } } - if (cards.size() > 0) { + if (!cards.isEmpty()) { List cardsId = new ArrayList<>(); for (Card card : cards) { card.moveToExile(source.getSourceId(), "Act on Impulse", source.getSourceId(), game); diff --git a/Mage.Sets/src/mage/cards/a/AgonizingMemories.java b/Mage.Sets/src/mage/cards/a/AgonizingMemories.java index 16ec49dc2be..afc34c70fd1 100644 --- a/Mage.Sets/src/mage/cards/a/AgonizingMemories.java +++ b/Mage.Sets/src/mage/cards/a/AgonizingMemories.java @@ -96,7 +96,7 @@ class AgonizingMemoriesEffect extends OneShotEffect { } private void chooseCardInHandAndPutOnTopOfLibrary(Game game, Ability source, Player you, Player targetPlayer) { - if (targetPlayer.getHand().size() > 0) { + if (!targetPlayer.getHand().isEmpty()) { TargetCard target = new TargetCard(Zone.HAND, new FilterCard("card to put on the top of library (last chosen will be on top)")); if (you.choose(Outcome.Benefit, targetPlayer.getHand(), target, game)) { Card card = targetPlayer.getHand().get(target.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/cards/a/AladdinsLamp.java b/Mage.Sets/src/mage/cards/a/AladdinsLamp.java index 0d24ffb4b4f..608529408cf 100644 --- a/Mage.Sets/src/mage/cards/a/AladdinsLamp.java +++ b/Mage.Sets/src/mage/cards/a/AladdinsLamp.java @@ -121,7 +121,7 @@ class AladdinsLampEffect extends ReplacementEffectImpl { // Put the rest on the bottom of your library in a random order - while (cards.size() > 0) { + while (!cards.isEmpty()) { Card card = cards.getRandom(game); if (card != null) { cards.remove(card); diff --git a/Mage.Sets/src/mage/cards/a/AltarOfDementia.java b/Mage.Sets/src/mage/cards/a/AltarOfDementia.java index 6355c03189d..a4467f071e6 100644 --- a/Mage.Sets/src/mage/cards/a/AltarOfDementia.java +++ b/Mage.Sets/src/mage/cards/a/AltarOfDementia.java @@ -95,7 +95,7 @@ class AltarOfDementiaEffect extends OneShotEffect { if (player != null) { int amount = 0; for (Cost cost: source.getCosts()) { - if (cost instanceof SacrificeTargetCost && ((SacrificeTargetCost)cost).getPermanents().size() > 0) { + if (cost instanceof SacrificeTargetCost && !((SacrificeTargetCost) cost).getPermanents().isEmpty()) { amount = ((SacrificeTargetCost)cost).getPermanents().get(0).getPower().getValue(); break; } diff --git a/Mage.Sets/src/mage/cards/a/AmassTheComponents.java b/Mage.Sets/src/mage/cards/a/AmassTheComponents.java index d7deb9ef33d..48944049f86 100644 --- a/Mage.Sets/src/mage/cards/a/AmassTheComponents.java +++ b/Mage.Sets/src/mage/cards/a/AmassTheComponents.java @@ -90,7 +90,7 @@ class AmassTheComponentsEffect extends OneShotEffect { } player.drawCards(3, game); - if (player.getHand().size() > 0) { + if (!player.getHand().isEmpty()) { FilterCard filter = new FilterCard("card from your hand to put on the bottom of your library"); TargetCard target = new TargetCard(Zone.HAND, filter); diff --git a/Mage.Sets/src/mage/cards/a/AncestralMemories.java b/Mage.Sets/src/mage/cards/a/AncestralMemories.java index 5929f9e5d2e..5041fb9b37c 100644 --- a/Mage.Sets/src/mage/cards/a/AncestralMemories.java +++ b/Mage.Sets/src/mage/cards/a/AncestralMemories.java @@ -98,7 +98,7 @@ class AncestralMemoriesEffect extends OneShotEffect { } } - if (cards.size() > 0) { + if (!cards.isEmpty()) { player.lookAtCards("Ancestral Memories", cards, game); TargetCard target = new TargetCard(Math.min(2, cards.size()), Zone.LIBRARY, new FilterCard("two cards to put in your hand")); diff --git a/Mage.Sets/src/mage/cards/a/AngelOfSerenity.java b/Mage.Sets/src/mage/cards/a/AngelOfSerenity.java index c2890bec7f3..9d178148156 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfSerenity.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfSerenity.java @@ -106,7 +106,7 @@ class AngelOfSerenityTriggeredAbility extends ZoneChangeTriggeredAbility { filter.add(new AnotherPredicate()); TargetCreaturePermanent target1 = new TargetCreaturePermanent(0, 3, filter, false); game.getPlayer(getControllerId()).chooseTarget(Outcome.Exile, target1, this, game); - if (target1.getTargets().size() > 0) { + if (!target1.getTargets().isEmpty()) { getTargets().add(target1); } @@ -115,7 +115,7 @@ class AngelOfSerenityTriggeredAbility extends ZoneChangeTriggeredAbility { FilterCard filter2 = new FilterCreatureCard("up to " + leftTargets + " target creature card" + (leftTargets > 1 ? "s" : "") + " from graveyards"); TargetCardInGraveyard target2 = new TargetCardInGraveyard(0, leftTargets, filter2); game.getPlayer(getControllerId()).chooseTarget(Outcome.Exile, target2, this, game); - if (target2.getTargets().size() > 0) { + if (!target2.getTargets().isEmpty()) { getTargets().add(target2); } } @@ -152,7 +152,7 @@ class AngelOfSerenityEnterEffect extends OneShotEffect { boolean result = true; Player controller = game.getPlayer(source.getControllerId()); MageObject sourceObject = game.getObject(source.getSourceId()); - if (controller != null && sourceObject != null && source.getTargets().size() > 0) { + if (controller != null && sourceObject != null && !source.getTargets().isEmpty()) { UUID exileZoneId = CardUtil.getExileZoneId(game, source.getSourceId(), source.getSourceObjectZoneChangeCounter()); for (Target target : source.getTargets()) { if (target instanceof TargetCreaturePermanent) { diff --git a/Mage.Sets/src/mage/cards/a/AngelicArbiter.java b/Mage.Sets/src/mage/cards/a/AngelicArbiter.java index 3763f196203..4c61d2ad675 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicArbiter.java +++ b/Mage.Sets/src/mage/cards/a/AngelicArbiter.java @@ -109,7 +109,7 @@ class AngelicArbiterWatcher2 extends Watcher { && game.getActivePlayerId().equals(event.getPlayerId()) && game.getOpponents(controllerId).contains(event.getPlayerId()) && game.getCombat().getAttackerId().equals(event.getPlayerId()) - && game.getCombat().getAttackers().size() > 0) { + && !game.getCombat().getAttackers().isEmpty()) { playersThatAttackedThisTurn.add(event.getPlayerId()); } } diff --git a/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java b/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java index c66f39e4fe7..07f19f2005b 100644 --- a/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java +++ b/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java @@ -105,7 +105,7 @@ class AnimalBoneyardEffect extends OneShotEffect { int toughness = 0; for (Cost cost : source.getCosts()) { - if (cost instanceof SacrificeTargetCost && ((SacrificeTargetCost) cost).getPermanents().size() > 0) { + if (cost instanceof SacrificeTargetCost && !((SacrificeTargetCost) cost).getPermanents().isEmpty()) { toughness = ((SacrificeTargetCost) cost).getPermanents().get(0).getToughness().getValue(); break; } diff --git a/Mage.Sets/src/mage/cards/a/AnimationModule.java b/Mage.Sets/src/mage/cards/a/AnimationModule.java index aec546a8a0b..8b041211fb1 100644 --- a/Mage.Sets/src/mage/cards/a/AnimationModule.java +++ b/Mage.Sets/src/mage/cards/a/AnimationModule.java @@ -143,7 +143,7 @@ class AnimationModuleEffect extends OneShotEffect { if (controller != null) { Permanent permanent = game.getPermanent(this.getTargetPointer().getFirst(game, source)); if (permanent != null) { - if (permanent.getCounters(game).size() > 0) { + if (!permanent.getCounters(game).isEmpty()) { if (permanent.getCounters(game).size() == 1) { for (Counter counter : permanent.getCounters(game).values()) { Counter newCounter = new Counter(counter.getName()); @@ -172,7 +172,7 @@ class AnimationModuleEffect extends OneShotEffect { else { Player player = game.getPlayer(this.getTargetPointer().getFirst(game, source)); if (player != null) { - if (player.getCounters().size() > 0) { + if (!player.getCounters().isEmpty()) { if (player.getCounters().size() == 1) { for (Counter counter : player.getCounters().values()) { Counter newCounter = new Counter(counter.getName()); diff --git a/Mage.Sets/src/mage/cards/a/AnimistsAwakening.java b/Mage.Sets/src/mage/cards/a/AnimistsAwakening.java index ea757d69455..fdd8295e4fd 100644 --- a/Mage.Sets/src/mage/cards/a/AnimistsAwakening.java +++ b/Mage.Sets/src/mage/cards/a/AnimistsAwakening.java @@ -93,7 +93,7 @@ class AnimistsAwakeningEffect extends OneShotEffect { Cards cards = new CardsImpl(); int xValue = source.getManaCostsToPay().getX(); cards.addAll(controller.getLibrary().getTopCards(game, xValue)); - if (cards.size() > 0) { + if (!cards.isEmpty()) { controller.revealCards(sourceObject.getIdName(), cards, game); Set toBattlefield = new LinkedHashSet<>(); for (Card card : cards.getCards(new FilterLandCard(), source.getSourceId(), source.getControllerId(), game)) { diff --git a/Mage.Sets/src/mage/cards/a/AnyaMercilessAngel.java b/Mage.Sets/src/mage/cards/a/AnyaMercilessAngel.java index b2337440461..66f9bdd0635 100644 --- a/Mage.Sets/src/mage/cards/a/AnyaMercilessAngel.java +++ b/Mage.Sets/src/mage/cards/a/AnyaMercilessAngel.java @@ -127,7 +127,7 @@ class AnyaMercilessAngelCondition implements Condition { public static AnyaMercilessAngelCondition getInstance() { return fInstance; - }; + } private AnyaMercilessAngelCondition() {} diff --git a/Mage.Sets/src/mage/cards/b/BaneAlleyBroker.java b/Mage.Sets/src/mage/cards/b/BaneAlleyBroker.java index bcd2df53f4a..3226e3cd65b 100644 --- a/Mage.Sets/src/mage/cards/b/BaneAlleyBroker.java +++ b/Mage.Sets/src/mage/cards/b/BaneAlleyBroker.java @@ -176,7 +176,7 @@ class TargetCardInBaneAlleyBrokerExile extends TargetCardInExile { if (sourceCard != null) { UUID exileId = CardUtil.getCardExileZoneId(game, sourceId); ExileZone exile = game.getExile().getExileZone(exileId); - if (exile != null && exile.size() > 0) { + if (exile != null && !exile.isEmpty()) { possibleTargets.addAll(exile); } } @@ -189,7 +189,7 @@ class TargetCardInBaneAlleyBrokerExile extends TargetCardInExile { if (sourceCard != null) { UUID exileId = CardUtil.getCardExileZoneId(game, sourceId); ExileZone exile = game.getExile().getExileZone(exileId); - if (exile != null && exile.size() > 0) { + if (exile != null && !exile.isEmpty()) { return true; } } diff --git a/Mage.Sets/src/mage/cards/b/BirthingPod.java b/Mage.Sets/src/mage/cards/b/BirthingPod.java index 3233b1eb1fb..2ede7fdac70 100644 --- a/Mage.Sets/src/mage/cards/b/BirthingPod.java +++ b/Mage.Sets/src/mage/cards/b/BirthingPod.java @@ -95,7 +95,7 @@ class BirthingPodEffect extends OneShotEffect { for (Cost cost : source.getCosts()) { if (cost instanceof SacrificeTargetCost) { SacrificeTargetCost sacrificeCost = (SacrificeTargetCost) cost; - if (sacrificeCost.getPermanents().size() > 0) { + if (!sacrificeCost.getPermanents().isEmpty()) { sacrificedPermanent = sacrificeCost.getPermanents().get(0); } break; diff --git a/Mage.Sets/src/mage/cards/b/BitterRevelation.java b/Mage.Sets/src/mage/cards/b/BitterRevelation.java index b5341a5ec41..d5f7c2ca83c 100644 --- a/Mage.Sets/src/mage/cards/b/BitterRevelation.java +++ b/Mage.Sets/src/mage/cards/b/BitterRevelation.java @@ -97,7 +97,7 @@ class BitterRevelationEffect extends OneShotEffect { cards.add(card); } } - if (cards.size() > 0) { + if (!cards.isEmpty()) { Cards cardsToHand = new CardsImpl(); player.lookAtCards("Bitter Revelation", cards, game); TargetCard target = new TargetCard(Math.min(2, cards.size()), Zone.LIBRARY, new FilterCard("two cards to put in your hand")); diff --git a/Mage.Sets/src/mage/cards/b/BlessedReincarnation.java b/Mage.Sets/src/mage/cards/b/BlessedReincarnation.java index 590761adf95..71f68f65af2 100644 --- a/Mage.Sets/src/mage/cards/b/BlessedReincarnation.java +++ b/Mage.Sets/src/mage/cards/b/BlessedReincarnation.java @@ -127,7 +127,7 @@ class BlessedReincarnationEffect extends OneShotEffect { card.putOntoBattlefield(game, Zone.LIBRARY, source.getSourceId(), player.getId()); } - if (cards.size() > 0) { + if (!cards.isEmpty()) { player.revealCards("BlessedReincarnation", cards, game); Set cardsToShuffle = cards.getCards(game); cardsToShuffle.remove(card); diff --git a/Mage.Sets/src/mage/cards/b/BorderlandExplorer.java b/Mage.Sets/src/mage/cards/b/BorderlandExplorer.java index ae0a9ac04af..5d7eee81fe6 100644 --- a/Mage.Sets/src/mage/cards/b/BorderlandExplorer.java +++ b/Mage.Sets/src/mage/cards/b/BorderlandExplorer.java @@ -136,7 +136,7 @@ class BorderlandExplorerEffect extends OneShotEffect { if (cardsPlayer != null) { TargetCardInLibrary target = new TargetCardInLibrary(0, 1, new FilterBasicLandCard()); if (player.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { Cards cards = new CardsImpl(target.getTargets()); cards.addAll(target.getTargets()); cardsToReveal.put(playerId, cards); diff --git a/Mage.Sets/src/mage/cards/b/BrionStoutarm.java b/Mage.Sets/src/mage/cards/b/BrionStoutarm.java index f021847a799..83a6d95488e 100644 --- a/Mage.Sets/src/mage/cards/b/BrionStoutarm.java +++ b/Mage.Sets/src/mage/cards/b/BrionStoutarm.java @@ -110,7 +110,7 @@ class BrionStoutarmEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { int amount = 0; for (Cost cost : source.getCosts()) { - if (cost instanceof SacrificeTargetCost && ((SacrificeTargetCost) cost).getPermanents().size() > 0) { + if (cost instanceof SacrificeTargetCost && !((SacrificeTargetCost) cost).getPermanents().isEmpty()) { amount = ((SacrificeTargetCost) cost).getPermanents().get(0).getPower().getValue(); break; } diff --git a/Mage.Sets/src/mage/cards/b/Browse.java b/Mage.Sets/src/mage/cards/b/Browse.java index 5dddb79372e..a31cedc6408 100644 --- a/Mage.Sets/src/mage/cards/b/Browse.java +++ b/Mage.Sets/src/mage/cards/b/Browse.java @@ -99,7 +99,7 @@ class BrowseEffect extends OneShotEffect { } } - if (cards.size() > 0) { + if (!cards.isEmpty()) { player.lookAtCards("Browse", cards, game); TargetCard target = new TargetCard(Zone.LIBRARY, new FilterCard("card to put in your hand")); diff --git a/Mage.Sets/src/mage/cards/c/ChandraPyromaster.java b/Mage.Sets/src/mage/cards/c/ChandraPyromaster.java index 76b5a3ca945..6c39693cf39 100644 --- a/Mage.Sets/src/mage/cards/c/ChandraPyromaster.java +++ b/Mage.Sets/src/mage/cards/c/ChandraPyromaster.java @@ -278,7 +278,7 @@ class ChandraPyromasterEffect3 extends OneShotEffect { cards.addAll(controller.getLibrary().getTopCards(game, 10)); controller.moveCardsToExile(cards.getCards(game), source, game, true, source.getSourceId(), sourceObject.getIdName()); - if (cards.getCards(new FilterInstantOrSorceryCard(), game).size() > 0) { + if (!cards.getCards(new FilterInstantOrSorceryCard(), game).isEmpty()) { TargetCard target = new TargetCard(Zone.EXILED, new FilterInstantOrSorceryCard()); if (controller.chooseTarget(Outcome.PlayForFree, cards, target, source, game)) { Card card = cards.get(target.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/cards/c/ChimneyImp.java b/Mage.Sets/src/mage/cards/c/ChimneyImp.java index 6386f9f2f5d..f18e96d11f0 100644 --- a/Mage.Sets/src/mage/cards/c/ChimneyImp.java +++ b/Mage.Sets/src/mage/cards/c/ChimneyImp.java @@ -96,7 +96,7 @@ class ChimneyImpEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player targetOpponent = game.getPlayer(this.getTargetPointer().getFirst(game, source)); if (targetOpponent != null) { - if (targetOpponent.getHand().size() > 0) { + if (!targetOpponent.getHand().isEmpty()) { TargetCardInHand target = new TargetCardInHand(); target.setNotTarget(true); target.setTargetName("a card from your hand to put on top of your library"); diff --git a/Mage.Sets/src/mage/cards/c/ChitteringRats.java b/Mage.Sets/src/mage/cards/c/ChitteringRats.java index 5364f9b99ff..2cb26c09037 100644 --- a/Mage.Sets/src/mage/cards/c/ChitteringRats.java +++ b/Mage.Sets/src/mage/cards/c/ChitteringRats.java @@ -93,7 +93,7 @@ class ChitteringRatsEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player targetOpponent = game.getPlayer(this.getTargetPointer().getFirst(game, source)); if (targetOpponent != null) { - if (targetOpponent.getHand().size() > 0) { + if (!targetOpponent.getHand().isEmpty()) { TargetCardInHand target = new TargetCardInHand(); target.setNotTarget(true); target.setTargetName("a card from your hand to put on top of your library"); diff --git a/Mage.Sets/src/mage/cards/c/ChromeMox.java b/Mage.Sets/src/mage/cards/c/ChromeMox.java index a7c8406e39a..292d9cd2a5b 100644 --- a/Mage.Sets/src/mage/cards/c/ChromeMox.java +++ b/Mage.Sets/src/mage/cards/c/ChromeMox.java @@ -107,7 +107,7 @@ class ChromeMoxEffect extends OneShotEffect { target.setNotTarget(true); Card cardToImprint = null; Permanent sourcePermanent = game.getPermanent(source.getSourceId()); - if (controller.getHand().size() > 0 && controller.choose(Outcome.Benefit, target, source.getSourceId(), game)) { + if (!controller.getHand().isEmpty() && controller.choose(Outcome.Benefit, target, source.getSourceId(), game)) { cardToImprint = controller.getHand().get(target.getFirstTarget(), game); } if (sourcePermanent != null) { @@ -154,7 +154,7 @@ class ChromeMoxManaEffect extends ManaEffect { Player player = game.getPlayer(source.getControllerId()); if (permanent != null && player != null) { List imprinted = permanent.getImprinted(); - if (imprinted.size() > 0) { + if (!imprinted.isEmpty()) { Card imprintedCard = game.getCard(imprinted.get(0)); if (imprintedCard != null) { Choice choice = new ChoiceColor(true); @@ -177,7 +177,7 @@ class ChromeMoxManaEffect extends ManaEffect { choice.getChoices().add("White"); } - if (choice.getChoices().size() > 0) { + if (!choice.getChoices().isEmpty()) { Mana mana = new Mana(); if (choice.getChoices().size() == 1) { choice.setChoice(choice.getChoices().iterator().next()); diff --git a/Mage.Sets/src/mage/cards/c/CircleOfProtectionWhite.java b/Mage.Sets/src/mage/cards/c/CircleOfProtectionWhite.java index 05cc85c8d56..d1d84a009ef 100644 --- a/Mage.Sets/src/mage/cards/c/CircleOfProtectionWhite.java +++ b/Mage.Sets/src/mage/cards/c/CircleOfProtectionWhite.java @@ -60,7 +60,7 @@ public class CircleOfProtectionWhite extends CardImpl { // {1}: The next time a white source of your choice would deal damage to you this turn, prevent that damage. Effect effect = new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, filter); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("1")));; + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("1"))); } public CircleOfProtectionWhite(final CircleOfProtectionWhite card) { diff --git a/Mage.Sets/src/mage/cards/c/CitanulFlute.java b/Mage.Sets/src/mage/cards/c/CitanulFlute.java index 013e9fbf5ff..81504b425a6 100644 --- a/Mage.Sets/src/mage/cards/c/CitanulFlute.java +++ b/Mage.Sets/src/mage/cards/c/CitanulFlute.java @@ -106,7 +106,7 @@ class CitanulFluteSearchEffect extends OneShotEffect { TargetCardInLibrary target = new TargetCardInLibrary(filter); if (player.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { Card card = player.getLibrary().getCard(target.getFirstTarget(), game); Cards cards = new CardsImpl(); if (card != null){ diff --git a/Mage.Sets/src/mage/cards/c/Clockspinning.java b/Mage.Sets/src/mage/cards/c/Clockspinning.java index 198b50ddbcf..e8aab7e5506 100644 --- a/Mage.Sets/src/mage/cards/c/Clockspinning.java +++ b/Mage.Sets/src/mage/cards/c/Clockspinning.java @@ -94,7 +94,7 @@ class ClockspinningAddOrRemoveCounterEffect extends OneShotEffect { private Counter selectCounterType(Game game, Ability source, Permanent permanent) { Player controller = game.getPlayer(source.getControllerId()); - if (controller != null && permanent.getCounters(game).size() > 0) { + if (controller != null && !permanent.getCounters(game).isEmpty()) { String counterName = null; if (permanent.getCounters(game).size() > 1) { Choice choice = new ChoiceImpl(true); @@ -122,7 +122,7 @@ class ClockspinningAddOrRemoveCounterEffect extends OneShotEffect { private Counter selectCounterType(Game game, Ability source, Card card) { Player controller = game.getPlayer(source.getControllerId()); - if (controller != null && card.getCounters(game).size() > 0) { + if (controller != null && !card.getCounters(game).isEmpty()) { String counterName = null; if (card.getCounters(game).size() > 1) { Choice choice = new ChoiceImpl(true); diff --git a/Mage.Sets/src/mage/cards/c/CloneShell.java b/Mage.Sets/src/mage/cards/c/CloneShell.java index cc61165c32a..0293a4e79a8 100644 --- a/Mage.Sets/src/mage/cards/c/CloneShell.java +++ b/Mage.Sets/src/mage/cards/c/CloneShell.java @@ -120,7 +120,7 @@ class CloneShellEffect extends OneShotEffect { target1.clearChosen(); } - if (cards.size() > 0) { + if (!cards.isEmpty()) { TargetCard target2 = new TargetCard(Zone.LIBRARY, filter2); while (player.canRespond() && cards.size() > 1) { player.choose(Outcome.Benefit, cards, target2, game); @@ -163,7 +163,7 @@ class CloneShellDiesEffect extends OneShotEffect { Permanent permanent = (Permanent) game.getLastKnownInformation(source.getSourceId(), Zone.BATTLEFIELD); if (permanent != null) { List imprinted = permanent.getImprinted(); - if (imprinted.size() > 0) { + if (!imprinted.isEmpty()) { Card imprintedCard = game.getCard(imprinted.get(0)); imprintedCard.setFaceDown(false, game); if (imprintedCard.getCardType().contains(CardType.CREATURE)) { diff --git a/Mage.Sets/src/mage/cards/c/CobraTrap.java b/Mage.Sets/src/mage/cards/c/CobraTrap.java index 08ca3436f70..7bc5b0ba42d 100644 --- a/Mage.Sets/src/mage/cards/c/CobraTrap.java +++ b/Mage.Sets/src/mage/cards/c/CobraTrap.java @@ -117,7 +117,7 @@ class CobraTrapWatcher extends Watcher { if (event.getType() == EventType.DESTROYED_PERMANENT) { Permanent perm = (Permanent) game.getPermanentOrLKIBattlefield(event.getTargetId()); // can regenerate or be indestructible if (perm != null && !perm.getCardType().contains(CardType.CREATURE)) { - if (game.getStack().size() > 0) { + if (!game.getStack().isEmpty()) { StackObject spell = game.getStack().getStackObject(event.getSourceId()); if (spell != null && game.getOpponents(perm.getControllerId()).contains(spell.getControllerId())) { players.add(perm.getControllerId()); diff --git a/Mage.Sets/src/mage/cards/c/Conflux.java b/Mage.Sets/src/mage/cards/c/Conflux.java index aa5d0003a83..a39557b81cb 100644 --- a/Mage.Sets/src/mage/cards/c/Conflux.java +++ b/Mage.Sets/src/mage/cards/c/Conflux.java @@ -109,7 +109,7 @@ class ConfluxEffect extends OneShotEffect { if (you != null && you.getLibrary().size() > 0) { if (you.searchLibrary(targetWhite, game)) { - if (targetWhite.getTargets().size() > 0) { + if (!targetWhite.getTargets().isEmpty()) { for (UUID cardId : (List) targetWhite.getTargets()) { Card card = you.getLibrary().remove(cardId, game); if (card != null) { @@ -121,7 +121,7 @@ class ConfluxEffect extends OneShotEffect { } if (you != null && you.getLibrary().size() > 0) { if (you.searchLibrary(targetBlue, game)) { - if (targetBlue.getTargets().size() > 0) { + if (!targetBlue.getTargets().isEmpty()) { for (UUID cardId : (List) targetBlue.getTargets()) { Card card = you.getLibrary().remove(cardId, game); if (card != null) { @@ -133,7 +133,7 @@ class ConfluxEffect extends OneShotEffect { } if (you != null && you.getLibrary().size() > 0) { if (you.searchLibrary(targetBlack, game)) { - if (targetBlack.getTargets().size() > 0) { + if (!targetBlack.getTargets().isEmpty()) { for (UUID cardId : (List) targetBlack.getTargets()) { Card card = you.getLibrary().remove(cardId, game); if (card != null) { @@ -145,7 +145,7 @@ class ConfluxEffect extends OneShotEffect { } if (you != null && you.getLibrary().size() > 0) { if (you.searchLibrary(targetRed, game)) { - if (targetRed.getTargets().size() > 0) { + if (!targetRed.getTargets().isEmpty()) { for (UUID cardId : (List) targetRed.getTargets()) { Card card = you.getLibrary().remove(cardId, game); if (card != null) { @@ -157,7 +157,7 @@ class ConfluxEffect extends OneShotEffect { } if (you != null && you.getLibrary().size() > 0) { if (you.searchLibrary(targetGreen, game)) { - if (targetGreen.getTargets().size() > 0) { + if (!targetGreen.getTargets().isEmpty()) { for (UUID cardId : (List) targetGreen.getTargets()) { Card card = you.getLibrary().remove(cardId, game); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/c/CongregationAtDawn.java b/Mage.Sets/src/mage/cards/c/CongregationAtDawn.java index 3521efde2b8..596c2ff2504 100644 --- a/Mage.Sets/src/mage/cards/c/CongregationAtDawn.java +++ b/Mage.Sets/src/mage/cards/c/CongregationAtDawn.java @@ -95,7 +95,7 @@ class CongregationAtDawnEffect extends OneShotEffect { if (controller != null && sourceObject != null) { TargetCardInLibrary target = new TargetCardInLibrary(0, 3, new FilterCreatureCard("creature cards")); if (controller.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { Cards revealed = new CardsImpl(); for (UUID cardId : (List) target.getTargets()) { Card card = controller.getLibrary().remove(cardId, game); diff --git a/Mage.Sets/src/mage/cards/c/CorpseConnoisseur.java b/Mage.Sets/src/mage/cards/c/CorpseConnoisseur.java index c654819659e..9917868bd94 100644 --- a/Mage.Sets/src/mage/cards/c/CorpseConnoisseur.java +++ b/Mage.Sets/src/mage/cards/c/CorpseConnoisseur.java @@ -97,7 +97,7 @@ class SearchLibraryPutInGraveyard extends SearchEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { if (controller.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { Card card = controller.getLibrary().getCard(target.getFirstTarget(), game); if (card != null) { controller.moveCards(card, Zone.GRAVEYARD, source, game); diff --git a/Mage.Sets/src/mage/cards/c/CorruptedGrafstone.java b/Mage.Sets/src/mage/cards/c/CorruptedGrafstone.java index 0f91cdd8924..5d2668e8f0e 100644 --- a/Mage.Sets/src/mage/cards/c/CorruptedGrafstone.java +++ b/Mage.Sets/src/mage/cards/c/CorruptedGrafstone.java @@ -136,7 +136,7 @@ class CorruptedGrafstoneManaEffect extends ManaEffect { if (types.getWhite() > 0) { choice.getChoices().add("White"); } - if (choice.getChoices().size() > 0) { + if (!choice.getChoices().isEmpty()) { Player player = game.getPlayer(source.getControllerId()); if (player != null) { diff --git a/Mage.Sets/src/mage/cards/c/Cultivate.java b/Mage.Sets/src/mage/cards/c/Cultivate.java index 7d29dd2a16b..b50d86bba98 100644 --- a/Mage.Sets/src/mage/cards/c/Cultivate.java +++ b/Mage.Sets/src/mage/cards/c/Cultivate.java @@ -98,7 +98,7 @@ class CultivateEffect extends OneShotEffect { } TargetCardInLibrary target = new TargetCardInLibrary(0, 2, new FilterBasicLandCard()); if (controller.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { Cards revealed = new CardsImpl(); for (UUID cardId : target.getTargets()) { Card card = controller.getLibrary().getCard(cardId, game); diff --git a/Mage.Sets/src/mage/cards/c/CurseOfChaos.java b/Mage.Sets/src/mage/cards/c/CurseOfChaos.java index 3b6eabf41bf..3889b540bcc 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfChaos.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfChaos.java @@ -140,7 +140,7 @@ class CurseOfChaosEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player attacker = game.getPlayer(this.getTargetPointer().getFirst(game, source)); if (attacker != null) { - if (attacker.getHand().size() > 0 && attacker.chooseUse(outcome, "Discard a card and draw a card?", source, game)){ + if (!attacker.getHand().isEmpty() && attacker.chooseUse(outcome, "Discard a card and draw a card?", source, game)){ attacker.discard(1, false, source, game); attacker.drawCards(1, game); } diff --git a/Mage.Sets/src/mage/cards/c/CurseOfEchoes.java b/Mage.Sets/src/mage/cards/c/CurseOfEchoes.java index 49d85b43b4d..f936fb3513c 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfEchoes.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfEchoes.java @@ -166,7 +166,7 @@ class CurseOfEchoesEffect extends OneShotEffect { @Override public String getText(Mode mode) { - if (mode.getTargets().size() > 0) { + if (!mode.getTargets().isEmpty()) { return "Copy target " + mode.getTargets().get(0).getTargetName() + ". You may choose new targets for the copy"; } return "No target"; diff --git a/Mage.Sets/src/mage/cards/c/CursedScroll.java b/Mage.Sets/src/mage/cards/c/CursedScroll.java index 18bbb0f067f..8b58b4984d2 100644 --- a/Mage.Sets/src/mage/cards/c/CursedScroll.java +++ b/Mage.Sets/src/mage/cards/c/CursedScroll.java @@ -93,7 +93,7 @@ class CursedScrollEffect extends OneShotEffect { MageObject sourceObject = game.getObject(source.getSourceId()); String cardName = (String) game.getState().getValue(source.getSourceId().toString() + NameACardEffect.INFO_KEY); if (sourceObject != null && controller != null && cardName != null && !cardName.isEmpty()) { - if (controller.getHand().size() > 0) { + if (!controller.getHand().isEmpty()) { Cards revealed = new CardsImpl(); Card card = controller.getHand().getRandom(game); revealed.add(card); diff --git a/Mage.Sets/src/mage/cards/d/DanceOfTheDead.java b/Mage.Sets/src/mage/cards/d/DanceOfTheDead.java index 4c84b49886a..990e3ca775b 100644 --- a/Mage.Sets/src/mage/cards/d/DanceOfTheDead.java +++ b/Mage.Sets/src/mage/cards/d/DanceOfTheDead.java @@ -261,7 +261,7 @@ class DanceOfTheDeadChangeAbilityEffect extends ContinuousEffectImpl implements @Override public boolean apply(Game game, Ability source) { - Permanent permanent = affectedObjectList.get(0).getPermanent(game);; + Permanent permanent = affectedObjectList.get(0).getPermanent(game); if (permanent != null) { Ability abilityToRemove = null; for (Ability ability : permanent.getAbilities()) { diff --git a/Mage.Sets/src/mage/cards/d/DarkSupplicant.java b/Mage.Sets/src/mage/cards/d/DarkSupplicant.java index 70cc2e33dcd..bde1f4d55fb 100644 --- a/Mage.Sets/src/mage/cards/d/DarkSupplicant.java +++ b/Mage.Sets/src/mage/cards/d/DarkSupplicant.java @@ -116,7 +116,7 @@ class DarkSupplicantEffect extends OneShotEffect { // Library check if (player.chooseUse(Outcome.Benefit, "Do you want to search your library for Scion of Darkness?", source, game)) { if (player.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { for (UUID cardId : (List) target.getTargets()) { Card card = player.getLibrary().getCard(cardId, game); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/d/DarthTyranus.java b/Mage.Sets/src/mage/cards/d/DarthTyranus.java index f80e8a5184a..18766d2ec60 100644 --- a/Mage.Sets/src/mage/cards/d/DarthTyranus.java +++ b/Mage.Sets/src/mage/cards/d/DarthTyranus.java @@ -148,7 +148,7 @@ class TransmuteArtifactEffect extends SearchEffect { } } if (sacrifice && controller.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { for (UUID cardId : target.getTargets()) { Card card = controller.getLibrary().getCard(cardId, game); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/d/DementiaSliver.java b/Mage.Sets/src/mage/cards/d/DementiaSliver.java index 73b15fc748c..f1ba7513f5c 100644 --- a/Mage.Sets/src/mage/cards/d/DementiaSliver.java +++ b/Mage.Sets/src/mage/cards/d/DementiaSliver.java @@ -107,7 +107,7 @@ class DementiaSliverEffect extends OneShotEffect { MageObject sourceObject = game.getObject(source.getSourceId()); String cardName = (String) game.getState().getValue(source.getSourceId().toString() + NameACardEffect.INFO_KEY); if (opponent != null && sourceObject != null && !cardName.isEmpty()) { - if (opponent.getHand().size() > 0) { + if (!opponent.getHand().isEmpty()) { Cards revealed = new CardsImpl(); Card card = opponent.getHand().getRandom(game); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/d/DeployTheGatewatch.java b/Mage.Sets/src/mage/cards/d/DeployTheGatewatch.java index 9bdef7febab..d9042c27e77 100644 --- a/Mage.Sets/src/mage/cards/d/DeployTheGatewatch.java +++ b/Mage.Sets/src/mage/cards/d/DeployTheGatewatch.java @@ -123,7 +123,7 @@ class DeployTheGatewatchEffect extends OneShotEffect { } // Put the rest on the bottom of your library in a random order - while (cards.size() > 0) { + while (!cards.isEmpty()) { Card card = cards.getRandom(game); if (card != null) { cards.remove(card); diff --git a/Mage.Sets/src/mage/cards/d/DescendantOfMasumaro.java b/Mage.Sets/src/mage/cards/d/DescendantOfMasumaro.java index 448e94ffb9b..5412a84808b 100644 --- a/Mage.Sets/src/mage/cards/d/DescendantOfMasumaro.java +++ b/Mage.Sets/src/mage/cards/d/DescendantOfMasumaro.java @@ -95,11 +95,11 @@ class DescendantOfMasumaroEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); Permanent sourcePermanent = game.getPermanent(source.getSourceId()); if (controller != null && sourcePermanent != null) { - if (controller.getHand().size() > 0) { + if (!controller.getHand().isEmpty()) { new AddCountersSourceEffect(CounterType.P1P1.createInstance(controller.getHand().size()), true).apply(game, source); } Player targetOpponent = game.getPlayer(getTargetPointer().getFirst(game, source)); - if (targetOpponent != null && targetOpponent.getHand().size() > 0) { + if (targetOpponent != null && !targetOpponent.getHand().isEmpty()) { sourcePermanent.removeCounters(CounterType.P1P1.getName(), targetOpponent.getHand().size(), game); game.informPlayers(controller.getLogName() + " removes " + targetOpponent.getHand().size() + " +1/+1 counters from " + sourcePermanent.getLogName()); } diff --git a/Mage.Sets/src/mage/cards/d/DevoutInvocation.java b/Mage.Sets/src/mage/cards/d/DevoutInvocation.java index d1453073970..05854067354 100644 --- a/Mage.Sets/src/mage/cards/d/DevoutInvocation.java +++ b/Mage.Sets/src/mage/cards/d/DevoutInvocation.java @@ -98,7 +98,7 @@ class DevoutInvocationEffect extends OneShotEffect { Map options = new HashMap<>(); options.put("UI.right.btn.text", "Tapping complete"); controller.choose(outcome, target, source.getControllerId(), game, options); - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { UUID creature = target.getFirstTarget(); if (creature != null) { game.getPermanent(creature).tap(game); diff --git a/Mage.Sets/src/mage/cards/d/DimirCharm.java b/Mage.Sets/src/mage/cards/d/DimirCharm.java index 0d005c0fba0..0d4f999b50c 100644 --- a/Mage.Sets/src/mage/cards/d/DimirCharm.java +++ b/Mage.Sets/src/mage/cards/d/DimirCharm.java @@ -120,7 +120,7 @@ class DimirCharmEffect extends OneShotEffect { cards.add(card); } } - if(cards.size() > 0){ + if(!cards.isEmpty()){ TargetCard target = new TargetCard(Zone.LIBRARY, new FilterCard("Card to put back on top of library")); if(controller.chooseTarget(Outcome.Benefit, cards, target, source, game)){ Card card = cards.get(target.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/cards/d/DimirMachinations.java b/Mage.Sets/src/mage/cards/d/DimirMachinations.java index 5f9be567a62..7493efb1906 100644 --- a/Mage.Sets/src/mage/cards/d/DimirMachinations.java +++ b/Mage.Sets/src/mage/cards/d/DimirMachinations.java @@ -108,7 +108,7 @@ class DimirMachinationsEffect extends OneShotEffect { cards.remove(card); } } - while (cards.size() > 0) { + while (!cards.isEmpty()) { if (cards.size() == 1) { Card card = cards.get(cards.iterator().next(), game); controller.moveCardToLibraryWithInfo(card, source.getSourceId(), game, Zone.LIBRARY, true, false); diff --git a/Mage.Sets/src/mage/cards/d/DivergentTransformations.java b/Mage.Sets/src/mage/cards/d/DivergentTransformations.java index f82fec795c8..05ab36fc932 100644 --- a/Mage.Sets/src/mage/cards/d/DivergentTransformations.java +++ b/Mage.Sets/src/mage/cards/d/DivergentTransformations.java @@ -125,7 +125,7 @@ class DivergentTransformationsEffect extends OneShotEffect { card.putOntoBattlefield(game, Zone.LIBRARY, source.getSourceId(), player.getId()); } - if (cards.size() > 0) { + if (!cards.isEmpty()) { player.revealCards(sourceObject.getIdName(), cards, game); Set cardsToShuffle = cards.getCards(game); cardsToShuffle.remove(card); diff --git a/Mage.Sets/src/mage/cards/d/Dracoplasm.java b/Mage.Sets/src/mage/cards/d/Dracoplasm.java index 36f6dd28e34..8609d41e87e 100644 --- a/Mage.Sets/src/mage/cards/d/Dracoplasm.java +++ b/Mage.Sets/src/mage/cards/d/Dracoplasm.java @@ -130,7 +130,7 @@ class DracoplasmEffect extends ReplacementEffectImpl { return false; } controller.chooseTarget(Outcome.Detriment, target, source, game); - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { int power = 0; int toughness = 0; for (UUID targetId : target.getTargets()) { diff --git a/Mage.Sets/src/mage/cards/d/DralnusPet.java b/Mage.Sets/src/mage/cards/d/DralnusPet.java index 2e6f2b92964..943197b8759 100644 --- a/Mage.Sets/src/mage/cards/d/DralnusPet.java +++ b/Mage.Sets/src/mage/cards/d/DralnusPet.java @@ -121,7 +121,7 @@ class DralnusPetEffect extends OneShotEffect { && permanent.getZoneChangeCounter(game) == spellAbility.getSourceObjectZoneChangeCounter()) { int cmc = 0; for (Cost cost : spellAbility.getCosts()) { - if (cost instanceof DiscardCardCost && ((DiscardCardCost) cost).getCards().size() > 0) { + if (cost instanceof DiscardCardCost && !((DiscardCardCost) cost).getCards().isEmpty()) { cmc = ((DiscardCardCost) cost).getCards().get(0).getConvertedManaCost(); } if (cmc > 0) { diff --git a/Mage.Sets/src/mage/cards/d/Duplicant.java b/Mage.Sets/src/mage/cards/d/Duplicant.java index 2132a893d45..8f0b960c65a 100644 --- a/Mage.Sets/src/mage/cards/d/Duplicant.java +++ b/Mage.Sets/src/mage/cards/d/Duplicant.java @@ -143,7 +143,7 @@ class DuplicantContinuousEffect extends ContinuousEffectImpl { public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) { Permanent permanent = game.getPermanent(source.getSourceId()); if (permanent != null) { - if(permanent.getImprinted().size() > 0){ + if(!permanent.getImprinted().isEmpty()){ Card card = game.getCard(permanent.getImprinted().get(0)); if(card != null && card.getCardType().contains(CardType.CREATURE)) { diff --git a/Mage.Sets/src/mage/cards/e/EldritchEvolution.java b/Mage.Sets/src/mage/cards/e/EldritchEvolution.java index 1fe9634ae44..b78f3cda7f4 100644 --- a/Mage.Sets/src/mage/cards/e/EldritchEvolution.java +++ b/Mage.Sets/src/mage/cards/e/EldritchEvolution.java @@ -96,7 +96,7 @@ class EldritchEvolutionEffect extends OneShotEffect { for (Cost cost : source.getCosts()) { if (cost instanceof SacrificeTargetCost) { SacrificeTargetCost sacrificeCost = (SacrificeTargetCost) cost; - if (sacrificeCost.getPermanents().size() > 0) { + if (!sacrificeCost.getPermanents().isEmpty()) { sacrificedPermanent = sacrificeCost.getPermanents().get(0); } break; diff --git a/Mage.Sets/src/mage/cards/e/EliteArcanist.java b/Mage.Sets/src/mage/cards/e/EliteArcanist.java index f4fa74b99bc..1e3f659ed64 100644 --- a/Mage.Sets/src/mage/cards/e/EliteArcanist.java +++ b/Mage.Sets/src/mage/cards/e/EliteArcanist.java @@ -118,7 +118,7 @@ class EliteArcanistImprintEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); - if (player.getHand().size() > 0) { + if (!player.getHand().isEmpty()) { TargetCard target = new TargetCard(Zone.HAND, filter); if (target.canChoose(source.getSourceId(), source.getControllerId(), game) && player.choose(Outcome.Benefit, player.getHand(), target, game)) { diff --git a/Mage.Sets/src/mage/cards/e/EndlessHorizons.java b/Mage.Sets/src/mage/cards/e/EndlessHorizons.java index 79f3d125f81..7e10d7e92ea 100644 --- a/Mage.Sets/src/mage/cards/e/EndlessHorizons.java +++ b/Mage.Sets/src/mage/cards/e/EndlessHorizons.java @@ -105,7 +105,7 @@ class EndlessHorizonsEffect extends SearchEffect { if (you != null) { if (you.searchLibrary(target, game)) { UUID exileZone = CardUtil.getCardExileZoneId(game, source); - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { for (UUID cardId : target.getTargets()) { Card card = you.getLibrary().getCard(cardId, game); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/e/EpicExperiment.java b/Mage.Sets/src/mage/cards/e/EpicExperiment.java index 3a5ef26ea45..a2e8d0670ac 100644 --- a/Mage.Sets/src/mage/cards/e/EpicExperiment.java +++ b/Mage.Sets/src/mage/cards/e/EpicExperiment.java @@ -101,7 +101,7 @@ class EpicExperimentEffect extends OneShotEffect { return true; } cardsToCast.addAll(epicExperimentExileZone.getCards(filter, source.getSourceId(), source.getControllerId(), game)); - while (cardsToCast.size() > 0) { + while (!cardsToCast.isEmpty()) { if (!controller.chooseUse(Outcome.PlayForFree, "Cast (another) a card exiled with " + sourceObject.getLogName() + " without paying its mana cost?", source, game)) { break; } diff --git a/Mage.Sets/src/mage/cards/e/Excavator.java b/Mage.Sets/src/mage/cards/e/Excavator.java index 460035023ac..818f42ebc6c 100644 --- a/Mage.Sets/src/mage/cards/e/Excavator.java +++ b/Mage.Sets/src/mage/cards/e/Excavator.java @@ -91,8 +91,8 @@ public class Excavator extends CardImpl { class ExcavatorEffect extends ContinuousEffectImpl implements SourceEffect { - private Abilities abilities = new AbilitiesImpl();; - + private Abilities abilities = new AbilitiesImpl(); + public ExcavatorEffect() { super(Duration.EndOfTurn, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility); setText("Target creature gains landwalk of each of the land types of the sacrificed land until end of turn"); diff --git a/Mage.Sets/src/mage/cards/e/ExclusionRitual.java b/Mage.Sets/src/mage/cards/e/ExclusionRitual.java index 0579771edf8..ba5b6c58346 100644 --- a/Mage.Sets/src/mage/cards/e/ExclusionRitual.java +++ b/Mage.Sets/src/mage/cards/e/ExclusionRitual.java @@ -128,7 +128,7 @@ class ExclusionRitualReplacementEffect extends ContinuousRuleModifyingEffectImpl Permanent sourcePermanent = game.getPermanent(source.getSourceId()); Card card = game.getCard(event.getSourceId()); if (sourcePermanent != null && card != null) { - if (sourcePermanent.getImprinted().size() > 0) { + if (!sourcePermanent.getImprinted().isEmpty()) { Card imprintedCard = game.getCard(sourcePermanent.getImprinted().get(0)); if (imprintedCard != null) { return card.getName().equals(imprintedCard.getName()); diff --git a/Mage.Sets/src/mage/cards/e/EyeOfTheStorm.java b/Mage.Sets/src/mage/cards/e/EyeOfTheStorm.java index eb6f64355b4..5029bfca0df 100644 --- a/Mage.Sets/src/mage/cards/e/EyeOfTheStorm.java +++ b/Mage.Sets/src/mage/cards/e/EyeOfTheStorm.java @@ -154,7 +154,7 @@ class EyeOfTheStormEffect1 extends OneShotEffect { if (spellController.moveCardsToExile(spell, source, game, true, exileZoneId, eyeOfTheStorm.getIdName())) { eyeOfTheStorm.imprint(card.getId(), game); - if (eyeOfTheStorm.getImprinted() != null && eyeOfTheStorm.getImprinted().size() > 0) { + if (eyeOfTheStorm.getImprinted() != null && !eyeOfTheStorm.getImprinted().isEmpty()) { CardsImpl copiedCards = new CardsImpl(); for (UUID uuid : eyeOfTheStorm.getImprinted()) { card = game.getCard(uuid); diff --git a/Mage.Sets/src/mage/cards/f/Firestorm.java b/Mage.Sets/src/mage/cards/f/Firestorm.java index 1210525ca77..67e1dc7e07d 100644 --- a/Mage.Sets/src/mage/cards/f/Firestorm.java +++ b/Mage.Sets/src/mage/cards/f/Firestorm.java @@ -95,7 +95,7 @@ class FirestormEffect extends OneShotEffect { Player you = game.getPlayer(source.getControllerId()); int amount = (new GetXValue()).calculate(game, source, this); if (you != null) { - if (source.getTargets().size() > 0) { + if (!source.getTargets().isEmpty()) { for (UUID targetId : this.getTargetPointer().getTargets(game, source)) { Permanent creature = game.getPermanent(targetId); if (creature != null) { diff --git a/Mage.Sets/src/mage/cards/f/FlamesOfRemembrance.java b/Mage.Sets/src/mage/cards/f/FlamesOfRemembrance.java index 9846be0847f..6b9314a12bd 100644 --- a/Mage.Sets/src/mage/cards/f/FlamesOfRemembrance.java +++ b/Mage.Sets/src/mage/cards/f/FlamesOfRemembrance.java @@ -115,7 +115,7 @@ class FlamesOfRemembranceExileEffect extends OneShotEffect { cards.add(card); } } - if (cards.size() > 0) { + if (!cards.isEmpty()) { List cardsId = new ArrayList<>(); for (Card card : cards) { card.moveToExile(source.getSourceId(), "Flames of Remembrance", source.getSourceId(), game); diff --git a/Mage.Sets/src/mage/cards/f/Fleshwrither.java b/Mage.Sets/src/mage/cards/f/Fleshwrither.java index 4f92fb5690c..580ef74b32c 100644 --- a/Mage.Sets/src/mage/cards/f/Fleshwrither.java +++ b/Mage.Sets/src/mage/cards/f/Fleshwrither.java @@ -100,7 +100,7 @@ class FleshwritherEffect extends OneShotEffect { filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.Equal, sourceObject.getConvertedManaCost())); TargetCardInLibrary target = new TargetCardInLibrary(1, filter); if (controller.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { Cards chosen = new CardsImpl(target.getTargets()); controller.moveCards(chosen, Zone.BATTLEFIELD, source, game); } diff --git a/Mage.Sets/src/mage/cards/f/Fling.java b/Mage.Sets/src/mage/cards/f/Fling.java index 7d4526fc346..1286b38e262 100644 --- a/Mage.Sets/src/mage/cards/f/Fling.java +++ b/Mage.Sets/src/mage/cards/f/Fling.java @@ -82,7 +82,7 @@ class FlingEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { int amount = 0; for (Cost cost: source.getCosts()) { - if (cost instanceof SacrificeTargetCost && ((SacrificeTargetCost)cost).getPermanents().size() > 0) { + if (cost instanceof SacrificeTargetCost && !((SacrificeTargetCost) cost).getPermanents().isEmpty()) { amount = ((SacrificeTargetCost)cost).getPermanents().get(0).getPower().getValue(); break; } diff --git a/Mage.Sets/src/mage/cards/f/ForbiddenAlchemy.java b/Mage.Sets/src/mage/cards/f/ForbiddenAlchemy.java index 5c9e37f0f72..8ef5b97a977 100644 --- a/Mage.Sets/src/mage/cards/f/ForbiddenAlchemy.java +++ b/Mage.Sets/src/mage/cards/f/ForbiddenAlchemy.java @@ -102,7 +102,7 @@ class ForbiddenAlchemyEffect extends OneShotEffect { } } - if (cards.size() > 0) { + if (!cards.isEmpty()) { player.lookAtCards("Forbidden Alchemy", cards, game); TargetCard target = new TargetCard(Zone.LIBRARY, new FilterCard("card to put in your hand")); diff --git a/Mage.Sets/src/mage/cards/f/ForkInTheRoad.java b/Mage.Sets/src/mage/cards/f/ForkInTheRoad.java index 97b1143ea3a..066266ec64c 100644 --- a/Mage.Sets/src/mage/cards/f/ForkInTheRoad.java +++ b/Mage.Sets/src/mage/cards/f/ForkInTheRoad.java @@ -96,7 +96,7 @@ class ForkInTheRoadEffect extends OneShotEffect { } TargetCardInLibrary target = new TargetCardInLibrary(0, 2, new FilterBasicLandCard()); if (controller.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { Cards revealed = new CardsImpl(); for (UUID cardId : target.getTargets()) { Card card = game.getCard(cardId); @@ -105,7 +105,7 @@ class ForkInTheRoadEffect extends OneShotEffect { } } controller.revealCards(sourceObject.getIdName(), revealed, game); - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { TargetCard target2 = new TargetCard(Zone.LIBRARY, filter); controller.choose(Outcome.Benefit, revealed, target2, game); Card card = revealed.get(target2.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/cards/f/FriendlyFire.java b/Mage.Sets/src/mage/cards/f/FriendlyFire.java index 49ca81bfdd0..f72eb127a9e 100644 --- a/Mage.Sets/src/mage/cards/f/FriendlyFire.java +++ b/Mage.Sets/src/mage/cards/f/FriendlyFire.java @@ -93,7 +93,7 @@ class FriendlyFireEffect extends OneShotEffect { if (targetCreature != null) { Player controllerOfTargetCreature = game.getPlayer(targetCreature.getControllerId()); if (controllerOfTargetCreature != null) { - if (controllerOfTargetCreature.getHand().size() > 0) { + if (!controllerOfTargetCreature.getHand().isEmpty()) { Cards cards = new CardsImpl(); Card card = controllerOfTargetCreature.getHand().getRandom(game); cards.add(card); diff --git a/Mage.Sets/src/mage/cards/f/FromTheAshes.java b/Mage.Sets/src/mage/cards/f/FromTheAshes.java index 61b5f307e12..397d6c1fa27 100644 --- a/Mage.Sets/src/mage/cards/f/FromTheAshes.java +++ b/Mage.Sets/src/mage/cards/f/FromTheAshes.java @@ -108,7 +108,7 @@ class FromTheAshesEffect extends OneShotEffect { if (player != null) { TargetCardInLibrary target = new TargetCardInLibrary(0, entry.getValue(), new FilterBasicLandCard()); if (player.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { for (UUID cardId: target.getTargets()) { Card card = player.getLibrary().getCard(cardId, game); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/g/GaeasCradle.java b/Mage.Sets/src/mage/cards/g/GaeasCradle.java index f5251cee50a..f854815edd2 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasCradle.java +++ b/Mage.Sets/src/mage/cards/g/GaeasCradle.java @@ -45,8 +45,6 @@ public class GaeasCradle extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("creature you control"); - ; - static { filter.add(new CardTypePredicate(CardType.CREATURE)); } diff --git a/Mage.Sets/src/mage/cards/g/GallowsAtWillowHill.java b/Mage.Sets/src/mage/cards/g/GallowsAtWillowHill.java index c606c022f1f..bc1b3f797e6 100644 --- a/Mage.Sets/src/mage/cards/g/GallowsAtWillowHill.java +++ b/Mage.Sets/src/mage/cards/g/GallowsAtWillowHill.java @@ -103,7 +103,7 @@ class GallowsAtWillowHillEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { int affectedTargets = 0; - if (targetPointer.getTargets(game, source).size() > 0) { + if (!targetPointer.getTargets(game, source).isEmpty()) { for (UUID permanentId : targetPointer.getTargets(game, source)) { Permanent permanent = game.getPermanent(permanentId); if (permanent != null) { diff --git a/Mage.Sets/src/mage/cards/g/GarrukTheVeilCursed.java b/Mage.Sets/src/mage/cards/g/GarrukTheVeilCursed.java index 1708f3fa983..b2497bfad82 100644 --- a/Mage.Sets/src/mage/cards/g/GarrukTheVeilCursed.java +++ b/Mage.Sets/src/mage/cards/g/GarrukTheVeilCursed.java @@ -179,7 +179,7 @@ class GarrukTheVeilCursedEffect extends OneShotEffect { } } // reveal - if (cards.size() > 0) { + if (!cards.isEmpty()) { controller.revealCards("Garruk, the Veil-Cursed", cards, game); } // shuffle diff --git a/Mage.Sets/src/mage/cards/g/GatherThePack.java b/Mage.Sets/src/mage/cards/g/GatherThePack.java index b2526895988..cb9f66ad2ab 100644 --- a/Mage.Sets/src/mage/cards/g/GatherThePack.java +++ b/Mage.Sets/src/mage/cards/g/GatherThePack.java @@ -100,13 +100,13 @@ class GatherThePackEffect extends OneShotEffect { TargetCard target = new TargetCard(0, max, Zone.LIBRARY, new FilterCreatureCard("creature card" + (max > 1 ? "s" : "") + " to put into your hand")); if (controller.choose(Outcome.PutCreatureInPlay, cards, target, game)) { Cards cardsToHand = new CardsImpl(target.getTargets()); - if (cardsToHand.size() > 0) { + if (!cardsToHand.isEmpty()) { cards.removeAll(cardsToHand); controller.moveCards(cardsToHand, Zone.HAND, source, game); } } } - if (cards.size() > 0) { + if (!cards.isEmpty()) { controller.moveCards(cards, Zone.GRAVEYARD, source, game); } } diff --git a/Mage.Sets/src/mage/cards/g/GenesisHydra.java b/Mage.Sets/src/mage/cards/g/GenesisHydra.java index 73194b72dfd..244fe9ec2fa 100644 --- a/Mage.Sets/src/mage/cards/g/GenesisHydra.java +++ b/Mage.Sets/src/mage/cards/g/GenesisHydra.java @@ -116,7 +116,7 @@ class GenesisHydraPutOntoBattlefieldEffect extends OneShotEffect { } } - if (cards.size() > 0) { + if (!cards.isEmpty()) { controller.revealCards("Genesis Hydra", cards, game); } diff --git a/Mage.Sets/src/mage/cards/g/GenesisWave.java b/Mage.Sets/src/mage/cards/g/GenesisWave.java index 183df0353ed..858acc2c079 100644 --- a/Mage.Sets/src/mage/cards/g/GenesisWave.java +++ b/Mage.Sets/src/mage/cards/g/GenesisWave.java @@ -101,7 +101,7 @@ class GenesisWaveEffect extends OneShotEffect { Card card = controller.getLibrary().removeFromTop(game); cards.add(card); } - if (cards.size() > 0) { + if (!cards.isEmpty()) { controller.revealCards(sourceObject.getIdName(), cards, game); FilterCard filter = new FilterCard("cards with converted mana cost " + xValue + " or less to put onto the battlefield"); filter.add(new ConvertedManaCostPredicate(ComparisonType.LessThan, xValue + 1)); diff --git a/Mage.Sets/src/mage/cards/g/GhastlyDemise.java b/Mage.Sets/src/mage/cards/g/GhastlyDemise.java index 94cbed67e17..dd644caf355 100644 --- a/Mage.Sets/src/mage/cards/g/GhastlyDemise.java +++ b/Mage.Sets/src/mage/cards/g/GhastlyDemise.java @@ -107,7 +107,7 @@ class GhastlyDemiseEffect extends OneShotEffect { } } } - } else if (targetPointer.getTargets(game, source).size() > 0) { + } else if (!targetPointer.getTargets(game, source).isEmpty()) { for (UUID permanentId : targetPointer.getTargets(game, source)) { Permanent permanent = game.getPermanent(permanentId); if (permanent != null && permanent.getToughness().getValue() <= game.getPlayer(source.getControllerId()).getGraveyard().size()) { diff --git a/Mage.Sets/src/mage/cards/g/GiftsUngiven.java b/Mage.Sets/src/mage/cards/g/GiftsUngiven.java index 10cdeca2ffc..4b4db14aa8d 100644 --- a/Mage.Sets/src/mage/cards/g/GiftsUngiven.java +++ b/Mage.Sets/src/mage/cards/g/GiftsUngiven.java @@ -98,7 +98,7 @@ class GiftsUngivenEffect extends OneShotEffect { } GiftsUngivenTarget target = new GiftsUngivenTarget(); if (player.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { Cards cards = new CardsImpl(); for (UUID cardId : target.getTargets()) { Card card = player.getLibrary().remove(cardId, game); diff --git a/Mage.Sets/src/mage/cards/g/GlimpseTheFuture.java b/Mage.Sets/src/mage/cards/g/GlimpseTheFuture.java index cc35524d206..73ce9ae8a43 100644 --- a/Mage.Sets/src/mage/cards/g/GlimpseTheFuture.java +++ b/Mage.Sets/src/mage/cards/g/GlimpseTheFuture.java @@ -97,7 +97,7 @@ class GlimpseTheFutureEffect extends OneShotEffect { } } - if (cards.size() > 0) { + if (!cards.isEmpty()) { controller.lookAtCards("Glimpse the Future", cards, game); TargetCard target = new TargetCard(Zone.LIBRARY, new FilterCard("card to put in your hand")); diff --git a/Mage.Sets/src/mage/cards/g/Godsend.java b/Mage.Sets/src/mage/cards/g/Godsend.java index f0743615e12..209aa263419 100644 --- a/Mage.Sets/src/mage/cards/g/Godsend.java +++ b/Mage.Sets/src/mage/cards/g/Godsend.java @@ -139,7 +139,7 @@ class GodsendTriggeredAbility extends TriggeredAbilityImpl { } targetName = "a creature blocked by creature "; } - if (possibleTargets.size() > 0) { + if (!possibleTargets.isEmpty()) { this.getTargets().clear(); if (possibleTargets.size() == 1) { this.getEffects().get(0).setTargetPointer(new FixedTarget(possibleTargets.iterator().next())); diff --git a/Mage.Sets/src/mage/cards/g/GrinningTotem.java b/Mage.Sets/src/mage/cards/g/GrinningTotem.java index d9512b0b62b..039ce0bd4ae 100644 --- a/Mage.Sets/src/mage/cards/g/GrinningTotem.java +++ b/Mage.Sets/src/mage/cards/g/GrinningTotem.java @@ -189,7 +189,7 @@ class GrinningTotemDelayedTriggeredAbility extends DelayedTriggeredAbility { @Override public boolean checkInterveningIfClause(Game game) { ExileZone exileZone = game.getExile().getExileZone(exileZoneId); - return exileZone != null && exileZone.getCards(game).size() > 0; + return exileZone != null && !exileZone.getCards(game).isEmpty(); } @Override diff --git a/Mage.Sets/src/mage/cards/g/GripOfChaos.java b/Mage.Sets/src/mage/cards/g/GripOfChaos.java index 33a5f086aa8..545f620cbac 100644 --- a/Mage.Sets/src/mage/cards/g/GripOfChaos.java +++ b/Mage.Sets/src/mage/cards/g/GripOfChaos.java @@ -153,7 +153,7 @@ class GripOfChaosEffect extends OneShotEffect { for (Target target : mode.getTargets()) { UUID oldTargetId = target.getFirstTarget(); Set possibleTargets = target.possibleTargets(stackObject.getSourceId(), stackObject.getControllerId(), game); - if (possibleTargets.size() > 0) { + if (!possibleTargets.isEmpty()) { int i = 0; int rnd = RandomUtil.nextInt(possibleTargets.size()); Iterator it = possibleTargets.iterator(); diff --git a/Mage.Sets/src/mage/cards/g/Grozoth.java b/Mage.Sets/src/mage/cards/g/Grozoth.java index 813fab36828..def98cb16b8 100644 --- a/Mage.Sets/src/mage/cards/g/Grozoth.java +++ b/Mage.Sets/src/mage/cards/g/Grozoth.java @@ -118,7 +118,7 @@ class GrozothEffect extends SearchEffect { Player player = game.getPlayer(source.getControllerId()); Card sourceCard = game.getCard(source.getSourceId()); if (sourceCard != null && player != null && player.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { Cards cards = new CardsImpl(); for (UUID cardId : target.getTargets()) { Card card = player.getLibrary().remove(cardId, game); diff --git a/Mage.Sets/src/mage/cards/g/GurmagDrowner.java b/Mage.Sets/src/mage/cards/g/GurmagDrowner.java index 2b8798788e6..af4e2cfee94 100644 --- a/Mage.Sets/src/mage/cards/g/GurmagDrowner.java +++ b/Mage.Sets/src/mage/cards/g/GurmagDrowner.java @@ -100,7 +100,7 @@ class GurmagDrownerEffect extends OneShotEffect { if (controller != null && sourceObject != null) { Cards cards = new CardsImpl(); cards.addAll(controller.getLibrary().getTopCards(game, 4)); - if (cards.size() > 0) { + if (!cards.isEmpty()) { controller.lookAtCards(sourceObject.getName(), cards, game); TargetCard target = new TargetCard(Zone.LIBRARY, new FilterCard("card to put in your hand")); if (controller.choose(Outcome.Benefit, cards, target, game)) { diff --git a/Mage.Sets/src/mage/cards/h/HarmonyOfNature.java b/Mage.Sets/src/mage/cards/h/HarmonyOfNature.java index 87ebd0c15e9..253f807c782 100644 --- a/Mage.Sets/src/mage/cards/h/HarmonyOfNature.java +++ b/Mage.Sets/src/mage/cards/h/HarmonyOfNature.java @@ -99,7 +99,7 @@ class HarmonyOfNatureEffect extends OneShotEffect { Map options = new HashMap<>(); options.put("UI.right.btn.text", "Tapping complete"); controller.choose(outcome, target, source.getControllerId(), game, options); - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { UUID creature = target.getFirstTarget(); if (creature != null) { game.getPermanent(creature).tap(game); diff --git a/Mage.Sets/src/mage/cards/h/HeartOfKiran.java b/Mage.Sets/src/mage/cards/h/HeartOfKiran.java index fe0875e9825..96741ab7e2c 100644 --- a/Mage.Sets/src/mage/cards/h/HeartOfKiran.java +++ b/Mage.Sets/src/mage/cards/h/HeartOfKiran.java @@ -137,7 +137,7 @@ class HeartOfKiranAlternateCrewCost extends CostImpl { @Override public boolean canPay(Ability ability, UUID sourceId, UUID controllerId, Game game) { - return game.getBattlefield().getAllActivePermanents(filter, game).size() > 0; + return !game.getBattlefield().getAllActivePermanents(filter, game).isEmpty(); } @Override diff --git a/Mage.Sets/src/mage/cards/h/HellcarverDemon.java b/Mage.Sets/src/mage/cards/h/HellcarverDemon.java index 760dca3e2e5..0c8feae870c 100644 --- a/Mage.Sets/src/mage/cards/h/HellcarverDemon.java +++ b/Mage.Sets/src/mage/cards/h/HellcarverDemon.java @@ -100,7 +100,7 @@ class HellcarverDemonEffect extends OneShotEffect { } } - if (player != null && player.getHand().size() > 0) { + if (player != null && !player.getHand().isEmpty()) { int cardsInHand = player.getHand().size(); player.discard(cardsInHand, source, game); } diff --git a/Mage.Sets/src/mage/cards/h/HeroesPodium.java b/Mage.Sets/src/mage/cards/h/HeroesPodium.java index 883483e22d4..dc9f3c4e894 100644 --- a/Mage.Sets/src/mage/cards/h/HeroesPodium.java +++ b/Mage.Sets/src/mage/cards/h/HeroesPodium.java @@ -188,7 +188,7 @@ class HeroesPodiumEffect extends OneShotEffect { } // Put the rest on the bottom of your library in a random order - while (cards.size() > 0) { + while (!cards.isEmpty()) { Card card = cards.getRandom(game); if (card != null) { cards.remove(card); diff --git a/Mage.Sets/src/mage/cards/h/HiredTorturer.java b/Mage.Sets/src/mage/cards/h/HiredTorturer.java index 71176b413b6..ed955f4a014 100644 --- a/Mage.Sets/src/mage/cards/h/HiredTorturer.java +++ b/Mage.Sets/src/mage/cards/h/HiredTorturer.java @@ -101,7 +101,7 @@ class HiredTorturerEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(targetPointer.getFirst(game, source)); - if (player != null && player.getHand().size() > 0) { + if (player != null && !player.getHand().isEmpty()) { Cards revealed = new CardsImpl(); revealed.add(player.getHand().getRandom(game)); player.revealCards("Hired Torturer", revealed, game); diff --git a/Mage.Sets/src/mage/cards/h/HisokasGuard.java b/Mage.Sets/src/mage/cards/h/HisokasGuard.java index bbcdd1d19fb..235531f8878 100644 --- a/Mage.Sets/src/mage/cards/h/HisokasGuard.java +++ b/Mage.Sets/src/mage/cards/h/HisokasGuard.java @@ -122,7 +122,7 @@ class HisokasGuardGainAbilityTargetEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { Permanent hisokasGuard = game.getPermanent(source.getSourceId()); - if (hisokasGuard != null && hisokasGuard.getConnectedCards("HisokasGuard").size() > 0) { + if (hisokasGuard != null && !hisokasGuard.getConnectedCards("HisokasGuard").isEmpty()) { Permanent guardedCreature = game.getPermanent(hisokasGuard.getConnectedCards("HisokasGuard").get(0)); if (guardedCreature != null && hisokasGuard.isTapped()) { guardedCreature.addAbility(ability, game); diff --git a/Mage.Sets/src/mage/cards/h/HoardingDragon.java b/Mage.Sets/src/mage/cards/h/HoardingDragon.java index fd21d132191..6f378c83f11 100644 --- a/Mage.Sets/src/mage/cards/h/HoardingDragon.java +++ b/Mage.Sets/src/mage/cards/h/HoardingDragon.java @@ -105,7 +105,7 @@ class HoardingDragonEffect extends OneShotEffect { if (controller != null && sourceObject != null) { TargetCardInLibrary target = new TargetCardInLibrary(new FilterArtifactCard()); if (controller.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { Card card = controller.getLibrary().getCard(target.getFirstTarget(), game); if (card != null) { controller.moveCardToExileWithInfo(card, exileId, sourceObject.getIdName(), source.getSourceId(), game, Zone.LIBRARY, true); diff --git a/Mage.Sets/src/mage/cards/h/HopeOfGhirapur.java b/Mage.Sets/src/mage/cards/h/HopeOfGhirapur.java index a34d13da760..c69e10b666d 100644 --- a/Mage.Sets/src/mage/cards/h/HopeOfGhirapur.java +++ b/Mage.Sets/src/mage/cards/h/HopeOfGhirapur.java @@ -84,7 +84,7 @@ public class HopeOfGhirapur extends CardImpl { @Override public void adjustTargets(Ability ability, Game game) { if (ability instanceof SimpleActivatedAbility) { - if (ability.getEffects().size() > 0 && (ability.getEffects().get(0) instanceof HopeOfGhirapurCantCastEffect)) { + if (!ability.getEffects().isEmpty() && (ability.getEffects().get(0) instanceof HopeOfGhirapurCantCastEffect)) { MageObject sourceObject = ability.getSourceObject(game); if (sourceObject != null) { ability.getTargets().clear(); diff --git a/Mage.Sets/src/mage/cards/i/IgniteMemories.java b/Mage.Sets/src/mage/cards/i/IgniteMemories.java index 616f6f35908..54329cb74e1 100644 --- a/Mage.Sets/src/mage/cards/i/IgniteMemories.java +++ b/Mage.Sets/src/mage/cards/i/IgniteMemories.java @@ -85,7 +85,7 @@ class IgniteMemoriesEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(targetPointer.getFirst(game, source)); - if (player != null && player.getHand().size() > 0) { + if (player != null && !player.getHand().isEmpty()) { Cards revealed = new CardsImpl(); Card card = player.getHand().getRandom(game); revealed.add(card); diff --git a/Mage.Sets/src/mage/cards/i/InameDeathAspect.java b/Mage.Sets/src/mage/cards/i/InameDeathAspect.java index cdd3b385e34..808d84c9fca 100644 --- a/Mage.Sets/src/mage/cards/i/InameDeathAspect.java +++ b/Mage.Sets/src/mage/cards/i/InameDeathAspect.java @@ -96,7 +96,7 @@ class InameDeathAspectEffect extends SearchEffect { public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); if (player != null && player.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { player.moveCards(new CardsImpl(target.getTargets()), Zone.GRAVEYARD, source, game); } player.shuffleLibrary(source, game); diff --git a/Mage.Sets/src/mage/cards/i/IncreasingAmbition.java b/Mage.Sets/src/mage/cards/i/IncreasingAmbition.java index b7d934ad75d..7046603a202 100644 --- a/Mage.Sets/src/mage/cards/i/IncreasingAmbition.java +++ b/Mage.Sets/src/mage/cards/i/IncreasingAmbition.java @@ -103,7 +103,7 @@ class IncreasingAmbitionEffect extends SearchEffect { target = new TargetCardInLibrary(); } if (player.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { for (UUID cardId: (List)target.getTargets()) { Card card = player.getLibrary().remove(cardId, game); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/i/IndomitableCreativity.java b/Mage.Sets/src/mage/cards/i/IndomitableCreativity.java index c1b9e70a5c4..ce5746db671 100644 --- a/Mage.Sets/src/mage/cards/i/IndomitableCreativity.java +++ b/Mage.Sets/src/mage/cards/i/IndomitableCreativity.java @@ -147,7 +147,7 @@ class IndomitableCreativityEffect extends OneShotEffect { controllerOfDestroyedCreature.moveCards(card, Zone.BATTLEFIELD, source, game); } - if (cards.size() > 0) { + if (!cards.isEmpty()) { revealCards.addAll(cards); Set cardsToShuffle = cards.getCards(game); cardsToShuffle.remove(card); diff --git a/Mage.Sets/src/mage/cards/i/InfernalKirin.java b/Mage.Sets/src/mage/cards/i/InfernalKirin.java index c4dd60d086f..3051106b598 100644 --- a/Mage.Sets/src/mage/cards/i/InfernalKirin.java +++ b/Mage.Sets/src/mage/cards/i/InfernalKirin.java @@ -108,7 +108,7 @@ class InfernalKirinEffect extends OneShotEffect { } } if (targetPlayer != null) { - if (targetPlayer.getHand().size() > 0) { + if (!targetPlayer.getHand().isEmpty()) { targetPlayer.revealCards("Infernal Kirin", targetPlayer.getHand(), game); for (UUID uuid: targetPlayer.getHand().copy()) { Card card = game.getCard(uuid); diff --git a/Mage.Sets/src/mage/cards/i/InfernalTutor.java b/Mage.Sets/src/mage/cards/i/InfernalTutor.java index 11e8cc98eec..070aae33cbf 100644 --- a/Mage.Sets/src/mage/cards/i/InfernalTutor.java +++ b/Mage.Sets/src/mage/cards/i/InfernalTutor.java @@ -101,7 +101,7 @@ class InfernalTutorEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); MageObject sourceObject = game.getObject(source.getSourceId()); if (controller != null && sourceObject != null) { - if (controller.getHand().size() > 0) { + if (!controller.getHand().isEmpty()) { Card cardToReveal = null; if (controller.getHand().size() > 1) { Target target = new TargetCardInHand(new FilterCard()); diff --git a/Mage.Sets/src/mage/cards/i/InvaderParasite.java b/Mage.Sets/src/mage/cards/i/InvaderParasite.java index 9f9197a62b7..96995cc2955 100644 --- a/Mage.Sets/src/mage/cards/i/InvaderParasite.java +++ b/Mage.Sets/src/mage/cards/i/InvaderParasite.java @@ -133,7 +133,7 @@ class InvaderParasiteTriggeredAbility extends TriggeredAbilityImpl { Permanent targetPermanent = game.getPermanent(event.getTargetId()); Permanent sourcePermanent = game.getPermanent(getSourceId()); if (targetPermanent != null && sourcePermanent != null) { - if (sourcePermanent.getImprinted().size() > 0) { + if (!sourcePermanent.getImprinted().isEmpty()) { Card imprintedCard = game.getCard(sourcePermanent.getImprinted().get(0)); if (imprintedCard != null && targetPermanent.getName().equals(imprintedCard.getName())) { for (Effect effect : this.getEffects()) { diff --git a/Mage.Sets/src/mage/cards/i/IsochronScepter.java b/Mage.Sets/src/mage/cards/i/IsochronScepter.java index 96407d8af22..1ff39c48c86 100644 --- a/Mage.Sets/src/mage/cards/i/IsochronScepter.java +++ b/Mage.Sets/src/mage/cards/i/IsochronScepter.java @@ -103,7 +103,7 @@ class IsochronScepterImprintEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(source.getSourceId()); if (controller != null) { - if (controller.getHand().size() > 0) { + if (!controller.getHand().isEmpty()) { TargetCard target = new TargetCard(Zone.HAND, filter); if (target.canChoose(source.getSourceId(), source.getControllerId(), game) && controller.choose(Outcome.Benefit, controller.getHand(), target, game)) { diff --git a/Mage.Sets/src/mage/cards/j/JacesMindseeker.java b/Mage.Sets/src/mage/cards/j/JacesMindseeker.java index e29c9725b16..c4d89b23ff1 100644 --- a/Mage.Sets/src/mage/cards/j/JacesMindseeker.java +++ b/Mage.Sets/src/mage/cards/j/JacesMindseeker.java @@ -122,7 +122,7 @@ class JaceMindseekerEffect extends OneShotEffect { } // cast an instant or sorcery for free - if (cardsToCast.size() > 0) { + if (!cardsToCast.isEmpty()) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { TargetCard target = new TargetCard(Zone.GRAVEYARD, filter); // zone should be ignored here diff --git a/Mage.Sets/src/mage/cards/j/JaradsOrders.java b/Mage.Sets/src/mage/cards/j/JaradsOrders.java index 949bc6fadd3..f9a2c5a8e09 100644 --- a/Mage.Sets/src/mage/cards/j/JaradsOrders.java +++ b/Mage.Sets/src/mage/cards/j/JaradsOrders.java @@ -92,7 +92,7 @@ class JaradsOrdersEffect extends OneShotEffect { if (controller != null) { TargetCardInLibrary target = new TargetCardInLibrary(0, 2, new FilterCreatureCard("creature cards")); if (controller.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { Cards revealed = new CardsImpl(); for (UUID cardId: (List)target.getTargets()) { Card card = controller.getLibrary().getCard(cardId, game); diff --git a/Mage.Sets/src/mage/cards/j/JestersScepter.java b/Mage.Sets/src/mage/cards/j/JestersScepter.java index cdf0ba8a8ae..ac65cbeec86 100644 --- a/Mage.Sets/src/mage/cards/j/JestersScepter.java +++ b/Mage.Sets/src/mage/cards/j/JestersScepter.java @@ -191,7 +191,7 @@ class JestersScepterCost extends CostImpl { TargetCardInExile target = new TargetCardInExile(new FilterCard(), CardUtil.getCardExileZoneId(game, ability)); target.setNotTarget(true); Cards cards = game.getExile().getExileZone(CardUtil.getCardExileZoneId(game, ability)); - if (cards.size() > 0 + if (!cards.isEmpty() && controller.choose(Outcome.Benefit, cards, target, game)) { Card card = game.getCard(target.getFirstTarget()); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/k/KaaliaOfTheVast.java b/Mage.Sets/src/mage/cards/k/KaaliaOfTheVast.java index e17ecfa1c49..8ef906ed087 100644 --- a/Mage.Sets/src/mage/cards/k/KaaliaOfTheVast.java +++ b/Mage.Sets/src/mage/cards/k/KaaliaOfTheVast.java @@ -153,7 +153,7 @@ class KaaliaOfTheVastEffect extends OneShotEffect { } TargetCardInHand target = new TargetCardInHand(filter); if (target.canChoose(controller.getId(), game) && target.choose(getOutcome(), controller.getId(), source.getSourceId(), game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { UUID cardId = target.getFirstTarget(); Card card = game.getCard(cardId); if (card != null && game.getCombat() != null) { diff --git a/Mage.Sets/src/mage/cards/k/KahoMinamoHistorian.java b/Mage.Sets/src/mage/cards/k/KahoMinamoHistorian.java index b3aa1ddbc5d..1a1620da811 100644 --- a/Mage.Sets/src/mage/cards/k/KahoMinamoHistorian.java +++ b/Mage.Sets/src/mage/cards/k/KahoMinamoHistorian.java @@ -117,7 +117,7 @@ class KahoMinamoHistorianEffect extends SearchEffect { if (controller != null && sourceObject != null) { if (controller.searchLibrary(target, game)) { UUID exileZone = CardUtil.getCardExileZoneId(game, source); - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { controller.moveCardsToExile(new CardsImpl(target.getTargets()).getCards(game), source, game, true, exileZone, sourceObject.getIdName()); } } @@ -153,7 +153,7 @@ class KahoMinamoHistorianCastEffect extends OneShotEffect { filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.Equal, source.getManaCostsToPay().getX())); TargetCardInExile target = new TargetCardInExile(filter, CardUtil.getCardExileZoneId(game, source)); Cards cards = game.getExile().getExileZone(CardUtil.getCardExileZoneId(game, source)); - if (cards.size() > 0 && controller.choose(Outcome.PlayForFree, cards, target, game)) { + if (!cards.isEmpty() && controller.choose(Outcome.PlayForFree, cards, target, game)) { Card card = game.getCard(target.getFirstTarget()); if (card != null) { controller.cast(card.getSpellAbility(), game, true); diff --git a/Mage.Sets/src/mage/cards/k/KangeeAerieKeeper.java b/Mage.Sets/src/mage/cards/k/KangeeAerieKeeper.java index e97a890b5b5..f257303cb89 100644 --- a/Mage.Sets/src/mage/cards/k/KangeeAerieKeeper.java +++ b/Mage.Sets/src/mage/cards/k/KangeeAerieKeeper.java @@ -127,10 +127,10 @@ class KangeeAerieKeeperGetKickerXValue implements DynamicValue { @Override public String toString() { return "X"; - }; + } @Override public String getMessage() { return "X"; - }; + } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/k/KodamasReach.java b/Mage.Sets/src/mage/cards/k/KodamasReach.java index cfe8e345ae9..3a5563c7095 100644 --- a/Mage.Sets/src/mage/cards/k/KodamasReach.java +++ b/Mage.Sets/src/mage/cards/k/KodamasReach.java @@ -97,7 +97,7 @@ class KodamasReachEffect extends OneShotEffect { } TargetCardInLibrary target = new TargetCardInLibrary(0, 2, new FilterBasicLandCard()); if (controller.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { Cards revealed = new CardsImpl(); for (UUID cardId : target.getTargets()) { Card card = controller.getLibrary().getCard(cardId, game); diff --git a/Mage.Sets/src/mage/cards/k/KrovikanSorcerer.java b/Mage.Sets/src/mage/cards/k/KrovikanSorcerer.java index 8d94ccdfd79..c4135aeb14e 100644 --- a/Mage.Sets/src/mage/cards/k/KrovikanSorcerer.java +++ b/Mage.Sets/src/mage/cards/k/KrovikanSorcerer.java @@ -121,7 +121,7 @@ class KrovikanSorcererEffect extends OneShotEffect { drawnCards.add(cardId); } } - if (drawnCards.size() > 0) { + if (!drawnCards.isEmpty()) { TargetCard cardToDiscard = new TargetCard(Zone.HAND, new FilterCard("card to discard")); cardToDiscard.setNotTarget(true); if (player.choose(Outcome.Discard, drawnCards, cardToDiscard, game)) { diff --git a/Mage.Sets/src/mage/cards/l/Leashling.java b/Mage.Sets/src/mage/cards/l/Leashling.java index 502becf9fc7..0dc1975c39a 100644 --- a/Mage.Sets/src/mage/cards/l/Leashling.java +++ b/Mage.Sets/src/mage/cards/l/Leashling.java @@ -98,7 +98,7 @@ class PutCardFromHandOnTopOfLibrary extends CostImpl { public boolean canPay(Ability ability, UUID sourceId, UUID controllerId, Game game) { Player controller = game.getPlayer(controllerId); if (controller != null) { - return controller.getHand().size() > 0; + return !controller.getHand().isEmpty(); } return false; } diff --git a/Mage.Sets/src/mage/cards/l/LifesLegacy.java b/Mage.Sets/src/mage/cards/l/LifesLegacy.java index b5831442151..154414cdbc1 100644 --- a/Mage.Sets/src/mage/cards/l/LifesLegacy.java +++ b/Mage.Sets/src/mage/cards/l/LifesLegacy.java @@ -87,7 +87,7 @@ class LifesLegacyEffect extends OneShotEffect { } int power = 0; for (Cost cost: source.getCosts()) { - if (cost instanceof SacrificeTargetCost && ((SacrificeTargetCost)cost).getPermanents().size() > 0) { + if (cost instanceof SacrificeTargetCost && !((SacrificeTargetCost) cost).getPermanents().isEmpty()) { power = ((SacrificeTargetCost)cost).getPermanents().get(0).getPower().getValue(); break; } diff --git a/Mage.Sets/src/mage/cards/l/LordOfTheVoid.java b/Mage.Sets/src/mage/cards/l/LordOfTheVoid.java index 7b3c30be4d9..44bf64d9202 100644 --- a/Mage.Sets/src/mage/cards/l/LordOfTheVoid.java +++ b/Mage.Sets/src/mage/cards/l/LordOfTheVoid.java @@ -104,7 +104,7 @@ class LordOfTheVoidEffect extends OneShotEffect { Cards cards = new CardsImpl(); cards.addAll(player.getLibrary().getTopCards(game, 7)); controller.moveCards(cards, Zone.EXILED, source, game); - if (cards.getCards(new FilterCreatureCard(), game).size() > 0) { + if (!cards.getCards(new FilterCreatureCard(), game).isEmpty()) { TargetCard target = new TargetCard(Zone.EXILED, new FilterCreatureCard()); if (controller.chooseTarget(outcome, cards, target, source, game)) { Card card = cards.get(target.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/cards/m/MadcapExperiment.java b/Mage.Sets/src/mage/cards/m/MadcapExperiment.java index 380e4956ccb..df5a0f7a386 100644 --- a/Mage.Sets/src/mage/cards/m/MadcapExperiment.java +++ b/Mage.Sets/src/mage/cards/m/MadcapExperiment.java @@ -107,7 +107,7 @@ class MadcapExperimentEffect extends OneShotEffect { cards.remove(card); } // Put the rest on the bottom of your library in a random order - while (cards.size() > 0) { + while (!cards.isEmpty()) { card = cards.getRandom(game); if (card != null) { cards.remove(card); diff --git a/Mage.Sets/src/mage/cards/m/MagneticMountain.java b/Mage.Sets/src/mage/cards/m/MagneticMountain.java index 5d5fedaaecc..cc0e8437407 100644 --- a/Mage.Sets/src/mage/cards/m/MagneticMountain.java +++ b/Mage.Sets/src/mage/cards/m/MagneticMountain.java @@ -116,7 +116,7 @@ class MagneticMountainEffect extends DoIfCostPaid { filter.add(new ColorPredicate(ObjectColor.BLUE)); filter.add(new MagneticMountainPredicate()); - if (game.getBattlefield().getAllActivePermanents(filter, game.getActivePlayerId(), game).size()>0){ + if (!game.getBattlefield().getAllActivePermanents(filter, game.getActivePlayerId(), game).isEmpty()){ this.copy(); } return true; diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheJar.java b/Mage.Sets/src/mage/cards/m/MagusOfTheJar.java index dd06363b976..221cf6a6b3f 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheJar.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheJar.java @@ -99,7 +99,7 @@ class MagusoftheJarEffect extends OneShotEffect { Player player = game.getPlayer(playerId); if (player != null) { Cards hand = player.getHand(); - while (hand.size() > 0) { + while (!hand.isEmpty()) { Card card = hand.get(hand.iterator().next(), game); if (card != null) { card.moveToExile(getId(), "Magus of the Jar", source.getSourceId(), game); diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheScroll.java b/Mage.Sets/src/mage/cards/m/MagusOfTheScroll.java index 4cbe91aaf8f..4de52b4a1ad 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheScroll.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheScroll.java @@ -97,7 +97,7 @@ class MagusOfTheScrollEffect extends OneShotEffect { MageObject sourceObject = game.getObject(source.getSourceId()); String cardName = (String) game.getState().getValue(source.getSourceId().toString() + NameACardEffect.INFO_KEY); if (sourceObject != null && you != null && cardName != null && !cardName.isEmpty()) { - if (you.getHand().size() > 0) { + if (!you.getHand().isEmpty()) { Cards revealed = new CardsImpl(); Card card = you.getHand().getRandom(game); revealed.add(card); diff --git a/Mage.Sets/src/mage/cards/m/ManaSeverance.java b/Mage.Sets/src/mage/cards/m/ManaSeverance.java index e5b7012cd08..a923481dff8 100644 --- a/Mage.Sets/src/mage/cards/m/ManaSeverance.java +++ b/Mage.Sets/src/mage/cards/m/ManaSeverance.java @@ -65,7 +65,7 @@ class ManaSeveranceEffect extends SearchEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { if (controller.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { for (UUID cardId : target.getTargets()) { Card card = controller.getLibrary().getCard(cardId, game); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/m/ManifoldInsights.java b/Mage.Sets/src/mage/cards/m/ManifoldInsights.java index a0aa5f2b82c..019bbbbc918 100644 --- a/Mage.Sets/src/mage/cards/m/ManifoldInsights.java +++ b/Mage.Sets/src/mage/cards/m/ManifoldInsights.java @@ -113,7 +113,7 @@ class ManifoldInsightsEffect extends OneShotEffect { } } controller.moveCards(chosenCards, Zone.HAND, source, game); - while (topLib.size() > 0 && controller.isInGame()) { + while (!topLib.isEmpty() && controller.isInGame()) { Card card = topLib.getRandom(game); if (card != null) { topLib.remove(card); diff --git a/Mage.Sets/src/mage/cards/m/MarshalingTheTroops.java b/Mage.Sets/src/mage/cards/m/MarshalingTheTroops.java index 038ed6e99d2..214b130c2fd 100644 --- a/Mage.Sets/src/mage/cards/m/MarshalingTheTroops.java +++ b/Mage.Sets/src/mage/cards/m/MarshalingTheTroops.java @@ -99,7 +99,7 @@ class MarshalingTheTroopsEffect extends OneShotEffect { Map options = new HashMap<>(); options.put("UI.right.btn.text", "Tapping complete"); controller.choose(outcome, target, source.getControllerId(), game, options); - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { UUID creature = target.getFirstTarget(); if (creature != null) { game.getPermanent(creature).tap(game); diff --git a/Mage.Sets/src/mage/cards/m/MasterOfPredicaments.java b/Mage.Sets/src/mage/cards/m/MasterOfPredicaments.java index 4edce4a979e..7815eca796b 100644 --- a/Mage.Sets/src/mage/cards/m/MasterOfPredicaments.java +++ b/Mage.Sets/src/mage/cards/m/MasterOfPredicaments.java @@ -93,7 +93,7 @@ class MasterOfPredicamentsEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { - if (controller.getHand().size() > 0) { + if (!controller.getHand().isEmpty()) { Card cardFromHand = null; if (controller.getHand().size() > 1) { TargetCard target = new TargetCardInHand(new FilterCard()); diff --git a/Mage.Sets/src/mage/cards/m/MemoryJar.java b/Mage.Sets/src/mage/cards/m/MemoryJar.java index 2071f7c386f..e4461295e05 100644 --- a/Mage.Sets/src/mage/cards/m/MemoryJar.java +++ b/Mage.Sets/src/mage/cards/m/MemoryJar.java @@ -96,7 +96,7 @@ class MemoryJarEffect extends OneShotEffect { Player player = game.getPlayer(playerId); if (player != null) { Cards hand = player.getHand(); - while (hand.size() > 0) { + while (!hand.isEmpty()) { Card card = hand.get(hand.iterator().next(), game); if (card != null) { card.moveToExile(getId(), "Memory Jar", source.getSourceId(), game); diff --git a/Mage.Sets/src/mage/cards/m/MerfolkSpy.java b/Mage.Sets/src/mage/cards/m/MerfolkSpy.java index 2ab3c1f059e..8ff48fa1a26 100644 --- a/Mage.Sets/src/mage/cards/m/MerfolkSpy.java +++ b/Mage.Sets/src/mage/cards/m/MerfolkSpy.java @@ -87,7 +87,7 @@ class MerfolkSpyEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(targetPointer.getFirst(game, source)); - if (player != null && player.getHand().size() > 0) { + if (player != null && !player.getHand().isEmpty()) { Cards revealed = new CardsImpl(); revealed.add(player.getHand().getRandom(game)); player.revealCards("Merfolk Spy", revealed, game); diff --git a/Mage.Sets/src/mage/cards/m/Metamorphosis.java b/Mage.Sets/src/mage/cards/m/Metamorphosis.java index 116ff7f0093..cd3a5e68d27 100644 --- a/Mage.Sets/src/mage/cards/m/Metamorphosis.java +++ b/Mage.Sets/src/mage/cards/m/Metamorphosis.java @@ -84,7 +84,7 @@ class MetamorphosisEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { int amount = 0; for (Cost cost: source.getCosts()) { - if (cost instanceof SacrificeTargetCost && ((SacrificeTargetCost)cost).getPermanents().size() > 0) { + if (cost instanceof SacrificeTargetCost && !((SacrificeTargetCost) cost).getPermanents().isEmpty()) { amount = ((SacrificeTargetCost)cost).getPermanents().get(0).getConvertedManaCost()+1; break; } diff --git a/Mage.Sets/src/mage/cards/m/MeteorBlast.java b/Mage.Sets/src/mage/cards/m/MeteorBlast.java index 508e1121ea0..f872e2e6fd5 100644 --- a/Mage.Sets/src/mage/cards/m/MeteorBlast.java +++ b/Mage.Sets/src/mage/cards/m/MeteorBlast.java @@ -87,7 +87,7 @@ class MeteorBlastEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { - if (source.getTargets().size() > 0) { + if (!source.getTargets().isEmpty()) { for (UUID targetId : this.getTargetPointer().getTargets(game, source)) { Permanent creature = game.getPermanent(targetId); if (creature != null) { diff --git a/Mage.Sets/src/mage/cards/m/MeteorCrater.java b/Mage.Sets/src/mage/cards/m/MeteorCrater.java index 40d5f321dee..5140e0e7ff6 100644 --- a/Mage.Sets/src/mage/cards/m/MeteorCrater.java +++ b/Mage.Sets/src/mage/cards/m/MeteorCrater.java @@ -118,7 +118,7 @@ class MeteorCraterEffect extends ManaEffect { choice.getChoices().add("White"); } } - if (choice.getChoices().size() > 0) { + if (!choice.getChoices().isEmpty()) { Player player = game.getPlayer(source.getControllerId()); if (choice.getChoices().size() == 1) { choice.setChoice(choice.getChoices().iterator().next()); diff --git a/Mage.Sets/src/mage/cards/m/MimicVat.java b/Mage.Sets/src/mage/cards/m/MimicVat.java index eb3e2df711c..f78fc358f62 100644 --- a/Mage.Sets/src/mage/cards/m/MimicVat.java +++ b/Mage.Sets/src/mage/cards/m/MimicVat.java @@ -198,7 +198,7 @@ class MimicVatCreateTokenEffect extends OneShotEffect { return false; } - if (permanent.getImprinted().size() > 0) { + if (!permanent.getImprinted().isEmpty()) { Card card = game.getCard(permanent.getImprinted().get(0)); if (card != null) { PutTokenOntoBattlefieldCopyTargetEffect effect = new PutTokenOntoBattlefieldCopyTargetEffect(source.getControllerId(), null, true); diff --git a/Mage.Sets/src/mage/cards/m/MindclawShaman.java b/Mage.Sets/src/mage/cards/m/MindclawShaman.java index 6565ea86e79..65ef519ba84 100644 --- a/Mage.Sets/src/mage/cards/m/MindclawShaman.java +++ b/Mage.Sets/src/mage/cards/m/MindclawShaman.java @@ -107,7 +107,7 @@ class MindclawShamanEffect extends OneShotEffect { Player targetOpponent = game.getPlayer(source.getFirstTarget()); MageObject sourceObject = source.getSourceObject(game); if (targetOpponent != null && sourceObject != null) { - if (targetOpponent.getHand().size() > 0) { + if (!targetOpponent.getHand().isEmpty()) { targetOpponent.revealCards(sourceObject.getName(), targetOpponent.getHand(), game); Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { diff --git a/Mage.Sets/src/mage/cards/m/MindleechMass.java b/Mage.Sets/src/mage/cards/m/MindleechMass.java index 3ee2cb7299c..7c76532829e 100644 --- a/Mage.Sets/src/mage/cards/m/MindleechMass.java +++ b/Mage.Sets/src/mage/cards/m/MindleechMass.java @@ -100,8 +100,8 @@ class MindleechMassEffect extends OneShotEffect { Cards cardsInHand = new CardsImpl(); cardsInHand.addAll(opponent.getHand()); opponent.revealCards("Opponents hand", cardsInHand, game); - if (cardsInHand.size() > 0 - && cardsInHand.getCards(new FilterNonlandCard(), game).size() > 0) { + if (!cardsInHand.isEmpty() + && !cardsInHand.getCards(new FilterNonlandCard(), game).isEmpty()) { TargetCard target = new TargetCard(1, Zone.HAND, new FilterNonlandCard()); if (you.chooseTarget(Outcome.PlayForFree, cardsInHand, target, source, game)) { Card card = game.getCard(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/m/MizzixsMastery.java b/Mage.Sets/src/mage/cards/m/MizzixsMastery.java index 91f8c073482..665830c4e7d 100644 --- a/Mage.Sets/src/mage/cards/m/MizzixsMastery.java +++ b/Mage.Sets/src/mage/cards/m/MizzixsMastery.java @@ -155,7 +155,7 @@ class MizzixsMasteryOverloadEffect extends OneShotEffect { } } } - continueCasting = copiedCards.size() > 0 + continueCasting = !copiedCards.isEmpty() && controller.chooseUse(outcome, "Cast one of the copied cards without paying its mana cost?", source, game); } } diff --git a/Mage.Sets/src/mage/cards/m/MomentousFall.java b/Mage.Sets/src/mage/cards/m/MomentousFall.java index ebfff8a3a78..6696a2256e5 100644 --- a/Mage.Sets/src/mage/cards/m/MomentousFall.java +++ b/Mage.Sets/src/mage/cards/m/MomentousFall.java @@ -87,7 +87,7 @@ class MomentousFallEffect extends OneShotEffect { int toughness = 0; for (Cost cost : source.getCosts()) { - if (cost instanceof SacrificeTargetCost && ((SacrificeTargetCost) cost).getPermanents().size() > 0) { + if (cost instanceof SacrificeTargetCost && !((SacrificeTargetCost) cost).getPermanents().isEmpty()) { power = ((SacrificeTargetCost) cost).getPermanents().get(0).getPower().getValue(); toughness = ((SacrificeTargetCost) cost).getPermanents().get(0).getToughness().getValue(); break; diff --git a/Mage.Sets/src/mage/cards/m/MoonringMirror.java b/Mage.Sets/src/mage/cards/m/MoonringMirror.java index a29182d6fae..6f0c7f78ff8 100644 --- a/Mage.Sets/src/mage/cards/m/MoonringMirror.java +++ b/Mage.Sets/src/mage/cards/m/MoonringMirror.java @@ -139,7 +139,7 @@ class MoonringMirrorEffect extends OneShotEffect { if (controller != null && sourceObject != null) { UUID exileZoneId = CardUtil.getExileZoneId(game, source.getSourceId(), source.getSourceObjectZoneChangeCounter()); Cards cardsToHand = null; - if (game.getExile().getExileZone(exileZoneId) != null && game.getExile().getExileZone(exileZoneId).size() > 0) { + if (game.getExile().getExileZone(exileZoneId) != null && !game.getExile().getExileZone(exileZoneId).isEmpty()) { cardsToHand = new CardsImpl(game.getExile().getExileZone(exileZoneId)); } for (Card card : controller.getHand().getCards(game)) { diff --git a/Mage.Sets/src/mage/cards/m/MyrBattlesphere.java b/Mage.Sets/src/mage/cards/m/MyrBattlesphere.java index d83fe1e9a2c..183dc20def0 100644 --- a/Mage.Sets/src/mage/cards/m/MyrBattlesphere.java +++ b/Mage.Sets/src/mage/cards/m/MyrBattlesphere.java @@ -114,7 +114,7 @@ class MyrBattlesphereEffect extends OneShotEffect { Map options = new HashMap<>(); options.put("UI.right.btn.text", "Myr tapping complete"); controller.choose(outcome, target, source.getControllerId(), game, options); - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { UUID creature = target.getFirstTarget(); if (creature != null) { game.getPermanent(creature).tap(game); diff --git a/Mage.Sets/src/mage/cards/n/NahiriTheHarbinger.java b/Mage.Sets/src/mage/cards/n/NahiriTheHarbinger.java index fd22afd9aea..d7a89fd850f 100644 --- a/Mage.Sets/src/mage/cards/n/NahiriTheHarbinger.java +++ b/Mage.Sets/src/mage/cards/n/NahiriTheHarbinger.java @@ -135,7 +135,7 @@ class NahiriTheHarbingerEffect extends SearchEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { if (controller.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { Card card = controller.getLibrary().getCard(target.getFirstTarget(), game); controller.moveCards(card, Zone.BATTLEFIELD, source, game); Permanent permanent = game.getPermanent(card.getId()); diff --git a/Mage.Sets/src/mage/cards/n/NezumiShortfang.java b/Mage.Sets/src/mage/cards/n/NezumiShortfang.java index 2ae123ad167..a40a7193df2 100644 --- a/Mage.Sets/src/mage/cards/n/NezumiShortfang.java +++ b/Mage.Sets/src/mage/cards/n/NezumiShortfang.java @@ -137,7 +137,8 @@ class StabwhiskerLoseLifeEffect extends OneShotEffect { class CardsInTargetOpponentHandCondition implements Condition { - public static enum CountType { MORE_THAN, FEWER_THAN, EQUAL_TO }; + public static enum CountType { MORE_THAN, FEWER_THAN, EQUAL_TO } + private Condition condition; private CountType type; private int count; diff --git a/Mage.Sets/src/mage/cards/n/NissaNaturesArtisan.java b/Mage.Sets/src/mage/cards/n/NissaNaturesArtisan.java index 9bffb54a45c..170befcb90b 100644 --- a/Mage.Sets/src/mage/cards/n/NissaNaturesArtisan.java +++ b/Mage.Sets/src/mage/cards/n/NissaNaturesArtisan.java @@ -109,7 +109,7 @@ class NissaNaturesArtisanEffect extends OneShotEffect { } Cards cards = new CardsImpl(); cards.addAll(controller.getLibrary().getTopCards(game, 2)); - if (cards.size() > 0) { + if (!cards.isEmpty()) { controller.revealCards(sourceObject.getIdName(), cards, game); Set toBattlefield = new LinkedHashSet<>(); for (Card card : cards.getCards(new FilterLandCard(), source.getSourceId(), source.getControllerId(), game)) { diff --git a/Mage.Sets/src/mage/cards/n/NissaWorldwaker.java b/Mage.Sets/src/mage/cards/n/NissaWorldwaker.java index 22a4d7a10fa..7cb8b2589a0 100644 --- a/Mage.Sets/src/mage/cards/n/NissaWorldwaker.java +++ b/Mage.Sets/src/mage/cards/n/NissaWorldwaker.java @@ -117,7 +117,7 @@ class NissaWorldwakerSearchEffect extends OneShotEffect { } TargetCardInLibrary target = new TargetCardInLibrary(0, Integer.MAX_VALUE, new FilterBasicLandCard()); if (controller.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { for (UUID cardId : target.getTargets()) { Card card = controller.getLibrary().getCard(cardId, game); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/o/OrcishLibrarian.java b/Mage.Sets/src/mage/cards/o/OrcishLibrarian.java index 19327eb1ff8..1c374256afa 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishLibrarian.java +++ b/Mage.Sets/src/mage/cards/o/OrcishLibrarian.java @@ -107,10 +107,10 @@ class OrcishLibrarianEffect extends OneShotEffect { } } - if (cards.size() > 0) { + if (!cards.isEmpty()) { for (int i = 0; i < 4; i++) { - if (cards.size() > 0) + if (!cards.isEmpty()) { Card card = cards.getRandom(game); player.moveCardToExileWithInfo(card, null, null, source.getId(), game, Zone.LIBRARY, true); @@ -119,7 +119,7 @@ class OrcishLibrarianEffect extends OneShotEffect { } player.lookAtCards("OrcishLibrarian", cards, game); TargetCard target = new TargetCard (Zone.LIBRARY, new FilterCard("card to put on the top of target player's library")); - while (player.canRespond() && cards.size() > 0) { + while (player.canRespond() && !cards.isEmpty()) { player.choose(Outcome.Neutral, cards, target, game); Card card = cards.get(target.getFirstTarget(), game); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/p/PainfulMemories.java b/Mage.Sets/src/mage/cards/p/PainfulMemories.java index 35610e25443..f4d91414b55 100644 --- a/Mage.Sets/src/mage/cards/p/PainfulMemories.java +++ b/Mage.Sets/src/mage/cards/p/PainfulMemories.java @@ -90,7 +90,7 @@ class PainfulMemoriesEffect extends OneShotEffect { if (targetPlayer != null && you != null) { targetPlayer.revealCards("Painful Memories", targetPlayer.getHand(), game); - if (targetPlayer.getHand().size() > 0) { + if (!targetPlayer.getHand().isEmpty()) { TargetCard target = new TargetCard(Zone.HAND, new FilterCard()); if (you.choose(Outcome.Benefit, targetPlayer.getHand(), target, game)) { Card card = targetPlayer.getHand().get(target.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/cards/p/PanopticMirror.java b/Mage.Sets/src/mage/cards/p/PanopticMirror.java index aea3ef21da8..9b200b3410c 100644 --- a/Mage.Sets/src/mage/cards/p/PanopticMirror.java +++ b/Mage.Sets/src/mage/cards/p/PanopticMirror.java @@ -151,7 +151,7 @@ class PanopticMirrorCastEffect extends OneShotEffect { if (PanopticMirror == null) { PanopticMirror = (Permanent) game.getLastKnownInformation(source.getSourceId(), Zone.BATTLEFIELD); } - if (PanopticMirror != null && PanopticMirror.getImprinted() != null && PanopticMirror.getImprinted().size() > 0 && controller != null) { + if (PanopticMirror != null && PanopticMirror.getImprinted() != null && !PanopticMirror.getImprinted().isEmpty() && controller != null) { CardsImpl cards = new CardsImpl(); for(UUID uuid : PanopticMirror.getImprinted()){ Card card = game.getCard(uuid); diff --git a/Mage.Sets/src/mage/cards/p/Peregrination.java b/Mage.Sets/src/mage/cards/p/Peregrination.java index e6720de47bf..207b133d074 100644 --- a/Mage.Sets/src/mage/cards/p/Peregrination.java +++ b/Mage.Sets/src/mage/cards/p/Peregrination.java @@ -101,7 +101,7 @@ class PeregrinationEffect extends OneShotEffect { } TargetCardInLibrary target = new TargetCardInLibrary(0, 2, new FilterBasicLandCard()); if (controller.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { Cards revealed = new CardsImpl(); for (UUID cardId : target.getTargets()) { Card card = controller.getLibrary().getCard(cardId, game); diff --git a/Mage.Sets/src/mage/cards/p/PerishTheThought.java b/Mage.Sets/src/mage/cards/p/PerishTheThought.java index 2b55118e8d5..aad7daa150d 100644 --- a/Mage.Sets/src/mage/cards/p/PerishTheThought.java +++ b/Mage.Sets/src/mage/cards/p/PerishTheThought.java @@ -89,7 +89,7 @@ class PerishTheThoughtEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player targetOpponent = game.getPlayer(source.getFirstTarget()); if (targetOpponent != null) { - if (targetOpponent.getHand().size() > 0) { + if (!targetOpponent.getHand().isEmpty()) { targetOpponent.revealCards("Perish the Thought", targetOpponent.getHand(), game); Player you = game.getPlayer(source.getControllerId()); if (you != null) { diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianDelver.java b/Mage.Sets/src/mage/cards/p/PhyrexianDelver.java index 1e860903387..6af4f923ee5 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianDelver.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianDelver.java @@ -97,7 +97,7 @@ class PhyrexianDelverEffect extends OneShotEffect { if (creatureCard != null && controller != null) { boolean result = false; if (game.getState().getZone(creatureCard.getId()).equals(Zone.GRAVEYARD)) { - result = controller.moveCards(creatureCard, Zone.BATTLEFIELD, source, game);; + result = controller.moveCards(creatureCard, Zone.BATTLEFIELD, source, game); } controller.loseLife(creatureCard.getConvertedManaCost(), game, false); return result; diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianGrimoire.java b/Mage.Sets/src/mage/cards/p/PhyrexianGrimoire.java index b397e58158f..bc9f1e3f85e 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianGrimoire.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianGrimoire.java @@ -96,7 +96,7 @@ class PhyrexianGrimoireEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); Player opponent = game.getPlayer(source.getFirstTarget()); if (controller != null && opponent != null) { - if(controller.getGraveyard().size() > 0) + if(!controller.getGraveyard().isEmpty()) { Cards cards = new CardsImpl(); diff --git a/Mage.Sets/src/mage/cards/p/PlaneswalkersFavor.java b/Mage.Sets/src/mage/cards/p/PlaneswalkersFavor.java index 4d8b53a07ad..bfdc0a2bf9c 100644 --- a/Mage.Sets/src/mage/cards/p/PlaneswalkersFavor.java +++ b/Mage.Sets/src/mage/cards/p/PlaneswalkersFavor.java @@ -92,7 +92,7 @@ class PlaneswalkersFavorEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player opponent = game.getPlayer(source.getTargets().get(0).getFirstTarget()); - if (opponent != null && opponent.getHand().size() > 0) { + if (opponent != null && !opponent.getHand().isEmpty()) { Cards revealed = new CardsImpl(); Card card = opponent.getHand().getRandom(game); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/p/PlaneswalkersFury.java b/Mage.Sets/src/mage/cards/p/PlaneswalkersFury.java index 3b4fb8a6d78..ca92fba3da4 100644 --- a/Mage.Sets/src/mage/cards/p/PlaneswalkersFury.java +++ b/Mage.Sets/src/mage/cards/p/PlaneswalkersFury.java @@ -83,7 +83,7 @@ class PlaneswalkersFuryEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); - if (opponent != null && opponent.getHand().size() > 0) { + if (opponent != null && !opponent.getHand().isEmpty()) { Cards revealed = new CardsImpl(); Card card = opponent.getHand().getRandom(game); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/p/PlaneswalkersMirth.java b/Mage.Sets/src/mage/cards/p/PlaneswalkersMirth.java index 3c7b62b2bf7..0e4783a325e 100644 --- a/Mage.Sets/src/mage/cards/p/PlaneswalkersMirth.java +++ b/Mage.Sets/src/mage/cards/p/PlaneswalkersMirth.java @@ -84,7 +84,7 @@ class PlaneswalkersMirthEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); Player player = game.getPlayer(source.getControllerId()); - if (opponent != null && player!= null && opponent.getHand().size() > 0) { + if (opponent != null && player!= null && !opponent.getHand().isEmpty()) { Cards revealed = new CardsImpl(); Card card = opponent.getHand().getRandom(game); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/p/PlaneswalkersScorn.java b/Mage.Sets/src/mage/cards/p/PlaneswalkersScorn.java index e5784acbb42..0d20028aee3 100644 --- a/Mage.Sets/src/mage/cards/p/PlaneswalkersScorn.java +++ b/Mage.Sets/src/mage/cards/p/PlaneswalkersScorn.java @@ -92,7 +92,7 @@ class PlaneswalkersScornEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player opponent = game.getPlayer(source.getTargets().get(0).getFirstTarget()); - if (opponent != null && opponent.getHand().size() > 0) { + if (opponent != null && !opponent.getHand().isEmpty()) { Cards revealed = new CardsImpl(); Card card = opponent.getHand().getRandom(game); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/p/PolukranosWorldEater.java b/Mage.Sets/src/mage/cards/p/PolukranosWorldEater.java index 5a4afb473fd..420a70e7484 100644 --- a/Mage.Sets/src/mage/cards/p/PolukranosWorldEater.java +++ b/Mage.Sets/src/mage/cards/p/PolukranosWorldEater.java @@ -129,7 +129,7 @@ class PolukranosWorldEaterEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - if (source.getTargets().size() > 0) { + if (!source.getTargets().isEmpty()) { Target multiTarget = source.getTargets().get(0); Set permanents = new HashSet<>(); for (UUID target: multiTarget.getTargets()) { diff --git a/Mage.Sets/src/mage/cards/p/Polymorph.java b/Mage.Sets/src/mage/cards/p/Polymorph.java index bbdd68b73cc..83c62f1d5b2 100644 --- a/Mage.Sets/src/mage/cards/p/Polymorph.java +++ b/Mage.Sets/src/mage/cards/p/Polymorph.java @@ -109,7 +109,7 @@ class PolymorphEffect extends OneShotEffect { card.putOntoBattlefield(game, Zone.LIBRARY, source.getSourceId(), player.getId()); } - if (cards.size() > 0) { + if (!cards.isEmpty()) { player.revealCards("Polymorph", cards, game); Set cardsToShuffle = cards.getCards(game); cardsToShuffle.remove(card); diff --git a/Mage.Sets/src/mage/cards/p/PreeminentCaptain.java b/Mage.Sets/src/mage/cards/p/PreeminentCaptain.java index fc678157cc7..4b059077cea 100644 --- a/Mage.Sets/src/mage/cards/p/PreeminentCaptain.java +++ b/Mage.Sets/src/mage/cards/p/PreeminentCaptain.java @@ -98,7 +98,7 @@ class PreeminentCaptainEffect extends OneShotEffect { Player player = game.getPlayer(source.getControllerId()); TargetCardInHand target = new TargetCardInHand(filter); if (target.canChoose(player.getId(), game) && target.choose(getOutcome(), player.getId(), source.getSourceId(), game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { UUID cardId = target.getFirstTarget(); Card card = player.getHand().get(cardId, game); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/p/ProteusStaff.java b/Mage.Sets/src/mage/cards/p/ProteusStaff.java index 89279bdc4be..257dea02e71 100644 --- a/Mage.Sets/src/mage/cards/p/ProteusStaff.java +++ b/Mage.Sets/src/mage/cards/p/ProteusStaff.java @@ -117,7 +117,7 @@ class ProteusStaffEffect extends OneShotEffect { controller.revealCards("Proteus Staff", cards, game); // and the rest on the bottom of his or her library in any order. - while (cards.size() > 0 && controller.canRespond()) { + while (!cards.isEmpty() && controller.canRespond()) { if (cards.size() == 1) { Card card = cards.get(cards.iterator().next(), game); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/p/PrototypePortal.java b/Mage.Sets/src/mage/cards/p/PrototypePortal.java index a6e710e4dae..2335153ab5f 100644 --- a/Mage.Sets/src/mage/cards/p/PrototypePortal.java +++ b/Mage.Sets/src/mage/cards/p/PrototypePortal.java @@ -77,7 +77,7 @@ public class PrototypePortal extends CardImpl { public void adjustCosts(Ability ability, Game game) { Permanent card = game.getPermanent(ability.getSourceId()); if (card != null) { - if (card.getImprinted().size() > 0) { + if (!card.getImprinted().isEmpty()) { Card imprinted = game.getCard(card.getImprinted().get(0)); if (imprinted != null) { ability.getManaCostsToPay().add(0, new GenericManaCost(imprinted.getConvertedManaCost())); @@ -115,7 +115,7 @@ class PrototypePortalEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); MageObject sourceObject = game.getObject(source.getSourceId()); if (controller != null && sourceObject != null) { - if (controller.getHand().size() > 0) { + if (!controller.getHand().isEmpty()) { TargetCard target = new TargetCard(Zone.HAND, StaticFilters.FILTER_CARD_ARTIFACT); controller.choose(Outcome.Benefit, controller.getHand(), target, game); Card card = controller.getHand().get(target.getFirstTarget(), game); @@ -162,7 +162,7 @@ class PrototypePortalCreateTokenEffect extends OneShotEffect { return false; } - if (permanent.getImprinted().size() > 0) { + if (!permanent.getImprinted().isEmpty()) { Card card = game.getCard(permanent.getImprinted().get(0)); if (card != null) { EmptyToken token = new EmptyToken(); diff --git a/Mage.Sets/src/mage/cards/p/PryingQuestions.java b/Mage.Sets/src/mage/cards/p/PryingQuestions.java index f5375d6990d..dd4d76eaa16 100644 --- a/Mage.Sets/src/mage/cards/p/PryingQuestions.java +++ b/Mage.Sets/src/mage/cards/p/PryingQuestions.java @@ -88,7 +88,7 @@ class PryingQuestionsEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player targetOpponent = game.getPlayer(this.getTargetPointer().getFirst(game, source)); if (targetOpponent != null) { - if (targetOpponent.getHand().size() > 0) { + if (!targetOpponent.getHand().isEmpty()) { TargetCardInHand target = new TargetCardInHand(); target.setNotTarget(true); target.setTargetName("a card from your hand to put on top of your library"); diff --git a/Mage.Sets/src/mage/cards/q/QasaliAmbusher.java b/Mage.Sets/src/mage/cards/q/QasaliAmbusher.java index 4d833007858..a229767c968 100644 --- a/Mage.Sets/src/mage/cards/q/QasaliAmbusher.java +++ b/Mage.Sets/src/mage/cards/q/QasaliAmbusher.java @@ -107,8 +107,8 @@ class QasaliAmbusherAbility extends ActivatedAbilityImpl { @Override public boolean canActivate(UUID playerId, Game game) { if (super.canActivate(playerId, game)) { - if (game.getBattlefield().getActivePermanents(filterPlains, this.getControllerId(), this.getSourceId(), game).size() > 0 - && game.getBattlefield().getActivePermanents(filterForest, this.getControllerId(), this.getSourceId(), game).size() > 0) { + if (!game.getBattlefield().getActivePermanents(filterPlains, this.getControllerId(), this.getSourceId(), game).isEmpty() + && !game.getBattlefield().getActivePermanents(filterForest, this.getControllerId(), this.getSourceId(), game).isEmpty()) { for (CombatGroup group : game.getCombat().getGroups()) { if (getControllerId().equals(group.getDefenderId())) { return true; diff --git a/Mage.Sets/src/mage/cards/q/QuietSpeculation.java b/Mage.Sets/src/mage/cards/q/QuietSpeculation.java index 96b1aaeeec8..1eb466e8aec 100644 --- a/Mage.Sets/src/mage/cards/q/QuietSpeculation.java +++ b/Mage.Sets/src/mage/cards/q/QuietSpeculation.java @@ -97,7 +97,7 @@ class SearchLibraryPutInGraveEffect extends SearchEffect { Player controller = game.getPlayer(source.getControllerId()); UUID targetPlayerID = source.getFirstTarget(); if (controller != null && targetPlayerID != null && controller.searchLibrary(target, game, targetPlayerID)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { Cards cards = new CardsImpl(target.getTargets()); controller.revealCards("Quiet Speculation", cards, game); controller.moveCards(cards, Zone.GRAVEYARD, source, game); diff --git a/Mage.Sets/src/mage/cards/r/RealmsUncharted.java b/Mage.Sets/src/mage/cards/r/RealmsUncharted.java index bc145056326..274d366bb7a 100644 --- a/Mage.Sets/src/mage/cards/r/RealmsUncharted.java +++ b/Mage.Sets/src/mage/cards/r/RealmsUncharted.java @@ -98,7 +98,7 @@ class RealmsUnchartedEffect extends OneShotEffect { RealmsUnchartedTarget target = new RealmsUnchartedTarget(); if (controller.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { Cards cards = new CardsImpl(); for (UUID cardId : target.getTargets()) { Card card = controller.getLibrary().getCard(cardId, game); diff --git a/Mage.Sets/src/mage/cards/r/ReflectingPool.java b/Mage.Sets/src/mage/cards/r/ReflectingPool.java index f9326c079aa..11f6e8f7a88 100644 --- a/Mage.Sets/src/mage/cards/r/ReflectingPool.java +++ b/Mage.Sets/src/mage/cards/r/ReflectingPool.java @@ -139,7 +139,7 @@ class ReflectingPoolEffect extends ManaEffect { choice.getChoices().add("White"); choice.getChoices().add("Colorless"); } - if (choice.getChoices().size() > 0) { + if (!choice.getChoices().isEmpty()) { Player player = game.getPlayer(source.getControllerId()); if (choice.getChoices().size() == 1) { choice.setChoice(choice.getChoices().iterator().next()); diff --git a/Mage.Sets/src/mage/cards/r/RenownedWeaponsmith.java b/Mage.Sets/src/mage/cards/r/RenownedWeaponsmith.java index f66539f6afc..11dec6ef28e 100644 --- a/Mage.Sets/src/mage/cards/r/RenownedWeaponsmith.java +++ b/Mage.Sets/src/mage/cards/r/RenownedWeaponsmith.java @@ -144,7 +144,7 @@ class RenownedWeaponsmithEffect extends OneShotEffect { if (sourceObject != null && controller != null) { TargetCardInLibrary target = new TargetCardInLibrary(filter); if (controller.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { Card card = game.getCard(target.getFirstTarget()); Cards revealed = new CardsImpl(); revealed.add(card); diff --git a/Mage.Sets/src/mage/cards/r/Reweave.java b/Mage.Sets/src/mage/cards/r/Reweave.java index 224d657aad1..edee2c3a178 100644 --- a/Mage.Sets/src/mage/cards/r/Reweave.java +++ b/Mage.Sets/src/mage/cards/r/Reweave.java @@ -125,7 +125,7 @@ class ReweaveEffect extends OneShotEffect { permanentController.moveCards(card, Zone.BATTLEFIELD, source, game); } - if (cards.size() > 0) { + if (!cards.isEmpty()) { permanentController.revealCards(sourceObject.getIdName(), cards, game); if (cardFound && card != null) { cards.remove(card); diff --git a/Mage.Sets/src/mage/cards/r/RiseFall.java b/Mage.Sets/src/mage/cards/r/RiseFall.java index 3616f693d3d..6c8f8bd8e59 100644 --- a/Mage.Sets/src/mage/cards/r/RiseFall.java +++ b/Mage.Sets/src/mage/cards/r/RiseFall.java @@ -137,7 +137,7 @@ class FallEffect extends OneShotEffect { if (controller != null) { Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (targetPlayer != null) { - if (targetPlayer.getHand().size() > 0) { + if (!targetPlayer.getHand().isEmpty()) { Cards cards = new CardsImpl(); Card card = targetPlayer.getHand().getRandom(game); cards.add(card); diff --git a/Mage.Sets/src/mage/cards/r/RoninWarclub.java b/Mage.Sets/src/mage/cards/r/RoninWarclub.java index cddbdadda76..a6684af41e4 100644 --- a/Mage.Sets/src/mage/cards/r/RoninWarclub.java +++ b/Mage.Sets/src/mage/cards/r/RoninWarclub.java @@ -100,7 +100,7 @@ public class RoninWarclub extends CardImpl { if (!this.getTargets().isEmpty()) { // remove previous target - if (this.getTargets().get(0).getTargets().size() > 0) { + if (!this.getTargets().get(0).getTargets().isEmpty()) { this.getTargets().clear(); this.addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/cards/r/RootwaterThief.java b/Mage.Sets/src/mage/cards/r/RootwaterThief.java index 99b40378296..efbdd7ffdde 100644 --- a/Mage.Sets/src/mage/cards/r/RootwaterThief.java +++ b/Mage.Sets/src/mage/cards/r/RootwaterThief.java @@ -102,7 +102,7 @@ class RootwaterThiefEffect extends OneShotEffect { { TargetCardInLibrary target = new TargetCardInLibrary(); if (controller.searchLibrary(target, game, damagedPlayer.getId())) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { Card card = damagedPlayer.getLibrary().remove(target.getFirstTarget(), game); if (card != null) { controller.moveCardToExileWithInfo(card, null, "", source.getSourceId(), game, Zone.LIBRARY, true); diff --git a/Mage.Sets/src/mage/cards/s/SadisticAugermage.java b/Mage.Sets/src/mage/cards/s/SadisticAugermage.java index 1e2c4033e1a..25512c88b5f 100644 --- a/Mage.Sets/src/mage/cards/s/SadisticAugermage.java +++ b/Mage.Sets/src/mage/cards/s/SadisticAugermage.java @@ -92,7 +92,7 @@ class WidespreadPanicEffect extends OneShotEffect { for (UUID playerId: game.getState().getPlayersInRange(controller.getId(), game)) { Player player = game.getPlayer(playerId); if (player != null) { - if (player.getHand().size() > 0) { + if (!player.getHand().isEmpty()) { TargetCardInHand target = new TargetCardInHand(); target.setTargetName("a card from your hand to put on top of your library"); player.choose(Outcome.Detriment, target, source.getSourceId(), game); diff --git a/Mage.Sets/src/mage/cards/s/SanguinePraetor.java b/Mage.Sets/src/mage/cards/s/SanguinePraetor.java index b30de0ca5a1..ab972b0fc42 100644 --- a/Mage.Sets/src/mage/cards/s/SanguinePraetor.java +++ b/Mage.Sets/src/mage/cards/s/SanguinePraetor.java @@ -92,7 +92,7 @@ class SanguinePraetorEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { int cmc = 0; for (Cost cost : source.getCosts()) { - if (cost instanceof SacrificeTargetCost && ((SacrificeTargetCost) cost).getPermanents().size() > 0) { + if (cost instanceof SacrificeTargetCost && !((SacrificeTargetCost) cost).getPermanents().isEmpty()) { cmc = ((SacrificeTargetCost) cost).getPermanents().get(0).getConvertedManaCost(); break; } diff --git a/Mage.Sets/src/mage/cards/s/SasayaOrochiAscendant.java b/Mage.Sets/src/mage/cards/s/SasayaOrochiAscendant.java index 4a90ae0a6c8..bd1bc9cf559 100644 --- a/Mage.Sets/src/mage/cards/s/SasayaOrochiAscendant.java +++ b/Mage.Sets/src/mage/cards/s/SasayaOrochiAscendant.java @@ -183,7 +183,7 @@ class SasayasEssenceManaEffectEffect extends ManaEffect { choice.getChoices().add("Colorless"); } - if (choice.getChoices().size() > 0) { + if (!choice.getChoices().isEmpty()) { Mana newMana = new Mana(); for (int i = 0; i < count; i++) { choice.clearChoice(); diff --git a/Mage.Sets/src/mage/cards/s/SavageSummoning.java b/Mage.Sets/src/mage/cards/s/SavageSummoning.java index 1633ecd3f69..5923ea13f32 100644 --- a/Mage.Sets/src/mage/cards/s/SavageSummoning.java +++ b/Mage.Sets/src/mage/cards/s/SavageSummoning.java @@ -151,7 +151,6 @@ class SavageSummoningAsThoughEffect extends AsThoughEffectImpl { class SavageSummoningWatcher extends Watcher { private Set savageSummoningSpells = new HashSet<>(); - ; private Map> spellsCastWithSavageSummoning = new LinkedHashMap<>(); private Map> cardsCastWithSavageSummoning = new LinkedHashMap<>(); diff --git a/Mage.Sets/src/mage/cards/s/SecretSalvage.java b/Mage.Sets/src/mage/cards/s/SecretSalvage.java index 113581f7212..bb8e34288e1 100644 --- a/Mage.Sets/src/mage/cards/s/SecretSalvage.java +++ b/Mage.Sets/src/mage/cards/s/SecretSalvage.java @@ -101,7 +101,7 @@ class SecretSalvageEffect extends OneShotEffect { nameFilter.add(new NamePredicate(targetCard.getName())); TargetCardInLibrary target = new TargetCardInLibrary(0, Integer.MAX_VALUE, nameFilter); if (controller.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { Cards cards = new CardsImpl(); for (UUID cardId : target.getTargets()) { Card card = controller.getLibrary().remove(cardId, game); diff --git a/Mage.Sets/src/mage/cards/s/SeeBeyond.java b/Mage.Sets/src/mage/cards/s/SeeBeyond.java index c0db7992f86..bc2c47236b6 100644 --- a/Mage.Sets/src/mage/cards/s/SeeBeyond.java +++ b/Mage.Sets/src/mage/cards/s/SeeBeyond.java @@ -79,7 +79,7 @@ class SeeBeyondEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); controller.drawCards(2, game); - if (controller.getHand().size() > 0) { + if (!controller.getHand().isEmpty()) { TargetCard target = new TargetCard(Zone.HAND, new FilterCard("card to shuffle into your library")); controller.choose(Outcome.Detriment, controller.getHand(), target, game); Card card = controller.getHand().get(target.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/cards/s/SemblanceAnvil.java b/Mage.Sets/src/mage/cards/s/SemblanceAnvil.java index f514d966f22..a1c0dee10e0 100644 --- a/Mage.Sets/src/mage/cards/s/SemblanceAnvil.java +++ b/Mage.Sets/src/mage/cards/s/SemblanceAnvil.java @@ -90,7 +90,7 @@ class SemblanceAnvilEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); - if (player.getHand().size() > 0) { + if (!player.getHand().isEmpty()) { TargetCard target = new TargetCard(Zone.HAND, filter); player.choose(Outcome.Benefit, player.getHand(), target, game); Card card = player.getHand().get(target.getFirstTarget(), game); @@ -141,7 +141,7 @@ class SemblanceAnvilCostReductionEffect extends CostModificationEffectImpl { Permanent permanent = game.getPermanent(source.getSourceId()); if (permanent != null) { List imprinted = permanent.getImprinted(); - if (imprinted.size() > 0) { + if (!imprinted.isEmpty()) { Card imprintedCard = game.getCard(imprinted.get(0)); if (imprintedCard != null && CardUtil.shareTypes(imprintedCard, sourceCard)) { return true; diff --git a/Mage.Sets/src/mage/cards/s/SerrasSanctum.java b/Mage.Sets/src/mage/cards/s/SerrasSanctum.java index 0f6c12cc3dd..f29332aa91e 100644 --- a/Mage.Sets/src/mage/cards/s/SerrasSanctum.java +++ b/Mage.Sets/src/mage/cards/s/SerrasSanctum.java @@ -45,7 +45,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; public class SerrasSanctum extends CardImpl { - private static final FilterControlledPermanent filter = new FilterControlledPermanent("enchantment you control");; + private static final FilterControlledPermanent filter = new FilterControlledPermanent("enchantment you control"); static { filter.add(new CardTypePredicate(CardType.ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/cards/s/ShimatsuTheBloodcloaked.java b/Mage.Sets/src/mage/cards/s/ShimatsuTheBloodcloaked.java index 0e6b52f7722..3128c1187f7 100644 --- a/Mage.Sets/src/mage/cards/s/ShimatsuTheBloodcloaked.java +++ b/Mage.Sets/src/mage/cards/s/ShimatsuTheBloodcloaked.java @@ -113,7 +113,7 @@ class ShimatsuTheBloodcloakedEffect extends ReplacementEffectImpl { return false; } controller.chooseTarget(Outcome.Detriment, target, source, game); - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { int sacrificedCreatures = target.getTargets().size(); game.informPlayers(controller.getLogName() + " sacrifices " + sacrificedCreatures + " creatures for " + creature.getLogName()); for (UUID targetId : target.getTargets()) { diff --git a/Mage.Sets/src/mage/cards/s/SignalTheClans.java b/Mage.Sets/src/mage/cards/s/SignalTheClans.java index e244e8912eb..3841b824109 100644 --- a/Mage.Sets/src/mage/cards/s/SignalTheClans.java +++ b/Mage.Sets/src/mage/cards/s/SignalTheClans.java @@ -94,7 +94,7 @@ class SignalTheClansEffect extends SearchEffect { } //Search your library for three creature cards if (player.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { Cards cards = new CardsImpl(); for (UUID cardId: (List)target.getTargets()) { Card card = player.getLibrary().remove(cardId, game); diff --git a/Mage.Sets/src/mage/cards/s/SilentBladeOni.java b/Mage.Sets/src/mage/cards/s/SilentBladeOni.java index 6ce471816ea..b34542386e6 100644 --- a/Mage.Sets/src/mage/cards/s/SilentBladeOni.java +++ b/Mage.Sets/src/mage/cards/s/SilentBladeOni.java @@ -101,7 +101,7 @@ class SilentBladeOniEffect extends OneShotEffect { if (opponent != null && controller != null) { Cards cardsInHand = new CardsImpl(); cardsInHand.addAll(opponent.getHand()); - if (cardsInHand.size() > 0) { + if (!cardsInHand.isEmpty()) { TargetCard target = new TargetCard(1, Zone.HAND, new FilterNonlandCard()); if (controller.chooseTarget(outcome, cardsInHand, target, source, game)) { Card card = game.getCard(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/s/SkyshipWeatherlight.java b/Mage.Sets/src/mage/cards/s/SkyshipWeatherlight.java index 4e1f706e015..35ac026dc9d 100644 --- a/Mage.Sets/src/mage/cards/s/SkyshipWeatherlight.java +++ b/Mage.Sets/src/mage/cards/s/SkyshipWeatherlight.java @@ -92,7 +92,7 @@ class SkyshipWeatherlightEffect extends SearchEffect { if (sourceObject != null && controller != null) { if (controller.searchLibrary(target, game)) { UUID exileZone = CardUtil.getExileZoneId(game, source.getSourceId(), source.getSourceObjectZoneChangeCounter()); - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { for (UUID cardID : target.getTargets()) { Card card = controller.getLibrary().getCard(cardID, game); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/s/SlumberingTora.java b/Mage.Sets/src/mage/cards/s/SlumberingTora.java index 8b6c8ed60dc..5cfbe12df71 100644 --- a/Mage.Sets/src/mage/cards/s/SlumberingTora.java +++ b/Mage.Sets/src/mage/cards/s/SlumberingTora.java @@ -106,7 +106,7 @@ public class SlumberingTora extends CardImpl { if (sublayer == SubLayer.SetPT_7b) { int convManaCosts = 0; for (Cost cost: source.getCosts()) { - if (cost instanceof DiscardTargetCost && ((DiscardTargetCost)cost).getCards().size() > 0) { + if (cost instanceof DiscardTargetCost && !((DiscardTargetCost) cost).getCards().isEmpty()) { convManaCosts = ((DiscardTargetCost)cost).getCards().get(0).getConvertedManaCost(); break; } diff --git a/Mage.Sets/src/mage/cards/s/SoldeviSage.java b/Mage.Sets/src/mage/cards/s/SoldeviSage.java index fbc56bb8372..cffd08ee128 100644 --- a/Mage.Sets/src/mage/cards/s/SoldeviSage.java +++ b/Mage.Sets/src/mage/cards/s/SoldeviSage.java @@ -108,7 +108,7 @@ class SoldeviSageEffect extends OneShotEffect { } } - if (drawnCards.size() > 0) { + if (!drawnCards.isEmpty()) { TargetCard cardToDiscard = new TargetCard(Zone.HAND, new FilterCard("card to discard")); cardToDiscard.setNotTarget(true); if (player.choose(Outcome.Discard, drawnCards, cardToDiscard, game)) { diff --git a/Mage.Sets/src/mage/cards/s/SoulFoundry.java b/Mage.Sets/src/mage/cards/s/SoulFoundry.java index 1b2c712dbaa..c2cf92f80fd 100644 --- a/Mage.Sets/src/mage/cards/s/SoulFoundry.java +++ b/Mage.Sets/src/mage/cards/s/SoulFoundry.java @@ -81,7 +81,7 @@ public class SoulFoundry extends CardImpl { if (ability instanceof SimpleActivatedAbility) { Permanent sourcePermanent = game.getPermanent(ability.getSourceId()); if (sourcePermanent != null) { - if (sourcePermanent.getImprinted().size() > 0) { + if (!sourcePermanent.getImprinted().isEmpty()) { Card imprinted = game.getCard(sourcePermanent.getImprinted().get(0)); if (imprinted != null) { ability.getManaCostsToPay().clear(); @@ -127,7 +127,7 @@ class SoulFoundryImprintEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(source.getSourceId()); if (controller != null) { - if (controller.getHand().size() > 0) { + if (!controller.getHand().isEmpty()) { TargetCard target = new TargetCard(Zone.HAND, filter); if (target.canChoose(source.getSourceId(), source.getControllerId(), game) && controller.choose(Outcome.Benefit, controller.getHand(), target, game)) { diff --git a/Mage.Sets/src/mage/cards/s/Spellbinder.java b/Mage.Sets/src/mage/cards/s/Spellbinder.java index 482c7e4d19f..1134a3b6613 100644 --- a/Mage.Sets/src/mage/cards/s/Spellbinder.java +++ b/Mage.Sets/src/mage/cards/s/Spellbinder.java @@ -137,7 +137,7 @@ class SpellbinderImprintEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(source.getSourceId()); if (controller != null) { - if (controller.getHand().size() > 0) { + if (!controller.getHand().isEmpty()) { TargetCard target = new TargetCard(Zone.HAND, filter); if (target.canChoose(source.getSourceId(), source.getControllerId(), game) && controller.choose(Outcome.Benefit, controller.getHand(), target, game)) { diff --git a/Mage.Sets/src/mage/cards/s/Spellshift.java b/Mage.Sets/src/mage/cards/s/Spellshift.java index b33b9200feb..ca5d31fb2a5 100644 --- a/Mage.Sets/src/mage/cards/s/Spellshift.java +++ b/Mage.Sets/src/mage/cards/s/Spellshift.java @@ -111,7 +111,7 @@ class SpellshiftEffect extends OneShotEffect { } } - if (cards.size() > 0) { + if (!cards.isEmpty()) { library.addAll(cards.getCards(game), game); } } diff --git a/Mage.Sets/src/mage/cards/s/SpiritOfResistance.java b/Mage.Sets/src/mage/cards/s/SpiritOfResistance.java index b7aad6b8fbd..0cde764d318 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritOfResistance.java +++ b/Mage.Sets/src/mage/cards/s/SpiritOfResistance.java @@ -79,7 +79,7 @@ class SpiritOfResistanceCondition implements Condition { public static SpiritOfResistanceCondition getInstance() { return fInstance; - }; + } private SpiritOfResistanceCondition() {} diff --git a/Mage.Sets/src/mage/cards/s/SquanderedResources.java b/Mage.Sets/src/mage/cards/s/SquanderedResources.java index 4d6f3b42fdb..89893b24c28 100644 --- a/Mage.Sets/src/mage/cards/s/SquanderedResources.java +++ b/Mage.Sets/src/mage/cards/s/SquanderedResources.java @@ -128,7 +128,7 @@ class SquanderedResourcesEffect extends ManaEffect { choice.getChoices().add("White"); choice.getChoices().add("Colorless"); } - if (choice.getChoices().size() > 0) { + if (!choice.getChoices().isEmpty()) { Player player = game.getPlayer(source.getControllerId()); if (choice.getChoices().size() == 1) { choice.setChoice(choice.getChoices().iterator().next()); @@ -194,7 +194,7 @@ class SquanderedResourcesEffect extends ManaEffect { Mana types = new Mana(); for (Cost cost : source.getCosts()) { - if (cost instanceof SacrificeTargetCost && ((SacrificeTargetCost) cost).getPermanents().size() > 0) { + if (cost instanceof SacrificeTargetCost && !((SacrificeTargetCost) cost).getPermanents().isEmpty()) { Permanent land = ((SacrificeTargetCost) cost).getPermanents().get(0); if (land != null) { Abilities manaAbilities = land.getAbilities().getActivatedManaAbilities(Zone.BATTLEFIELD); diff --git a/Mage.Sets/src/mage/cards/s/StarCompass.java b/Mage.Sets/src/mage/cards/s/StarCompass.java index 0a699f38072..1bf4c6f8c93 100644 --- a/Mage.Sets/src/mage/cards/s/StarCompass.java +++ b/Mage.Sets/src/mage/cards/s/StarCompass.java @@ -146,7 +146,7 @@ class StarCompassManaEffect extends ManaEffect { choice.getChoices().add("White"); choice.getChoices().add("Colorless"); } - if (choice.getChoices().size() > 0) { + if (!choice.getChoices().isEmpty()) { Player player = game.getPlayer(source.getControllerId()); if (choice.getChoices().size() == 1) { choice.setChoice(choice.getChoices().iterator().next()); diff --git a/Mage.Sets/src/mage/cards/s/StarlitSanctum.java b/Mage.Sets/src/mage/cards/s/StarlitSanctum.java index 1efbe9f2491..1caded637bb 100644 --- a/Mage.Sets/src/mage/cards/s/StarlitSanctum.java +++ b/Mage.Sets/src/mage/cards/s/StarlitSanctum.java @@ -96,7 +96,7 @@ class StarlitSanctumWhiteEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { int amount = 0; for (Cost cost : source.getCosts()) { - if (cost instanceof SacrificeTargetCost && ((SacrificeTargetCost) cost).getPermanents().size() > 0) { + if (cost instanceof SacrificeTargetCost && !((SacrificeTargetCost) cost).getPermanents().isEmpty()) { amount = ((SacrificeTargetCost) cost).getPermanents().get(0).getToughness().getValue(); break; } @@ -132,7 +132,7 @@ class StarlitSanctumBlackEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { int amount = 0; for (Cost cost : source.getCosts()) { - if (cost instanceof SacrificeTargetCost && ((SacrificeTargetCost) cost).getPermanents().size() > 0) { + if (cost instanceof SacrificeTargetCost && !((SacrificeTargetCost) cost).getPermanents().isEmpty()) { amount = ((SacrificeTargetCost) cost).getPermanents().get(0).getPower().getValue(); break; } diff --git a/Mage.Sets/src/mage/cards/s/SteelcladSerpent.java b/Mage.Sets/src/mage/cards/s/SteelcladSerpent.java index 731a104d4ba..88b6413f6b2 100644 --- a/Mage.Sets/src/mage/cards/s/SteelcladSerpent.java +++ b/Mage.Sets/src/mage/cards/s/SteelcladSerpent.java @@ -102,7 +102,7 @@ class SteelcladSerpentEffect extends RestrictionEffect { @Override public boolean applies(Permanent permanent, Ability source, Game game) { if (permanent.getId().equals(source.getSourceId())) { - if (game.getBattlefield().getActivePermanents(filter, source.getControllerId(), permanent.getId(), game).size() > 0) { + if (!game.getBattlefield().getActivePermanents(filter, source.getControllerId(), permanent.getId(), game).isEmpty()) { return false; } return true; diff --git a/Mage.Sets/src/mage/cards/s/StompingSlabs.java b/Mage.Sets/src/mage/cards/s/StompingSlabs.java index c75f72b98e4..e40c8764955 100644 --- a/Mage.Sets/src/mage/cards/s/StompingSlabs.java +++ b/Mage.Sets/src/mage/cards/s/StompingSlabs.java @@ -90,7 +90,7 @@ class StompingSlabsEffect extends OneShotEffect { if (controller != null) { Cards cards = new CardsImpl(); cards.addAll(controller.getLibrary().getTopCards(game, 7)); - if (cards.size() > 0) { + if (!cards.isEmpty()) { controller.revealCards("Stomping Slabs", cards, game); boolean stompingSlabsFound = false; for (UUID cardId : cards) { diff --git a/Mage.Sets/src/mage/cards/s/StrataScythe.java b/Mage.Sets/src/mage/cards/s/StrataScythe.java index 83ca064d59e..54d661c597d 100644 --- a/Mage.Sets/src/mage/cards/s/StrataScythe.java +++ b/Mage.Sets/src/mage/cards/s/StrataScythe.java @@ -95,7 +95,7 @@ class StrataScytheImprintEffect extends OneShotEffect { return false; TargetCardInLibrary target = new TargetCardInLibrary(new FilterLandCard()); if (player.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { UUID cardId = target.getTargets().get(0); Card card = player.getLibrary().remove(cardId, game); if (card != null) { @@ -132,7 +132,7 @@ class SameNameAsExiledCountValue implements DynamicValue { public int calculate(Game game, Ability sourceAbility, Effect effect) { int value = 0; Permanent permanent = game.getPermanent(sourceAbility.getSourceId()); - if (permanent != null && permanent.getImprinted().size() > 0) { + if (permanent != null && !permanent.getImprinted().isEmpty()) { FilterPermanent filterPermanent = new FilterPermanent(); filterPermanent.add(new NamePredicate(game.getCard(permanent.getImprinted().get(0)).getName())); value = game.getBattlefield().count(filterPermanent, sourceAbility.getSourceId(), sourceAbility.getControllerId(), game); diff --git a/Mage.Sets/src/mage/cards/s/StrategicPlanning.java b/Mage.Sets/src/mage/cards/s/StrategicPlanning.java index d4717c34cd8..3318cba98ed 100644 --- a/Mage.Sets/src/mage/cards/s/StrategicPlanning.java +++ b/Mage.Sets/src/mage/cards/s/StrategicPlanning.java @@ -90,7 +90,7 @@ class StrategicPlanningEffect extends OneShotEffect { if (controller != null) { Cards cards = new CardsImpl(); cards.addAll(controller.getLibrary().getTopCards(game, 3)); - if (cards.size() > 0) { + if (!cards.isEmpty()) { controller.lookAtCards("Strategic Planning", cards, game); TargetCard target = new TargetCard(Zone.LIBRARY, new FilterCard("card to put in your hand")); if (controller.choose(Outcome.Benefit, cards, target, game)) { diff --git a/Mage.Sets/src/mage/cards/s/StripBare.java b/Mage.Sets/src/mage/cards/s/StripBare.java index 13e8a81d5e3..e62468c9ed1 100644 --- a/Mage.Sets/src/mage/cards/s/StripBare.java +++ b/Mage.Sets/src/mage/cards/s/StripBare.java @@ -92,7 +92,7 @@ class StripBareEffect extends OneShotEffect { new SubtypePredicate("Aura"))); Permanent targetCreature = game.getPermanent(source.getFirstTarget()); if (targetCreature != null - && targetCreature.getAttachments().size() > 0) { + && !targetCreature.getAttachments().isEmpty()) { for (Permanent attachment : game.getBattlefield().getAllActivePermanents(filter, game)) { if (attachment != null && targetCreature.getAttachments().contains(attachment.getId())) { diff --git a/Mage.Sets/src/mage/cards/s/StrongholdGambit.java b/Mage.Sets/src/mage/cards/s/StrongholdGambit.java index f1b96205446..13301cdcdd3 100644 --- a/Mage.Sets/src/mage/cards/s/StrongholdGambit.java +++ b/Mage.Sets/src/mage/cards/s/StrongholdGambit.java @@ -92,7 +92,7 @@ class StrongholdGambitEffect extends OneShotEffect { Map choosenCard = new LinkedHashMap<>(); for (UUID playerId : game.getState().getPlayerList(controller.getId())) { Player player = game.getPlayer(playerId); - if (player != null && player.getHand().size() > 0) { + if (player != null && !player.getHand().isEmpty()) { TargetCardInHand target = new TargetCardInHand(); if (player.choose(Outcome.Benefit, target, source.getSourceId(), game)) { choosenCard.put(playerId, target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/s/SuddenDisappearance.java b/Mage.Sets/src/mage/cards/s/SuddenDisappearance.java index 4a4581d7c2d..3deff653c2c 100644 --- a/Mage.Sets/src/mage/cards/s/SuddenDisappearance.java +++ b/Mage.Sets/src/mage/cards/s/SuddenDisappearance.java @@ -93,7 +93,7 @@ class SuddenDisappearanceEffect extends OneShotEffect { MageObject sourceObject = source.getSourceObject(game); if (controller != null && sourceObject != null) { Set permsSet = new HashSet<>(game.getBattlefield().getAllActivePermanents(filter, source.getFirstTarget(), game)); - if (permsSet.size() > 0) { + if (!permsSet.isEmpty()) { controller.moveCardsToExile(permsSet, source, game, true, source.getSourceId(), sourceObject.getIdName()); Cards targets = new CardsImpl(); for (Card card : permsSet) { diff --git a/Mage.Sets/src/mage/cards/s/SultaiSoothsayer.java b/Mage.Sets/src/mage/cards/s/SultaiSoothsayer.java index fa4ea972a61..4a492636991 100644 --- a/Mage.Sets/src/mage/cards/s/SultaiSoothsayer.java +++ b/Mage.Sets/src/mage/cards/s/SultaiSoothsayer.java @@ -97,7 +97,7 @@ class SultaiSoothsayerEffect extends OneShotEffect { if (controller != null && sourceObject != null) { Cards cards = new CardsImpl(); cards.addAll(controller.getLibrary().getTopCards(game, 4)); - if (cards.size() > 0) { + if (!cards.isEmpty()) { controller.lookAtCards(sourceObject.getName(), cards, game); TargetCard target = new TargetCard(Zone.LIBRARY, new FilterCard("card to put in your hand")); if (controller.choose(Outcome.Benefit, cards, target, game)) { diff --git a/Mage.Sets/src/mage/cards/s/SummonersEgg.java b/Mage.Sets/src/mage/cards/s/SummonersEgg.java index e371ae49409..e92603be7df 100644 --- a/Mage.Sets/src/mage/cards/s/SummonersEgg.java +++ b/Mage.Sets/src/mage/cards/s/SummonersEgg.java @@ -90,7 +90,7 @@ class SummonersEggImprintEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(source.getSourceId()); if (controller != null) { - if (controller.getHand().size() > 0) { + if (!controller.getHand().isEmpty()) { TargetCard target = new TargetCard(Zone.HAND, new FilterCard()); if (target.canChoose(source.getSourceId(), source.getControllerId(), game) && controller.choose(Outcome.Benefit, controller.getHand(), target, game)) { diff --git a/Mage.Sets/src/mage/cards/s/SummoningTrap.java b/Mage.Sets/src/mage/cards/s/SummoningTrap.java index e56ca4b7c97..28829addab2 100644 --- a/Mage.Sets/src/mage/cards/s/SummoningTrap.java +++ b/Mage.Sets/src/mage/cards/s/SummoningTrap.java @@ -183,7 +183,7 @@ class SummoningTrapEffect extends OneShotEffect { controller.moveCards(card, Zone.BATTLEFIELD, source, game); } } - if (cards.size() > 0) { + if (!cards.isEmpty()) { controller.putCardsOnBottomOfLibrary(cards, game, source, true); } } diff --git a/Mage.Sets/src/mage/cards/s/SuturedGhoul.java b/Mage.Sets/src/mage/cards/s/SuturedGhoul.java index eb2dd94dcd4..58eb9dda622 100644 --- a/Mage.Sets/src/mage/cards/s/SuturedGhoul.java +++ b/Mage.Sets/src/mage/cards/s/SuturedGhoul.java @@ -106,7 +106,7 @@ class SuturedGhoulEffect extends OneShotEffect { if (permanent == null) { return false; } - if (controller.getGraveyard().size() > 0) { + if (!controller.getGraveyard().isEmpty()) { TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(0, Integer.MAX_VALUE, new FilterCreatureCard("creature cards from your graveyard")); if (controller.chooseTarget(Outcome.Benefit, target, source, game)) { int count = 0; diff --git a/Mage.Sets/src/mage/cards/s/SyphonMind.java b/Mage.Sets/src/mage/cards/s/SyphonMind.java index 2639d65a906..6c4622419f9 100644 --- a/Mage.Sets/src/mage/cards/s/SyphonMind.java +++ b/Mage.Sets/src/mage/cards/s/SyphonMind.java @@ -89,7 +89,7 @@ class SyphonMindEffect extends OneShotEffect { for (UUID playerId : you.getInRange()) { if (!playerId.equals(source.getControllerId())) { Player otherPlayer = game.getPlayer(playerId); - if (otherPlayer != null && otherPlayer.getHand().size() > 0) { + if (otherPlayer != null && !otherPlayer.getHand().isEmpty()) { TargetCardInHand target = new TargetCardInHand(); if (otherPlayer.choose(Outcome.Discard, target, source.getSourceId(), game)) { Card card = game.getCard(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/t/TalentOfTheTelepath.java b/Mage.Sets/src/mage/cards/t/TalentOfTheTelepath.java index 7294433ad6a..67d4da60782 100644 --- a/Mage.Sets/src/mage/cards/t/TalentOfTheTelepath.java +++ b/Mage.Sets/src/mage/cards/t/TalentOfTheTelepath.java @@ -111,7 +111,7 @@ class TalentOfTheTelepathEffect extends OneShotEffect { } } // cast an instant or sorcery for free - if (cardsToCast.size() > 0) { + if (!cardsToCast.isEmpty()) { int numberOfSpells = 1; if (SpellMasteryCondition.getInstance().apply(game, source)) { numberOfSpells++; @@ -122,7 +122,7 @@ class TalentOfTheTelepathEffect extends OneShotEffect { TargetCard target = new TargetCard(Zone.LIBRARY, filter); // zone should be ignored here target.setNotTarget(true); while (numberOfSpells > 0 - && cardsToCast.size() > 0 + && !cardsToCast.isEmpty() && controller.chooseUse(outcome, "Cast an instant or sorcery card from among them for free?", source, game) && controller.choose(outcome, cardsToCast, target, game)) { Card card = cardsToCast.get(target.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/cards/t/TemptWithReflections.java b/Mage.Sets/src/mage/cards/t/TemptWithReflections.java index 5c2ae9ed005..ad80e9bc869 100644 --- a/Mage.Sets/src/mage/cards/t/TemptWithReflections.java +++ b/Mage.Sets/src/mage/cards/t/TemptWithReflections.java @@ -116,7 +116,7 @@ class TemptWithReflectionsEffect extends OneShotEffect { effect.apply(game, source); } - if (playersSaidYes.size() > 0) { + if (!playersSaidYes.isEmpty()) { effect = new PutTokenOntoBattlefieldCopyTargetEffect(); effect.setTargetPointer(getTargetPointer()); effect.apply(game, source); diff --git a/Mage.Sets/src/mage/cards/t/TestamentOfFaith.java b/Mage.Sets/src/mage/cards/t/TestamentOfFaith.java index e03ce71e6b2..7cc2779d3c0 100644 --- a/Mage.Sets/src/mage/cards/t/TestamentOfFaith.java +++ b/Mage.Sets/src/mage/cards/t/TestamentOfFaith.java @@ -109,7 +109,7 @@ class TestamentOfFaithBecomesCreatureSourceEffect extends ContinuousEffectImpl i switch (layer) { case TypeChangingEffects_4: if (sublayer == SubLayer.NA) { - if (token.getCardType().size() > 0) { + if (!token.getCardType().isEmpty()) { for (CardType t : token.getCardType()) { if (!permanent.getCardType().contains(t)) { permanent.getCardType().add(t); @@ -119,7 +119,7 @@ class TestamentOfFaithBecomesCreatureSourceEffect extends ContinuousEffectImpl i if ("".equals(type) || type == null) { permanent.getSubtype(game).clear(); } - if (token.getSubtype(game).size() > 0) { + if (!token.getSubtype(game).isEmpty()) { permanent.getSubtype(game).addAll(token.getSubtype(game)); } } @@ -133,7 +133,7 @@ class TestamentOfFaithBecomesCreatureSourceEffect extends ContinuousEffectImpl i break; case AbilityAddingRemovingEffects_6: if (sublayer == SubLayer.NA) { - if (token.getAbilities().size() > 0) { + if (!token.getAbilities().isEmpty()) { for (Ability ability: token.getAbilities()) { permanent.addAbility(ability, source.getSourceId(), game, false); } diff --git a/Mage.Sets/src/mage/cards/t/ThadaAdelAcquisitor.java b/Mage.Sets/src/mage/cards/t/ThadaAdelAcquisitor.java index b25cdc59504..c9a9bf02f67 100644 --- a/Mage.Sets/src/mage/cards/t/ThadaAdelAcquisitor.java +++ b/Mage.Sets/src/mage/cards/t/ThadaAdelAcquisitor.java @@ -103,7 +103,7 @@ class ThadaAdelAcquisitorEffect extends OneShotEffect { } TargetCardInLibrary target = new TargetCardInLibrary(new FilterArtifactCard()); if (controller.searchLibrary(target, game, damagedPlayer.getId())) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { Card card = damagedPlayer.getLibrary().remove(target.getFirstTarget(), game); if (card != null) { controller.moveCardToExileWithInfo(card, source.getSourceId(), sourceObject.getIdName(), source.getSourceId(), game, Zone.LIBRARY, true); diff --git a/Mage.Sets/src/mage/cards/t/ThoughtGorger.java b/Mage.Sets/src/mage/cards/t/ThoughtGorger.java index 30901e7944b..e5f460f1d7d 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtGorger.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtGorger.java @@ -99,7 +99,7 @@ class ThoughtGorgerEffectEnters extends OneShotEffect { public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); Permanent thoughtGorger = game.getPermanent(source.getSourceId()); - if (player != null && player.getHand().size() > 0 && thoughtGorger != null ) { + if (player != null && !player.getHand().isEmpty() && thoughtGorger != null ) { int cardsInHand = player.getHand().size(); thoughtGorger.addCounters(CounterType.P1P1.createInstance(cardsInHand), source, game); player.discard(cardsInHand, false, source, game); diff --git a/Mage.Sets/src/mage/cards/t/ThoughtpickerWitch.java b/Mage.Sets/src/mage/cards/t/ThoughtpickerWitch.java index f0dd5f9c50b..44345b03202 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtpickerWitch.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtpickerWitch.java @@ -105,7 +105,7 @@ class ThoughtpickerWitchEffect extends OneShotEffect { if (controller != null && opponent != null) { Cards cards = new CardsImpl(); cards.addAll(opponent.getLibrary().getTopCards(game, 2)); - if (cards.size() > 0) { + if (!cards.isEmpty()) { TargetCard target = new TargetCardInLibrary(new FilterCard("card to exile")); if (controller.choose(Outcome.Exile, cards, target, game)) { Card card = cards.get(target.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/cards/t/TransmuteArtifact.java b/Mage.Sets/src/mage/cards/t/TransmuteArtifact.java index deefc683782..9372da3348b 100644 --- a/Mage.Sets/src/mage/cards/t/TransmuteArtifact.java +++ b/Mage.Sets/src/mage/cards/t/TransmuteArtifact.java @@ -105,7 +105,7 @@ class TransmuteArtifactEffect extends SearchEffect { } //If you do, search your library for an artifact card. if (sacrifice && controller.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { for (UUID cardId : target.getTargets()) { Card card = controller.getLibrary().getCard(cardId, game); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/v/VastwoodHydra.java b/Mage.Sets/src/mage/cards/v/VastwoodHydra.java index b3245f78645..59a59a52231 100644 --- a/Mage.Sets/src/mage/cards/v/VastwoodHydra.java +++ b/Mage.Sets/src/mage/cards/v/VastwoodHydra.java @@ -104,7 +104,7 @@ class VastwoodHydraDistributeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - if (source.getTargets().size() > 0) { + if (!source.getTargets().isEmpty()) { Target multiTarget = source.getTargets().get(0); for (UUID target : multiTarget.getTargets()) { Permanent permanent = game.getPermanent(target); diff --git a/Mage.Sets/src/mage/cards/v/VerdelothTheAncient.java b/Mage.Sets/src/mage/cards/v/VerdelothTheAncient.java index 2f2bc85cc6b..a2424fdb7d4 100644 --- a/Mage.Sets/src/mage/cards/v/VerdelothTheAncient.java +++ b/Mage.Sets/src/mage/cards/v/VerdelothTheAncient.java @@ -124,10 +124,10 @@ class GetKickerXValue implements DynamicValue { @Override public String toString() { return "X"; - }; + } @Override public String getMessage() { return "X"; - }; + } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/v/VeteranExplorer.java b/Mage.Sets/src/mage/cards/v/VeteranExplorer.java index 958639aa485..f0c740eda30 100644 --- a/Mage.Sets/src/mage/cards/v/VeteranExplorer.java +++ b/Mage.Sets/src/mage/cards/v/VeteranExplorer.java @@ -117,7 +117,7 @@ class VeteranExplorerEffect extends OneShotEffect { usingPlayers.add(player); TargetCardInLibrary target = new TargetCardInLibrary(0, 2, new FilterBasicLandCard()); if (player.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { for (UUID cardId: (List)target.getTargets()) { Card card = player.getLibrary().getCard(cardId, game); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/w/WaveOfVitriol.java b/Mage.Sets/src/mage/cards/w/WaveOfVitriol.java index a79673bde54..e4addada034 100644 --- a/Mage.Sets/src/mage/cards/w/WaveOfVitriol.java +++ b/Mage.Sets/src/mage/cards/w/WaveOfVitriol.java @@ -131,7 +131,7 @@ class WaveOfVitriolEffect extends OneShotEffect { TargetCardInLibrary target = new TargetCardInLibrary(0, entry.getValue(), new FilterBasicLandCard()); if (entry.getKey().searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { toBattlefield.addAll(target.getTargets()); playersToShuffle.add(entry.getKey()); } diff --git a/Mage.Sets/src/mage/cards/w/WeirdHarvest.java b/Mage.Sets/src/mage/cards/w/WeirdHarvest.java index 96091a99d61..ffc88e8a928 100644 --- a/Mage.Sets/src/mage/cards/w/WeirdHarvest.java +++ b/Mage.Sets/src/mage/cards/w/WeirdHarvest.java @@ -115,7 +115,7 @@ class WeirdHarvestEffect extends OneShotEffect { usingPlayers.add(player); TargetCardInLibrary target = new TargetCardInLibrary(0, xValue, new FilterCreatureCard()); if (player.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { Cards cards = new CardsImpl(target.getTargets()); player.moveCards(cards, Zone.HAND, source, game); player.revealCards(sourceObject.getIdName() + " (" + player.getName() + ')', cards, game); diff --git a/Mage.Sets/src/mage/cards/w/WerewolfRansacker.java b/Mage.Sets/src/mage/cards/w/WerewolfRansacker.java index 0d6f76f1f12..c15582d68dd 100644 --- a/Mage.Sets/src/mage/cards/w/WerewolfRansacker.java +++ b/Mage.Sets/src/mage/cards/w/WerewolfRansacker.java @@ -145,7 +145,7 @@ class WerewolfRansackerEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { int affectedTargets = 0; - if (targetPointer.getTargets(game, source).size() > 0) { + if (!targetPointer.getTargets(game, source).isEmpty()) { for (UUID permanentId : targetPointer.getTargets(game, source)) { Permanent permanent = game.getPermanent(permanentId); if (permanent != null) { diff --git a/Mage.Sets/src/mage/cards/w/WidespreadPanic.java b/Mage.Sets/src/mage/cards/w/WidespreadPanic.java index 4e8900ee53e..9020117af33 100644 --- a/Mage.Sets/src/mage/cards/w/WidespreadPanic.java +++ b/Mage.Sets/src/mage/cards/w/WidespreadPanic.java @@ -125,7 +125,7 @@ class WidespreadPanicEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player shuffler = game.getPlayer(this.getTargetPointer().getFirst(game, source)); if (shuffler != null) { - if (shuffler.getHand().size() > 0) { + if (!shuffler.getHand().isEmpty()) { TargetCardInHand target = new TargetCardInHand(); target.setNotTarget(true); target.setTargetName("a card from your hand to put on top of your library"); diff --git a/Mage.Sets/src/mage/cards/w/WildEvocation.java b/Mage.Sets/src/mage/cards/w/WildEvocation.java index 9a075eba55f..90399ae0a19 100644 --- a/Mage.Sets/src/mage/cards/w/WildEvocation.java +++ b/Mage.Sets/src/mage/cards/w/WildEvocation.java @@ -84,7 +84,7 @@ class WildEvocationEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(targetPointer.getFirst(game, source)); - if (player != null && player.getHand().size() > 0) { + if (player != null && !player.getHand().isEmpty()) { Card card = player.getHand().getRandom(game); Cards cards = new CardsImpl(); cards.add(card); diff --git a/Mage.Sets/src/mage/cards/w/WildPair.java b/Mage.Sets/src/mage/cards/w/WildPair.java index 9adad2f38bd..3813014b4d4 100644 --- a/Mage.Sets/src/mage/cards/w/WildPair.java +++ b/Mage.Sets/src/mage/cards/w/WildPair.java @@ -114,7 +114,7 @@ class WildPairEffect extends OneShotEffect { filter.add(new TotalPowerAndToughnessPredicate(Filter.ComparisonType.Equal, totalPT)); TargetCardInLibrary target = new TargetCardInLibrary(1, filter); if (controller.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { controller.moveCards(new CardsImpl(target.getTargets()), Zone.BATTLEFIELD, source, game); } } diff --git a/Mage.Sets/src/mage/cards/w/WildResearch.java b/Mage.Sets/src/mage/cards/w/WildResearch.java index ec749529918..e70a4aa59b8 100644 --- a/Mage.Sets/src/mage/cards/w/WildResearch.java +++ b/Mage.Sets/src/mage/cards/w/WildResearch.java @@ -109,7 +109,7 @@ class WildResearchEffect extends OneShotEffect { if (controller != null && sourceObject != null) { TargetCardInLibrary target = new TargetCardInLibrary(filter); if (controller.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { Card card = controller.getLibrary().remove(target.getFirstTarget(), game); if (card != null) { controller.moveCards(card, Zone.HAND, source, game); diff --git a/Mage.Sets/src/mage/cards/w/WoodlandBellower.java b/Mage.Sets/src/mage/cards/w/WoodlandBellower.java index a230e94042a..84b0cfac0a7 100644 --- a/Mage.Sets/src/mage/cards/w/WoodlandBellower.java +++ b/Mage.Sets/src/mage/cards/w/WoodlandBellower.java @@ -100,7 +100,7 @@ class WoodlandBellowerEffect extends OneShotEffect { filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.LessThan, 4)); TargetCardInLibrary target = new TargetCardInLibrary(filter); if (controller.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { Card card = controller.getLibrary().getCard(target.getFirstTarget(), game); controller.moveCards(card, Zone.BATTLEFIELD, source, game); } diff --git a/Mage.Sets/src/mage/cards/x/XenagosTheReveler.java b/Mage.Sets/src/mage/cards/x/XenagosTheReveler.java index bf5f0f5422e..0a761cd4411 100644 --- a/Mage.Sets/src/mage/cards/x/XenagosTheReveler.java +++ b/Mage.Sets/src/mage/cards/x/XenagosTheReveler.java @@ -186,7 +186,7 @@ class XenagosExileEffect extends OneShotEffect { filter.add(Predicates.or(new CardTypePredicate(CardType.CREATURE), new CardTypePredicate(CardType.LAND))); TargetCard target1 = new TargetCard(0, Integer.MAX_VALUE, Zone.EXILED, filter); - if (exiledCards.size() > 0 + if (!exiledCards.isEmpty() && target1.canChoose(source.getSourceId(), source.getControllerId(), game) && controller.choose(Outcome.PutCardInPlay, exiledCards, target1, game)) { controller.moveCards(new CardsImpl(target1.getTargets()), Zone.BATTLEFIELD, source, game); diff --git a/Mage.Sets/src/mage/cards/y/YavimayaDryad.java b/Mage.Sets/src/mage/cards/y/YavimayaDryad.java index 12cf702b40b..ccab7b91e9c 100644 --- a/Mage.Sets/src/mage/cards/y/YavimayaDryad.java +++ b/Mage.Sets/src/mage/cards/y/YavimayaDryad.java @@ -106,7 +106,7 @@ class YavimayaDryadEffect extends SearchEffect { return false; } if (controller.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { targetPlayer.moveCards(new CardsImpl(target.getTargets()).getCards(game), Zone.BATTLEFIELD, source, game, true, false, false, null); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/equipped/HeavyArbalestTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/equipped/HeavyArbalestTest.java index d86589240df..42fdaf9ab3d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/equipped/HeavyArbalestTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/equipped/HeavyArbalestTest.java @@ -33,7 +33,7 @@ public class HeavyArbalestTest extends CardTestPlayerBase { assertLife(playerB, 18); Permanent eliteVanguard = getPermanent("Elite Vanguard", playerA.getId()); - Assert.assertTrue(eliteVanguard.getAttachments().size() > 0); + Assert.assertTrue(!eliteVanguard.getAttachments().isEmpty()); Assert.assertTrue(eliteVanguard.isTapped()); } diff --git a/Mage.Tests/src/test/java/org/mage/test/player/RandomPlayer.java b/Mage.Tests/src/test/java/org/mage/test/player/RandomPlayer.java index 821954e2d9a..ff3efe5d652 100644 --- a/Mage.Tests/src/test/java/org/mage/test/player/RandomPlayer.java +++ b/Mage.Tests/src/test/java/org/mage/test/player/RandomPlayer.java @@ -125,7 +125,7 @@ public class RandomPlayer extends ComputerPlayer { ability = options.get(rnd.nextInt(options.size())); } } - if (ability.getManaCosts().getVariableCosts().size() > 0) { + if (!ability.getManaCosts().getVariableCosts().isEmpty()) { int amount = getAvailableManaProducers(game).size() - ability.getManaCosts().convertedManaCost(); if (amount > 0) { ability = ability.copy(); @@ -225,7 +225,7 @@ public class RandomPlayer extends ComputerPlayer { int check = rnd.nextInt(numGroups + 1); if (check < numGroups) { CombatGroup group = game.getCombat().getGroups().get(check); - if (group.getAttackers().size() > 0) { + if (!group.getAttackers().isEmpty()) { this.declareBlocker(this.getId(), blocker.getId(), group.getAttackers().get(0), game); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java index 5d98013248c..f3cd2172f32 100644 --- a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java +++ b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java @@ -175,7 +175,7 @@ public class TestPlayer implements Player { protected Permanent findPermanent(FilterPermanent filter, UUID controllerId, Game game) { List permanents = game.getBattlefield().getAllActivePermanents(filter, controllerId, game); - if (permanents.size() > 0) { + if (!permanents.isEmpty()) { return permanents.get(0); } return null; @@ -200,7 +200,7 @@ public class TestPlayer implements Player { return true; } else if (groups[2].startsWith("spellOnTopOfStack=")) { String spellOnTopOFStack = groups[2].substring(18); - if (game.getStack().size() > 0) { + if (!game.getStack().isEmpty()) { StackObject stackObject = game.getStack().getFirst(); if (stackObject != null && stackObject.getStackAbility().toString().contains(spellOnTopOFStack)) { return true; diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java b/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java index 9aa176560df..88922446114 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java @@ -987,7 +987,7 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement public enum StackClause { WHILE_ON_STACK, - WHILE_NOT_ON_STACK; + WHILE_NOT_ON_STACK } /** diff --git a/Mage/src/main/java/mage/abilities/AbilitiesImpl.java b/Mage/src/main/java/mage/abilities/AbilitiesImpl.java index f2406cf8ce8..ffe5fff8e3e 100644 --- a/Mage/src/main/java/mage/abilities/AbilitiesImpl.java +++ b/Mage/src/main/java/mage/abilities/AbilitiesImpl.java @@ -93,7 +93,7 @@ public class AbilitiesImpl extends ArrayList implements Ab continue; } if (ability instanceof SpellAbility) { - if (ability.getAdditionalCostsRuleVisible() && ability.getCosts().size() > 0) { + if (ability.getAdditionalCostsRuleVisible() && !ability.getCosts().isEmpty()) { StringBuilder sbRule = threadLocalBuilder.get(); for (Cost cost : ability.getCosts()) { if (cost.getText() != null && !cost.getText().isEmpty()) { @@ -107,7 +107,7 @@ public class AbilitiesImpl extends ArrayList implements Ab } String rule = ability.getRule(); if (rule != null) { - if (rule.length() > 0) { + if (!rule.isEmpty()) { rules.add(Character.toUpperCase(rule.charAt(0)) + rule.substring(1)); } } else { // logging so we can still can be made aware of rule problems a card has diff --git a/Mage/src/main/java/mage/abilities/AbilityImpl.java b/Mage/src/main/java/mage/abilities/AbilityImpl.java index 41e362a34ca..ae5c5cf61ee 100644 --- a/Mage/src/main/java/mage/abilities/AbilityImpl.java +++ b/Mage/src/main/java/mage/abilities/AbilityImpl.java @@ -274,7 +274,7 @@ public abstract class AbilityImpl implements Ability { // if ability can be cast for no mana, clear the mana costs now, because additional mana costs must be paid. // For Flashback ability can be set X before, so the X costs have to be restored for the flashbacked ability if (noMana) { - if (this.getManaCostsToPay().getVariableCosts().size() > 0) { + if (!this.getManaCostsToPay().getVariableCosts().isEmpty()) { int xValue = this.getManaCostsToPay().getX(); this.getManaCostsToPay().clear(); VariableManaCost xCosts = new VariableManaCost(); @@ -330,7 +330,7 @@ public abstract class AbilityImpl implements Ability { } // Flashback abilities haven't made the choices the underlying spell might need for targeting. if (!(this instanceof FlashbackAbility) - && getTargets().size() > 0) { + && !getTargets().isEmpty()) { Outcome outcome = getEffects().isEmpty() ? Outcome.Detriment : getEffects().get(0).getOutcome(); if (getTargets().chooseTargets(outcome, this.controllerId, this, noMana, game) == false) { if ((variableManaCost != null || announceString != null) && !game.isSimulation()) { @@ -737,10 +737,10 @@ public abstract class AbilityImpl implements Ability { public String getRule(boolean all) { StringBuilder sbRule = threadLocalBuilder.get(); if (all || this.abilityType != AbilityType.SPELL) { - if (manaCosts.size() > 0) { + if (!manaCosts.isEmpty()) { sbRule.append(manaCosts.getText()); } - if (costs.size() > 0) { + if (!costs.isEmpty()) { if (sbRule.length() > 0) { sbRule.append(','); } @@ -1035,7 +1035,7 @@ public abstract class AbilityImpl implements Ability { } else { half = " right"; } - if (spellAbility.getTargets().size() > 0) { + if (!spellAbility.getTargets().isEmpty()) { sb.append(half).append(" half targeting "); for (Target target : spellAbility.getTargets()) { sb.append(target.getTargetedName(game)); @@ -1085,7 +1085,7 @@ public abstract class AbilityImpl implements Ability { protected String getTargetDescriptionForLog(Targets targets, Game game) { StringBuilder sb = new StringBuilder(); // threadLocal StringBuilder can't be used because calling method already uses it - if (targets.size() > 0) { + if (!targets.isEmpty()) { String usedVerb = null; for (Target target : targets) { if (!target.getTargets().isEmpty()) { diff --git a/Mage/src/main/java/mage/abilities/DelayedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/DelayedTriggeredAbility.java index a4bef097ef9..8183a81bb81 100644 --- a/Mage/src/main/java/mage/abilities/DelayedTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/DelayedTriggeredAbility.java @@ -92,8 +92,6 @@ public abstract class DelayedTriggeredAbility extends TriggeredAbilityImpl { } } - ; - public boolean isInactive(Game game) { return false; } diff --git a/Mage/src/main/java/mage/abilities/Modes.java b/Mage/src/main/java/mage/abilities/Modes.java index a10edeba125..8daf432f4b6 100644 --- a/Mage/src/main/java/mage/abilities/Modes.java +++ b/Mage/src/main/java/mage/abilities/Modes.java @@ -205,7 +205,7 @@ public class Modes extends LinkedHashMap { if (isEachModeOnlyOnce()) { setAlreadySelectedModes(selectedModes, source, game); } - return selectedModes.size() > 0; + return !selectedModes.isEmpty(); } // 700.2d diff --git a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAbility.java b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAbility.java index 1c064ddfc59..a7cb368a6c6 100644 --- a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAbility.java +++ b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAbility.java @@ -88,7 +88,7 @@ public class EntersBattlefieldAbility extends StaticAbility { @Override public void addEffect(Effect effect) { - if (getEffects().size() > 0) { + if (!getEffects().isEmpty()) { Effect entersBattlefieldEffect = this.getEffects().get(0); if (entersBattlefieldEffect instanceof EntersBattlefieldEffect) { ((EntersBattlefieldEffect) entersBattlefieldEffect).addEffect(effect); diff --git a/Mage/src/main/java/mage/abilities/condition/common/CardsInHandCondition.java b/Mage/src/main/java/mage/abilities/condition/common/CardsInHandCondition.java index 34fa110bb9b..ebb6bf0aa41 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/CardsInHandCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/CardsInHandCondition.java @@ -46,7 +46,7 @@ public class CardsInHandCondition implements Condition { public static enum CountType { MORE_THAN, FEWER_THAN, EQUAL_TO - }; + } private Condition condition; private CountType type; diff --git a/Mage/src/main/java/mage/abilities/condition/common/FerociousCondition.java b/Mage/src/main/java/mage/abilities/condition/common/FerociousCondition.java index 3df1138743d..c0a93cd97ac 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/FerociousCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/FerociousCondition.java @@ -49,7 +49,7 @@ public class FerociousCondition implements Condition { private static final FerociousCondition fInstance = new FerociousCondition(); - private FerociousCondition() {}; + private FerociousCondition() {} public static FerociousCondition getInstance() { return fInstance; diff --git a/Mage/src/main/java/mage/abilities/condition/common/OpponentControlsPermanentCondition.java b/Mage/src/main/java/mage/abilities/condition/common/OpponentControlsPermanentCondition.java index e09e0ed9153..681b9a9c9b3 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/OpponentControlsPermanentCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/OpponentControlsPermanentCondition.java @@ -44,8 +44,8 @@ import mage.game.Game; public class OpponentControlsPermanentCondition implements Condition { - public static enum CountType { MORE_THAN, FEWER_THAN, EQUAL_TO }; - + public static enum CountType { MORE_THAN, FEWER_THAN, EQUAL_TO } + private FilterPermanent filter; private CountType type; private int count; diff --git a/Mage/src/main/java/mage/abilities/condition/common/PermanentHasCounterCondition.java b/Mage/src/main/java/mage/abilities/condition/common/PermanentHasCounterCondition.java index 91609cc857a..2deef0afb1e 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/PermanentHasCounterCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/PermanentHasCounterCondition.java @@ -43,7 +43,7 @@ public class PermanentHasCounterCondition implements Condition { public static enum CountType { MORE_THAN, FEWER_THAN, EQUAL_TO - }; + } private CounterType counterType; private int amount; diff --git a/Mage/src/main/java/mage/abilities/condition/common/PermanentsOnTheBattlefieldCondition.java b/Mage/src/main/java/mage/abilities/condition/common/PermanentsOnTheBattlefieldCondition.java index c23a98553e3..67ee9d4b7bc 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/PermanentsOnTheBattlefieldCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/PermanentsOnTheBattlefieldCondition.java @@ -45,7 +45,8 @@ import mage.game.Game; */ public class PermanentsOnTheBattlefieldCondition implements Condition { - public static enum CountType { MORE_THAN, FEWER_THAN, EQUAL_TO }; + public static enum CountType { MORE_THAN, FEWER_THAN, EQUAL_TO } + private FilterPermanent filter; private Condition condition; private CountType type; diff --git a/Mage/src/main/java/mage/abilities/condition/common/TenOrLessLifeCondition.java b/Mage/src/main/java/mage/abilities/condition/common/TenOrLessLifeCondition.java index 8b727aa593e..c65ab453685 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/TenOrLessLifeCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/TenOrLessLifeCondition.java @@ -40,7 +40,7 @@ import mage.players.PlayerList; */ public class TenOrLessLifeCondition implements Condition { - public static enum CheckType { AN_OPPONENT, CONTROLLER, TARGET_OPPONENT, EACH_PLAYER }; + public static enum CheckType { AN_OPPONENT, CONTROLLER, TARGET_OPPONENT, EACH_PLAYER } private final CheckType type; diff --git a/Mage/src/main/java/mage/abilities/condition/common/TopLibraryCardTypeCondition.java b/Mage/src/main/java/mage/abilities/condition/common/TopLibraryCardTypeCondition.java index e9f92e58ec9..1e9a9d5356c 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/TopLibraryCardTypeCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/TopLibraryCardTypeCondition.java @@ -41,7 +41,7 @@ public class TopLibraryCardTypeCondition implements Condition { public static enum CheckType { CREATURE, LAND, SORCERY, INSTANT - }; + } private TopLibraryCardTypeCondition.CheckType type; diff --git a/Mage/src/main/java/mage/abilities/costs/AlternativeCost2Impl.java b/Mage/src/main/java/mage/abilities/costs/AlternativeCost2Impl.java index 4a4e2514445..28e7aa9e4f6 100644 --- a/Mage/src/main/java/mage/abilities/costs/AlternativeCost2Impl.java +++ b/Mage/src/main/java/mage/abilities/costs/AlternativeCost2Impl.java @@ -145,8 +145,6 @@ public class AlternativeCost2Impl> extends Cos return activated; } - ; - @Override public AlternativeCost2Impl copy() { return new AlternativeCost2Impl(this); diff --git a/Mage/src/main/java/mage/abilities/costs/CostsImpl.java b/Mage/src/main/java/mage/abilities/costs/CostsImpl.java index f17c7b9b2f6..538ca56b098 100644 --- a/Mage/src/main/java/mage/abilities/costs/CostsImpl.java +++ b/Mage/src/main/java/mage/abilities/costs/CostsImpl.java @@ -152,7 +152,7 @@ public class CostsImpl extends ArrayList implements Costs protected T getFirstUnpaid() { Costs unpaid = getUnpaid(); - if (unpaid.size() > 0) { + if (!unpaid.isEmpty()) { return unpaid.get(0); } return null; diff --git a/Mage/src/main/java/mage/abilities/costs/OptionalAdditionalCostImpl.java b/Mage/src/main/java/mage/abilities/costs/OptionalAdditionalCostImpl.java index 649ca77384a..5a4fda252ed 100644 --- a/Mage/src/main/java/mage/abilities/costs/OptionalAdditionalCostImpl.java +++ b/Mage/src/main/java/mage/abilities/costs/OptionalAdditionalCostImpl.java @@ -130,8 +130,6 @@ public class OptionalAdditionalCostImpl ex ++activatedCounter; } - ; - /** * Reset the activate and count information * @@ -162,8 +160,6 @@ public class OptionalAdditionalCostImpl ex return repeatable; } - ; - /** * Returns if the cost was activated * @@ -174,8 +170,6 @@ public class OptionalAdditionalCostImpl ex return activated; } - ; - /** * Returns the number of times the cost was activated * @return @@ -185,8 +179,6 @@ public class OptionalAdditionalCostImpl ex return activatedCounter; } - ; - @Override public OptionalAdditionalCostImpl copy() { diff --git a/Mage/src/main/java/mage/abilities/costs/common/PutCountersSourceCost.java b/Mage/src/main/java/mage/abilities/costs/common/PutCountersSourceCost.java index 336dddaabbc..87061d8696b 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/PutCountersSourceCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/PutCountersSourceCost.java @@ -72,7 +72,7 @@ public class PutCountersSourceCost extends CostImpl { public boolean pay(Ability ability, Game game, UUID sourceId, UUID controllerId, boolean noMana, Cost costToPay) { Permanent permanent = game.getPermanent(sourceId); if (permanent != null) { - this.paid = permanent.addCounters(counter, null, game);; + this.paid = permanent.addCounters(counter, null, game); } return paid; } diff --git a/Mage/src/main/java/mage/abilities/costs/common/RemoveCounterCost.java b/Mage/src/main/java/mage/abilities/costs/common/RemoveCounterCost.java index f24a5dbf475..3e7c557e8ee 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/RemoveCounterCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/RemoveCounterCost.java @@ -93,7 +93,7 @@ public class RemoveCounterCost extends CostImpl { for (UUID targetId : target.getTargets()) { Permanent permanent = game.getPermanent(targetId); if (permanent != null) { - if (permanent.getCounters(game).size() > 0 && (counterTypeToRemove == null || permanent.getCounters(game).containsKey(counterTypeToRemove))) { + if (!permanent.getCounters(game).isEmpty() && (counterTypeToRemove == null || permanent.getCounters(game).containsKey(counterTypeToRemove))) { String counterName = null; if (counterTypeToRemove != null) { diff --git a/Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java b/Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java index 2d14c311a7f..1e541429cc0 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java @@ -326,7 +326,7 @@ public class ManaCostsImpl extends ArrayList implements M String[] symbols = mana.split("^\\{|\\}\\{|\\}$"); int modifierForX = 0; for (String symbol : symbols) { - if (symbol.length() > 0) { + if (!symbol.isEmpty()) { if (symbol.length() == 1 || isNumeric(symbol)) { if (Character.isDigit(symbol.charAt(0))) { this.add(new GenericManaCost(Integer.valueOf(symbol))); diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/MultikickerCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/MultikickerCount.java index 6846c52d147..51c05629246 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/MultikickerCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/MultikickerCount.java @@ -65,10 +65,10 @@ public class MultikickerCount implements DynamicValue { @Override public String toString() { return "a"; - }; - + } + @Override public String getMessage() { return "time it was kicked"; - }; + } } diff --git a/Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java b/Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java index 3450de23851..c5da9a1849f 100644 --- a/Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java +++ b/Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java @@ -688,7 +688,7 @@ public class ContinuousEffects implements Serializable { } // check if player wants to use splice - if (spliceAbilities.size() > 0) { + if (!spliceAbilities.isEmpty()) { Player controller = game.getPlayer(abilityToModify.getControllerId()); if (controller.chooseUse(Outcome.Benefit, "Splice a card?", abilityToModify, game)) { Cards cardsToReveal = new CardsImpl(); @@ -899,7 +899,7 @@ public class ContinuousEffects implements Serializable { } } //Reload layerEffect if copy effects were applied - if (layer.size() > 0) { + if (!layer.isEmpty()) { activeLayerEffects = getLayeredEffects(game); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/AddManaOfAnyTypeProducedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/AddManaOfAnyTypeProducedEffect.java index da0143299f4..a07f02e8d8d 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/AddManaOfAnyTypeProducedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/AddManaOfAnyTypeProducedEffect.java @@ -80,7 +80,7 @@ public class AddManaOfAnyTypeProducedEffect extends ManaEffect { if (types.getColorless() > 0) { choice.getChoices().add("Colorless"); } - if (choice.getChoices().size() > 0) { + if (!choice.getChoices().isEmpty()) { if (choice.getChoices().size() == 1) { choice.setChoice(choice.getChoices().iterator().next()); } else { diff --git a/Mage/src/main/java/mage/abilities/effects/common/CopySpellForEachItCouldTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CopySpellForEachItCouldTargetEffect.java index 955ed8c3c4c..05bbaaf28e1 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CopySpellForEachItCouldTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CopySpellForEachItCouldTargetEffect.java @@ -170,7 +170,7 @@ public abstract class CopySpellForEachItCouldTargetEffect ex if (playerTargetCopyMap.containsKey(player.getId())) { Map targetCopyMap = playerTargetCopyMap.get(player.getId()); if (targetCopyMap != null) { - while (targetCopyMap.size() > 0) { + while (!targetCopyMap.isEmpty()) { FilterInPlay setFilter = filter.copy(); setFilter.add(new FromSetPredicate(targetCopyMap.keySet())); Target target = new TargetWithAdditionalFilter(sampleTarget, setFilter); diff --git a/Mage/src/main/java/mage/abilities/effects/common/CreateTokenEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CreateTokenEffect.java index 28a8e93b1ca..72d68417154 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CreateTokenEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CreateTokenEffect.java @@ -134,7 +134,7 @@ public class CreateTokenEffect extends OneShotEffect { sb.append(" attacking"); } String message = amount.getMessage(); - if (message.length() > 0) { + if (!message.isEmpty()) { if (amount.toString().equals("X")) { sb.append(", where X is "); } else { diff --git a/Mage/src/main/java/mage/abilities/effects/common/CreateTokenTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CreateTokenTargetEffect.java index 5243e833004..863528dbbe9 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CreateTokenTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CreateTokenTargetEffect.java @@ -80,7 +80,7 @@ public class CreateTokenTargetEffect extends OneShotEffect { sb.append(" attacking"); } String message = amount.getMessage(); - if (message.length() > 0) { + if (!message.isEmpty()) { sb.append(" for each "); } sb.append(message); diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageAllEffect.java index e537e7b304d..320440e48da 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamageAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamageAllEffect.java @@ -81,7 +81,7 @@ public class DamageAllEffect extends OneShotEffect { StringBuilder sb = new StringBuilder(); sb.append("{source} deals ").append(amount.toString()).append(" damage to each ").append(filter.getMessage()); String message = amount.getMessage(); - if (message.length() > 0) { + if (!message.isEmpty()) { if (amount.toString().equals("X")) { sb.append(", where X is "); } else { diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageControllerEffect.java index 0cf6291395e..3e863503a1b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamageControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamageControllerEffect.java @@ -103,7 +103,7 @@ public class DamageControllerEffect extends OneShotEffect { sb.append(amount); } sb.append(" damage to you"); - if (message.length() > 0) { + if (!message.isEmpty()) { if (message.equals("1")) { sb.append(" equal to the number of "); } else { diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageMultiEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageMultiEffect.java index 61baaaa19d6..a03689a13b5 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamageMultiEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamageMultiEffect.java @@ -68,7 +68,7 @@ public class DamageMultiEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - if (source.getTargets().size() > 0) { + if (!source.getTargets().isEmpty()) { Target multiTarget = source.getTargets().get(0); for (UUID target : multiTarget.getTargets()) { Permanent permanent = game.getPermanent(target); diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageTargetEffect.java index 017ba21128a..8bd6b772300 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamageTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamageTargetEffect.java @@ -152,12 +152,12 @@ public class DamageTargetEffect extends OneShotEffect { sb.append(amount); } sb.append(" damage to "); - if (targetDescription.length() > 0) { + if (!targetDescription.isEmpty()) { sb.append(targetDescription); } else { sb.append("target ").append(mode.getTargets().get(0).getTargetName()); } - if (message.length() > 0) { + if (!message.isEmpty()) { if (message.equals("1")) { sb.append(" equal to the number of "); } else { diff --git a/Mage/src/main/java/mage/abilities/effects/common/DevourEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DevourEffect.java index fdadf86629b..2ff1d23aad3 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DevourEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DevourEffect.java @@ -112,7 +112,7 @@ public class DevourEffect extends ReplacementEffectImpl { } if (controller.chooseUse(Outcome.Detriment, "Devour creatures?", source, game)) { controller.chooseTarget(Outcome.Detriment, target, source, game); - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { List> cardSubtypes = new ArrayList<>(); int devouredCreatures = target.getTargets().size(); if (!game.isSimulation()) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/DoIfCostPaid.java b/Mage/src/main/java/mage/abilities/effects/common/DoIfCostPaid.java index cc27e9ca5c0..02a31543f2e 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DoIfCostPaid.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DoIfCostPaid.java @@ -56,7 +56,7 @@ public class DoIfCostPaid extends OneShotEffect { String message; if (chooseUseText == null) { String effectText = executingEffects.getText(source.getModes().getMode()); - if (effectText.length() > 0 && effectText.charAt(effectText.length() - 1) == '.') { + if (!effectText.isEmpty() && effectText.charAt(effectText.length() - 1) == '.') { effectText = effectText.substring(0, effectText.length() - 1); } message = getCostText() + " and " + effectText + '?'; diff --git a/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java index d77a8abdb95..9cda89ce6b4 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java @@ -158,7 +158,7 @@ public class DontUntapInControllersNextUntapStepTargetEffect extends ContinuousR if (staticText != null && !staticText.isEmpty()) { return staticText; } - if (targetName != null && targetName.length() > 0) { + if (targetName != null && !targetName.isEmpty()) { if (targetName.equals("Those creatures") || targetName.equals("They")) { return targetName + " don't untap during their controller's next untap step"; } else diff --git a/Mage/src/main/java/mage/abilities/effects/common/DrawCardSourceControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DrawCardSourceControllerEffect.java index 62da3f0a0d6..bdc6a254cbe 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DrawCardSourceControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DrawCardSourceControllerEffect.java @@ -83,7 +83,7 @@ public class DrawCardSourceControllerEffect extends OneShotEffect { sb.append('s'); } String message = amount.getMessage(); - if (message.length() > 0) { + if (!message.isEmpty()) { sb.append(" for each "); } sb.append(message); diff --git a/Mage/src/main/java/mage/abilities/effects/common/DrawCardTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DrawCardTargetEffect.java index ae0c85ec398..0068c5a7015 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DrawCardTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DrawCardTargetEffect.java @@ -108,7 +108,7 @@ public class DrawCardTargetEffect extends OneShotEffect { return staticText; } StringBuilder sb = new StringBuilder(); - if (mode.getTargets().size() > 0) { + if (!mode.getTargets().isEmpty()) { Target target; if (targetPointer instanceof SecondTargetPointer && mode.getTargets().size() > 1) { target = mode.getTargets().get(1); @@ -136,7 +136,7 @@ public class DrawCardTargetEffect extends OneShotEffect { sb.append('s'); } String message = amount.getMessage(); - if (message.length() > 0) { + if (!message.isEmpty()) { sb.append(" for each "); } sb.append(message); diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileAndReturnTransformedSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileAndReturnTransformedSourceEffect.java index 1734937692e..e4ae7ecb0d1 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileAndReturnTransformedSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileAndReturnTransformedSourceEffect.java @@ -26,7 +26,7 @@ public class ExileAndReturnTransformedSourceEffect extends OneShotEffect { public static enum Gender { MALE, FEMAL - }; + } protected Effect additionalEffect; diff --git a/Mage/src/main/java/mage/abilities/effects/common/GainLifeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/GainLifeEffect.java index af86ff288c7..fc30f8ad1d2 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/GainLifeEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/GainLifeEffect.java @@ -92,7 +92,7 @@ public class GainLifeEffect extends OneShotEffect { sb.append(life).append(' '); } sb.append("life"); - if (message.length() > 0 && !message.startsWith("that")) { + if (!message.isEmpty() && !message.startsWith("that")) { sb.append(message.equals("1") ? " equal to the number of " : " for each "); sb.append(message); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/GainLifeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/GainLifeTargetEffect.java index 3e965d01ee4..b9c694dd7c2 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/GainLifeTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/GainLifeTargetEffect.java @@ -85,7 +85,7 @@ public class GainLifeTargetEffect extends OneShotEffect { StringBuilder sb = new StringBuilder(); String message = life.getMessage(); - if (mode.getTargets().size() > 0) { + if (!mode.getTargets().isEmpty()) { sb.append("Target ").append(mode.getTargets().get(0).getTargetName()); } else { sb.append("that player"); @@ -95,7 +95,7 @@ public class GainLifeTargetEffect extends OneShotEffect { sb.append(life.toString()).append(' '); } sb.append("life"); - if (message.length() > 0) { + if (!message.isEmpty()) { sb.append(message.equals("1") ? " equal to the number of " : " for each "); sb.append(message); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeControllerAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeControllerAttachedEffect.java index 5cb76793a6a..dd22576549b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeControllerAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeControllerAttachedEffect.java @@ -88,7 +88,7 @@ public class LoseLifeControllerAttachedEffect extends OneShotEffect { StringBuilder sb = new StringBuilder(); sb.append("its controller loses ").append(amount.toString()).append(" life"); String message = amount.getMessage(); - if (message.length() > 0) { + if (!message.isEmpty()) { sb.append(" for each "); sb.append(message); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeOpponentsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeOpponentsEffect.java index 7537b12f156..7a9eb8ae375 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeOpponentsEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeOpponentsEffect.java @@ -87,7 +87,7 @@ public class LoseLifeOpponentsEffect extends OneShotEffect { sb.append(amount).append(' '); } sb.append("life"); - if (message.length() > 0) { + if (!message.isEmpty()) { sb.append(message.equals("1") || message.startsWith("the ") ? " equal to the number of " : " for each "); sb.append(message); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeSourceControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeSourceControllerEffect.java index 83b9fa7b7f7..7e5dbad6634 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeSourceControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeSourceControllerEffect.java @@ -78,7 +78,7 @@ public class LoseLifeSourceControllerEffect extends OneShotEffect { StringBuilder sb = new StringBuilder(); sb.append("you lose ").append(amount.toString()).append(" life"); String message = amount.getMessage(); - if (message.length() > 0) { + if (!message.isEmpty()) { sb.append(" for each "); } sb.append(message); diff --git a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetEffect.java index 2909da13cb2..1e0069a9e40 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetEffect.java @@ -81,7 +81,7 @@ public class LoseLifeTargetEffect extends OneShotEffect { StringBuilder sb = new StringBuilder(); String message = amount.getMessage(); - if (mode.getTargets().size() > 0) { + if (!mode.getTargets().isEmpty()) { sb.append("target ").append(mode.getTargets().get(0).getTargetName()); } else { sb.append("that player"); @@ -91,7 +91,7 @@ public class LoseLifeTargetEffect extends OneShotEffect { sb.append(amount).append(' '); } sb.append("life"); - if (message.length() > 0) { + if (!message.isEmpty()) { if (amount.toString().equals("X")) { sb.append(", where X is "); } else { diff --git a/Mage/src/main/java/mage/abilities/effects/common/PhaseOutTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PhaseOutTargetEffect.java index 6584922a1ce..79dce240e23 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PhaseOutTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PhaseOutTargetEffect.java @@ -73,7 +73,7 @@ public class PhaseOutTargetEffect extends OneShotEffect { } StringBuilder sb = new StringBuilder(); - if (targetDescription != null && targetDescription.length() > 0) { + if (targetDescription != null && !targetDescription.isEmpty()) { sb.append(targetDescription); } else { sb.append("Target ").append(mode.getTargets().get(0).getTargetName()); diff --git a/Mage/src/main/java/mage/abilities/effects/common/PlayTargetWithoutPayingManaEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PlayTargetWithoutPayingManaEffect.java index 2042d607c50..08612e5e187 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PlayTargetWithoutPayingManaEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PlayTargetWithoutPayingManaEffect.java @@ -70,7 +70,7 @@ public class PlayTargetWithoutPayingManaEffect extends OneShotEffect { @Override public String getText(Mode mode) { StringBuilder sb = new StringBuilder(); - if (mode.getTargets().size() > 0) { + if (!mode.getTargets().isEmpty()) { Target target = mode.getTargets().get(0); if (mode.getTargets().get(0).getZone() == Zone.HAND) { sb.append("you may put ").append(target.getTargetName()).append(" from your hand onto the battlefield"); diff --git a/Mage/src/main/java/mage/abilities/effects/common/PopulateEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PopulateEffect.java index 46cf419611a..4a61c9e6db8 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PopulateEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PopulateEffect.java @@ -70,7 +70,7 @@ public class PopulateEffect extends OneShotEffect { public PopulateEffect(String prefixText) { super(Outcome.Copy); - this.staticText = (prefixText.length() > 0 ? prefixText + " p" : "P") + "opulate (Put a token onto the battlefield that's a copy of a creature token you control.)"; + this.staticText = (!prefixText.isEmpty() ? prefixText + " p" : "P") + "opulate (Put a token onto the battlefield that's a copy of a creature token you control.)"; } public PopulateEffect(final PopulateEffect effect) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java index 8caeff03b84..08eafb24e77 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java @@ -101,7 +101,7 @@ public class PutLibraryIntoGraveTargetEffect extends OneShotEffect { } sb.append("of his or her library into his or her graveyard"); - if (message.length() > 0) { + if (!message.isEmpty()) { sb.append(", where X is the number of "); sb.append(message); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/RecruiterEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RecruiterEffect.java index 5394ae01370..c21f31c9e13 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/RecruiterEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/RecruiterEffect.java @@ -73,7 +73,7 @@ public class RecruiterEffect extends OneShotEffect { controller.revealCards(staticText, cards, game); controller.shuffleLibrary(source, game); - if (cards.size() > 0) { + if (!cards.isEmpty()) { controller.putCardsOnTopOfLibrary(cards, game, source, true); } return true; diff --git a/Mage/src/main/java/mage/abilities/effects/common/RevealCardsFromLibraryUntilEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RevealCardsFromLibraryUntilEffect.java index aff6df4dab4..d7cd05e9143 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/RevealCardsFromLibraryUntilEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/RevealCardsFromLibraryUntilEffect.java @@ -111,7 +111,7 @@ public class RevealCardsFromLibraryUntilEffect extends OneShotEffect { // Put the rest in correct zone switch (zoneToPutRest) { case LIBRARY: { - if (cards.size() > 0) { + if (!cards.isEmpty()) { if (shuffleRestInto) { library.addAll(cards.getCards(game), game); } else { @@ -121,7 +121,7 @@ public class RevealCardsFromLibraryUntilEffect extends OneShotEffect { break; } default: - if (cards.size() > 0) { + if (!cards.isEmpty()) { controller.moveCards(cards, zoneToPutRest, source, game); } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/SkipNextPlayerUntapStepEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SkipNextPlayerUntapStepEffect.java index 0e1269c1af2..2aadf12f97e 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SkipNextPlayerUntapStepEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SkipNextPlayerUntapStepEffect.java @@ -61,7 +61,7 @@ public class SkipNextPlayerUntapStepEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player player = null; if (targetPointer != null) { - if (targetPointer.getTargets(game, source).size() > 0) { + if (!targetPointer.getTargets(game, source).isEmpty()) { player = game.getPlayer(targetPointer.getFirst(game, source)); } else { player = game.getPlayer(source.getControllerId()); @@ -82,7 +82,7 @@ public class SkipNextPlayerUntapStepEffect extends OneShotEffect { @Override public String getText(Mode mode) { StringBuilder sb = new StringBuilder(); - if (staticText.length() > 0) { + if (!staticText.isEmpty()) { sb.append(staticText).append(" player skips his or her next untap step"); } else { sb.append("You skip your next untap step"); diff --git a/Mage/src/main/java/mage/abilities/effects/common/TapTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/TapTargetEffect.java index d92c01d4c75..764ac425314 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/TapTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/TapTargetEffect.java @@ -76,7 +76,7 @@ public class TapTargetEffect extends OneShotEffect { @Override public String getText(Mode mode) { - if (staticText.length() > 0) { + if (!staticText.isEmpty()) { return "tap " + staticText; } diff --git a/Mage/src/main/java/mage/abilities/effects/common/TransformTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/TransformTargetEffect.java index 1508c07afc4..e23df12250a 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/TransformTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/TransformTargetEffect.java @@ -73,7 +73,7 @@ public class TransformTargetEffect extends OneShotEffect { @Override public String getText(Mode mode) { - if (staticText != null && staticText.length() > 0) { + if (staticText != null && !staticText.isEmpty()) { return staticText; } if (mode.getTargets().isEmpty()) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubTypeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubTypeTargetEffect.java index 7a988a5bbcd..f58836f2577 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubTypeTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubTypeTargetEffect.java @@ -77,7 +77,7 @@ public class AddCardSubTypeTargetEffect extends ContinuousEffectImpl { @Override public String getText(Mode mode) { StringBuilder sb = new StringBuilder(); - if (mode.getTargets().size() > 0) { + if (!mode.getTargets().isEmpty()) { sb.append("Target ").append(mode.getTargets().get(0).getTargetName()); } else { sb.append("It "); diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AssignNoCombatDamageSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AssignNoCombatDamageSourceEffect.java index 9961a6f614a..39f4519160b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AssignNoCombatDamageSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AssignNoCombatDamageSourceEffect.java @@ -106,7 +106,7 @@ public class AssignNoCombatDamageSourceEffect extends ReplacementEffectImpl { text += " this combat"; break; default: - if (duration.toString().length() > 0) { + if (!duration.toString().isEmpty()) { text += ' ' + duration.toString(); } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorOrColorsTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorOrColorsTargetEffect.java index a9312c85d33..d7be01a950c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorOrColorsTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorOrColorsTargetEffect.java @@ -118,11 +118,11 @@ public class BecomesColorOrColorsTargetEffect extends OneShotEffect { return staticText; } StringBuilder sb = new StringBuilder(); - if (mode.getTargets().size() > 0) { + if (!mode.getTargets().isEmpty()) { sb.append("target "); sb.append(mode.getTargets().get(0).getFilter().getMessage()); sb.append(" becomes the color or colors of your choice"); - if (duration.toString().length() > 0) { + if (!duration.toString().isEmpty()) { sb.append(' ').append(duration.toString()); } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAllEffect.java index 13610ddd457..c249c52eecb 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAllEffect.java @@ -76,7 +76,7 @@ public class BecomesCreatureAllEffect extends ContinuousEffectImpl { switch (layer) { case TypeChangingEffects_4: if (sublayer == SubLayer.NA) { - if (token.getCardType().size() > 0) { + if (!token.getCardType().isEmpty()) { for (CardType t : token.getCardType()) { if (!permanent.getCardType().contains(t)) { permanent.getCardType().add(t); @@ -86,7 +86,7 @@ public class BecomesCreatureAllEffect extends ContinuousEffectImpl { if (type == null) { permanent.getSubtype(game).clear(); } - if (token.getSubtype(game).size() > 0) { + if (!token.getSubtype(game).isEmpty()) { permanent.getSubtype(game).addAll(token.getSubtype(game)); } } @@ -100,7 +100,7 @@ public class BecomesCreatureAllEffect extends ContinuousEffectImpl { break; case AbilityAddingRemovingEffects_6: if (sublayer == SubLayer.NA) { - if (token.getAbilities().size() > 0) { + if (!token.getAbilities().isEmpty()) { for (Ability ability : token.getAbilities()) { permanent.addAbility(ability, source.getSourceId(), game); } @@ -146,7 +146,7 @@ public class BecomesCreatureAllEffect extends ContinuousEffectImpl { sb.append(" become "); } sb.append(token.getDescription()); - if (type != null && type.length() > 0) { + if (type != null && !type.isEmpty()) { sb.append(". They are still ").append(type); } return sb.toString(); diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java index 454f0000e66..d946b6869fb 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java @@ -48,7 +48,7 @@ public class BecomesCreatureAttachedEffect extends ContinuousEffectImpl { public enum LoseType { NONE, ALL, ALL_BUT_COLOR, ABILITIES, ABILITIES_SUBTYPE_AND_PT - }; + } protected Token token; protected String type; @@ -86,7 +86,7 @@ public class BecomesCreatureAttachedEffect extends ContinuousEffectImpl { switch (layer) { case TypeChangingEffects_4: if (sublayer == SubLayer.NA) { - if (token.getSupertype().size() > 0) { + if (!token.getSupertype().isEmpty()) { for (String t : token.getSupertype()) { if (!permanent.getSupertype().contains(t)) { permanent.getSupertype().add(t); @@ -100,7 +100,7 @@ public class BecomesCreatureAttachedEffect extends ContinuousEffectImpl { permanent.getCardType().clear(); break; } - if (token.getCardType().size() > 0) { + if (!token.getCardType().isEmpty()) { for (CardType t : token.getCardType()) { if (!permanent.getCardType().contains(t)) { permanent.getCardType().add(t); @@ -115,7 +115,7 @@ public class BecomesCreatureAttachedEffect extends ContinuousEffectImpl { permanent.getSubtype(game).retainAll(CardRepository.instance.getLandTypes()); break; } - if (token.getSubtype(game).size() > 0) { + if (!token.getSubtype(game).isEmpty()) { for (String t : token.getSubtype(game)) { if (!permanent.getSubtype(game).contains(t)) { permanent.getSubtype(game).add(t); @@ -148,7 +148,7 @@ public class BecomesCreatureAttachedEffect extends ContinuousEffectImpl { permanent.removeAllAbilities(source.getSourceId(), game); break; } - if (token.getAbilities().size() > 0) { + if (!token.getAbilities().isEmpty()) { for (Ability ability : token.getAbilities()) { permanent.addAbility(ability, source.getSourceId(), game); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureSourceEffect.java index 23c90cd6866..de5a79aff98 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureSourceEffect.java @@ -113,7 +113,7 @@ public class BecomesCreatureSourceEffect extends ContinuousEffectImpl implements if (losePreviousTypes) { permanent.getCardType().clear(); } - if (token.getCardType().size() > 0) { + if (!token.getCardType().isEmpty()) { for (CardType t : token.getCardType()) { if (!permanent.getCardType().contains(t)) { permanent.getCardType().add(t); @@ -123,7 +123,7 @@ public class BecomesCreatureSourceEffect extends ContinuousEffectImpl implements if ("".equals(type) || type == null && permanent.getCardType().contains(CardType.LAND)) { permanent.getSubtype(game).retainAll(CardRepository.instance.getLandTypes()); } - if (token.getSubtype(game).size() > 0) { + if (!token.getSubtype(game).isEmpty()) { permanent.getSubtype(game).addAll(token.getSubtype(game)); } } @@ -137,7 +137,7 @@ public class BecomesCreatureSourceEffect extends ContinuousEffectImpl implements break; case AbilityAddingRemovingEffects_6: if (sublayer == SubLayer.NA) { - if (token.getAbilities().size() > 0) { + if (!token.getAbilities().isEmpty()) { for (Ability ability : token.getAbilities()) { permanent.addAbility(ability, source.getSourceId(), game); } @@ -172,7 +172,7 @@ public class BecomesCreatureSourceEffect extends ContinuousEffectImpl implements } private void setText() { - if (type != null && type.length() > 0) { + if (type != null && !type.isEmpty()) { staticText = duration.toString() + " {this} becomes a " + token.getDescription() + " that's still a " + this.type; } else { staticText = duration.toString() + " {this} becomes a " + token.getDescription(); diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTargetEffect.java index e16b52adcc0..833597d81a4 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTargetEffect.java @@ -91,7 +91,7 @@ public class BecomesCreatureTargetEffect extends ContinuousEffectImpl { permanent.getSubtype(game).retainAll(CardRepository.instance.getLandTypes()); permanent.getSubtype(game).addAll(token.getSubtype(game)); } else { - if (token.getSubtype(game).size() > 0) { + if (!token.getSubtype(game).isEmpty()) { for (String subtype : token.getSubtype(game)) { if (!permanent.getSubtype(game).contains(subtype)) { permanent.getSubtype(game).add(subtype); @@ -100,7 +100,7 @@ public class BecomesCreatureTargetEffect extends ContinuousEffectImpl { } } - if (token.getCardType().size() > 0) { + if (!token.getCardType().isEmpty()) { for (CardType t : token.getCardType()) { if (!permanent.getCardType().contains(t)) { permanent.getCardType().add(t); @@ -128,7 +128,7 @@ public class BecomesCreatureTargetEffect extends ContinuousEffectImpl { permanent.removeAllAbilities(source.getSourceId(), game); } if (sublayer == SubLayer.NA) { - if (token.getAbilities().size() > 0) { + if (!token.getAbilities().isEmpty()) { for (Ability ability : token.getAbilities()) { permanent.addAbility(ability, source.getSourceId(), game); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostEquippedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostEquippedEffect.java index 33eff81c6ae..796fa3060ca 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostEquippedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostEquippedEffect.java @@ -132,7 +132,7 @@ public class BoostEquippedEffect extends ContinuousEffectImpl { if (duration != Duration.WhileOnBattlefield) sb.append(' ').append(duration.toString()); String message = power.getMessage(); - if (message.length() > 0) { + if (!message.isEmpty()) { sb.append(" for each "); } sb.append(message); diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAllEffect.java index 66320f7a27e..513fe0f5ae9 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAllEffect.java @@ -197,7 +197,7 @@ public class GainAbilityAllEffect extends ContinuousEffectImpl { if (quotes) { sb.append('"'); } - if (duration.toString().length() > 0) { + if (!duration.toString().isEmpty()) { sb.append(' ').append(duration.toString()); } return sb.toString(); diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityTargetEffect.java index b689d1224d1..19ef23b8fb6 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityTargetEffect.java @@ -71,7 +71,7 @@ public class GainAbilityTargetEffect extends ContinuousEffectImpl { public GainAbilityTargetEffect(Ability ability, Duration duration, String rule, boolean onCard, Layer layer, SubLayer subLayer) { super(duration, layer, subLayer, - ability.getEffects().size() > 0 ? ability.getEffects().get(0).getOutcome() : Outcome.AddAbility); + !ability.getEffects().isEmpty() ? ability.getEffects().get(0).getOutcome() : Outcome.AddAbility); this.ability = ability; staticText = rule; this.onCard = onCard; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/MaximumHandSizeControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/MaximumHandSizeControllerEffect.java index e479cfaa5c1..8ea40207d6e 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/MaximumHandSizeControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/MaximumHandSizeControllerEffect.java @@ -48,7 +48,7 @@ public class MaximumHandSizeControllerEffect extends ContinuousEffectImpl { public static enum HandSizeModification { SET, INCREASE, REDUCE - }; + } protected DynamicValue handSize; protected HandSizeModification handSizeModification; diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersAttachedEffect.java index 20554668e23..2824f7f5e7c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersAttachedEffect.java @@ -101,7 +101,7 @@ public class AddCountersAttachedEffect extends OneShotEffect { } sb.append(counter.getName().toLowerCase()).append(" counter on "); sb.append(textEnchanted); - if (amount.getMessage().length() > 0) { + if (!amount.getMessage().isEmpty()) { sb.append(" for each ").append(amount.getMessage()); } staticText = sb.toString(); diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersTargetEffect.java index f2f40afefd4..de633168c24 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersTargetEffect.java @@ -146,7 +146,7 @@ public class AddCountersTargetEffect extends OneShotEffect { } sb.append(" on "); - if (mode.getTargets().size() > 0) { + if (!mode.getTargets().isEmpty()) { Target target = mode.getTargets().get(0); if (target.getNumberOfTargets() == 0) { sb.append("up to "); @@ -164,7 +164,7 @@ public class AddCountersTargetEffect extends OneShotEffect { sb.append("that creature"); } - if (amount.getMessage().length() > 0) { + if (!amount.getMessage().isEmpty()) { sb.append(" for each ").append(amount.getMessage()); } return sb.toString(); diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/DistributeCountersEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/DistributeCountersEffect.java index 6cb3f44bb1b..9a024576593 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/counter/DistributeCountersEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/counter/DistributeCountersEffect.java @@ -74,7 +74,7 @@ public class DistributeCountersEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - if (source.getTargets().size() > 0) { + if (!source.getTargets().isEmpty()) { Target multiTarget = source.getTargets().get(0); for (UUID target : multiTarget.getTargets()) { Permanent permanent = game.getPermanent(target); @@ -135,7 +135,7 @@ class RemoveCountersAtEndOfTurn extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - if (source.getTargets().size() > 0) { + if (!source.getTargets().isEmpty()) { Target multiTarget = source.getTargets().get(0); for (UUID target : multiTarget.getTargets()) { Permanent permanent = game.getPermanent(target); diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/ProliferateEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/ProliferateEffect.java index b67caad706a..c18d4030f0f 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/counter/ProliferateEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/counter/ProliferateEffect.java @@ -75,7 +75,7 @@ public class ProliferateEffect extends OneShotEffect { UUID chosen = (UUID) target.getTargets().get(idx); Permanent permanent = game.getPermanent(chosen); if (permanent != null) { - if (permanent.getCounters(game).size() > 0) { + if (!permanent.getCounters(game).isEmpty()) { if (permanent.getCounters(game).size() == 1) { for (Counter counter : permanent.getCounters(game).values()) { Counter newCounter = new Counter(counter.getName()); @@ -102,7 +102,7 @@ public class ProliferateEffect extends OneShotEffect { } else { Player player = game.getPlayer(chosen); if (player != null) { - if (player.getCounters().size() > 0) { + if (!player.getCounters().isEmpty()) { if (player.getCounters().size() == 1) { for (Counter counter : player.getCounters().values()) { Counter newCounter = new Counter(counter.getName()); diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCounterTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCounterTargetEffect.java index 3647644a9de..5820f6166dc 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCounterTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCounterTargetEffect.java @@ -93,7 +93,7 @@ public class RemoveCounterTargetEffect extends OneShotEffect { private Counter selectCounterType(Game game, Ability source, Permanent permanent) { Player controller = game.getPlayer(source.getControllerId()); - if(controller != null && permanent.getCounters(game).size() > 0) { + if(controller != null && !permanent.getCounters(game).isEmpty()) { String counterName = null; if(permanent.getCounters(game).size() > 1) { Choice choice = new ChoiceImpl(true); diff --git a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardControllerEffect.java index e21c7574d88..69297f115d3 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardControllerEffect.java @@ -116,7 +116,7 @@ public class DiscardControllerEffect extends OneShotEffect { sb.append(" at random"); } String message = amount.getMessage(); - if (message.length() > 0) { + if (!message.isEmpty()) { sb.append(" for each "); } sb.append(message); diff --git a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandTargetEffect.java index 83d5d9526c8..22bee765e98 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandTargetEffect.java @@ -84,7 +84,7 @@ public class DiscardHandTargetEffect extends OneShotEffect { return staticText; } StringBuilder sb = new StringBuilder(); - if (targetDescription.length() > 0) { + if (!targetDescription.isEmpty()) { sb.append(targetDescription); } else { sb.append("target ").append(mode.getTargets().get(0).getTargetName()); diff --git a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardTargetEffect.java index 65a390a537a..a053e6f2560 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardTargetEffect.java @@ -116,7 +116,7 @@ public class DiscardTargetEffect extends OneShotEffect { sb.append(" at random"); } String message = amount.getMessage(); - if (message.length() > 0) { + if (!message.isEmpty()) { sb.append(" for each "); } sb.append(message); diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutInHandEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutInHandEffect.java index 656a47b3e79..2d5d1769de1 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutInHandEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutInHandEffect.java @@ -82,7 +82,7 @@ public class SearchLibraryGraveyardPutInHandEffect extends OneShotEffect { TargetCardInLibrary target = new TargetCardInLibrary(0, 1, filter); target.clearChosen(); if (controller.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { cardFound = game.getCard(target.getFirstTarget()); } } @@ -93,7 +93,7 @@ public class SearchLibraryGraveyardPutInHandEffect extends OneShotEffect { TargetCard target = new TargetCard(0, 1, Zone.GRAVEYARD, filter); target.clearChosen(); if (controller.choose(outcome, controller.getGraveyard(), target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { cardFound = game.getCard(target.getFirstTarget()); } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandEffect.java index 8ce316cfc56..f456b96dfde 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandEffect.java @@ -90,7 +90,7 @@ public class SearchLibraryPutInHandEffect extends SearchEffect { } target.clearChosen(); if (controller.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { Cards cards = new CardsImpl(); for (UUID cardId : target.getTargets()) { Card card = game.getCard(cardId); diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java index 39d26abaf54..52f45373b0f 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java @@ -88,7 +88,7 @@ public class SearchLibraryPutInPlayEffect extends SearchEffect { return false; } if (player.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { player.moveCards(new CardsImpl(target.getTargets()).getCards(game), Zone.BATTLEFIELD, source, game, tapped, false, false, null); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayTargetPlayerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayTargetPlayerEffect.java index 0b851ee8584..0d3c6776b03 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayTargetPlayerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayTargetPlayerEffect.java @@ -71,7 +71,7 @@ public class SearchLibraryPutInPlayTargetPlayerEffect extends SearchEffect { Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { if (player.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { player.moveCards(new CardsImpl(target.getTargets()).getCards(game), Zone.BATTLEFIELD, source, game, tapped, false, ownerIsController, null); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryWithLessCMCPutInPlayEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryWithLessCMCPutInPlayEffect.java index 2096e438436..75e156a20d7 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryWithLessCMCPutInPlayEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryWithLessCMCPutInPlayEffect.java @@ -69,7 +69,7 @@ public class SearchLibraryWithLessCMCPutInPlayEffect extends OneShotEffect { filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.LessThan, source.getManaCostsToPay().getX() + 1)); TargetCardInLibrary target = new TargetCardInLibrary(filter); if (controller.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { Card card = controller.getLibrary().getCard(target.getFirstTarget(), game); if (card != null) { controller.moveCards(card, Zone.BATTLEFIELD, source, game); diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/FatesealEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/FatesealEffect.java index 03ca5be0ca6..f4b8c95e87f 100644 --- a/Mage/src/main/java/mage/abilities/effects/keyword/FatesealEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/keyword/FatesealEffect.java @@ -89,7 +89,7 @@ public class FatesealEffect extends OneShotEffect { TargetCard target1 = new TargetCard(Zone.LIBRARY, filter1); target1.setRequired(false); // move cards to the bottom of the library - while (cards.size() > 0 && controller.choose(Outcome.Detriment, cards, target1, game)) { + while (!cards.isEmpty() && controller.choose(Outcome.Detriment, cards, target1, game)) { if (!controller.canRespond() || !opponent.canRespond()) { return false; } diff --git a/Mage/src/main/java/mage/abilities/keyword/CascadeAbility.java b/Mage/src/main/java/mage/abilities/keyword/CascadeAbility.java index dbe8a87d8d1..45125e1d962 100644 --- a/Mage/src/main/java/mage/abilities/keyword/CascadeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/CascadeAbility.java @@ -134,7 +134,7 @@ class CascadeEffect extends OneShotEffect { Cards cardsFromExile = new CardsImpl(); Cards cardsToLibrary = new CardsImpl(); cardsFromExile.addAll(exile); - while (cardsFromExile.size() > 0) { + while (!cardsFromExile.isEmpty()) { card = cardsFromExile.getRandom(game); cardsFromExile.remove(card.getId()); cardsToLibrary.add(card); diff --git a/Mage/src/main/java/mage/abilities/keyword/ConvokeAbility.java b/Mage/src/main/java/mage/abilities/keyword/ConvokeAbility.java index f155d53c44f..fd3f408d600 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ConvokeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ConvokeAbility.java @@ -208,7 +208,7 @@ class ConvokeEffect extends OneShotEffect { if (!perm.isTapped() && perm.tap(game)) { ManaPool manaPool = controller.getManaPool(); Choice chooseManaType = buildChoice(perm.getColor(game), unpaid.getMana()); - if (chooseManaType.getChoices().size() > 0) { + if (!chooseManaType.getChoices().isEmpty()) { if (chooseManaType.getChoices().size() > 1) { chooseManaType.getChoices().add("Colorless"); chooseManaType.setMessage("Choose mana color to reduce from " + perm.getName()); diff --git a/Mage/src/main/java/mage/abilities/keyword/DelveAbility.java b/Mage/src/main/java/mage/abilities/keyword/DelveAbility.java index 69b0adcb46a..a50e1bf0d49 100644 --- a/Mage/src/main/java/mage/abilities/keyword/DelveAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/DelveAbility.java @@ -93,13 +93,13 @@ public class DelveAbility extends SimpleStaticAbility implements AlternateManaPa @Override public String getRule() { - return "Delve (Each card you exile from your graveyard while casting this spell pays for {1}.)"; + return "Delve (Each card you exile from your graveyard while casting this spell pays for {1}.)"; } @Override public void addSpecialAction(Ability source, Game game, ManaCost unpaid) { Player controller = game.getPlayer(source.getControllerId()); - if (controller != null && controller.getGraveyard().size() > 0) { + if (controller != null && !controller.getGraveyard().isEmpty()) { if (unpaid.getMana().getGeneric() > 0 && source.getAbilityType().equals(AbilityType.SPELL)) { SpecialAction specialAction = new DelveSpecialAction(); specialAction.setControllerId(source.getControllerId()); @@ -159,7 +159,7 @@ class DelveEffect extends OneShotEffect { ExileFromGraveCost exileFromGraveCost = (ExileFromGraveCost) source.getCosts().get(0); List exiledCards = exileFromGraveCost.getExiledCards(); - if (exiledCards.size() > 0) { + if (!exiledCards.isEmpty()) { Cards toDelve = new CardsImpl(); for (Card card : exiledCards) { toDelve.add(card); diff --git a/Mage/src/main/java/mage/abilities/keyword/FlashbackAbility.java b/Mage/src/main/java/mage/abilities/keyword/FlashbackAbility.java index 350cc8e5177..3667b598321 100644 --- a/Mage/src/main/java/mage/abilities/keyword/FlashbackAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/FlashbackAbility.java @@ -123,16 +123,16 @@ public class FlashbackAbility extends SpellAbility { @Override public String getRule() { StringBuilder sbRule = new StringBuilder("Flashback"); - if (costs.size() > 0) { + if (!costs.isEmpty()) { sbRule.append(" - "); } else { sbRule.append(' '); } - if (manaCosts.size() > 0) { + if (!manaCosts.isEmpty()) { sbRule.append(manaCosts.getText()); } - if (costs.size() > 0) { - if (manaCosts.size() > 0) { + if (!costs.isEmpty()) { + if (!manaCosts.isEmpty()) { sbRule.append(", "); } sbRule.append(costs.getText()); diff --git a/Mage/src/main/java/mage/abilities/keyword/HideawayAbility.java b/Mage/src/main/java/mage/abilities/keyword/HideawayAbility.java index bd839096a42..30e8ef3914f 100644 --- a/Mage/src/main/java/mage/abilities/keyword/HideawayAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/HideawayAbility.java @@ -118,7 +118,7 @@ class HideawayExileEffect extends OneShotEffect { Cards cards = new CardsImpl(); cards.addAll(controller.getLibrary().getTopCards(game, 4)); - if (cards.size() > 0) { + if (!cards.isEmpty()) { TargetCard target1 = new TargetCard(Zone.LIBRARY, filter1); if (controller.choose(Outcome.Detriment, cards, target1, game)) { Card card = cards.get(target1.getFirstTarget(), game); diff --git a/Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java b/Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java index 100c0e74734..5dc86dada78 100644 --- a/Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java @@ -82,7 +82,7 @@ class TransmuteEffect extends OneShotEffect { filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.Equal, sourceObject.getConvertedManaCost())); TargetCardInLibrary target = new TargetCardInLibrary(1, filter); if (controller.searchLibrary(target, game)) { - if (target.getTargets().size() > 0) { + if (!target.getTargets().isEmpty()) { Cards revealed = new CardsImpl(target.getTargets()); controller.revealCards(sourceObject.getIdName(), revealed, game); controller.moveCards(revealed, Zone.HAND, source, game); diff --git a/Mage/src/main/java/mage/abilities/mana/ActivatedManaAbilityImpl.java b/Mage/src/main/java/mage/abilities/mana/ActivatedManaAbilityImpl.java index 1c7b4d68746..000aa8bdf58 100644 --- a/Mage/src/main/java/mage/abilities/mana/ActivatedManaAbilityImpl.java +++ b/Mage/src/main/java/mage/abilities/mana/ActivatedManaAbilityImpl.java @@ -95,7 +95,7 @@ public abstract class ActivatedManaAbilityImpl extends ActivatedAbilityImpl impl */ @Override public boolean definesMana() { - return netMana.size() > 0; + return !netMana.isEmpty(); } /** diff --git a/Mage/src/main/java/mage/abilities/mana/AnyColorLandsProduceManaAbility.java b/Mage/src/main/java/mage/abilities/mana/AnyColorLandsProduceManaAbility.java index 80812218084..ea94f06ffc8 100644 --- a/Mage/src/main/java/mage/abilities/mana/AnyColorLandsProduceManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/AnyColorLandsProduceManaAbility.java @@ -124,7 +124,7 @@ class AnyColorLandsProduceManaEffect extends ManaEffect { choice.getChoices().add("Green"); choice.getChoices().add("White"); } - if (choice.getChoices().size() > 0) { + if (!choice.getChoices().isEmpty()) { Player player = game.getPlayer(source.getControllerId()); if (choice.getChoices().size() == 1) { choice.setChoice(choice.getChoices().iterator().next()); diff --git a/Mage/src/main/java/mage/abilities/mana/CommanderColorIdentityManaAbility.java b/Mage/src/main/java/mage/abilities/mana/CommanderColorIdentityManaAbility.java index d344dcfc969..8e2a7c23303 100644 --- a/Mage/src/main/java/mage/abilities/mana/CommanderColorIdentityManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/CommanderColorIdentityManaAbility.java @@ -148,7 +148,7 @@ class CommanderIdentityManaEffect extends ManaEffect { } } } - if (choice.getChoices().size() > 0) { + if (!choice.getChoices().isEmpty()) { if (choice.getChoices().size() == 1) { choice.setChoice(choice.getChoices().iterator().next()); } else { diff --git a/Mage/src/main/java/mage/abilities/mana/ManaOptions.java b/Mage/src/main/java/mage/abilities/mana/ManaOptions.java index 03e8bcd4ee6..f5402422dc5 100644 --- a/Mage/src/main/java/mage/abilities/mana/ManaOptions.java +++ b/Mage/src/main/java/mage/abilities/mana/ManaOptions.java @@ -46,8 +46,6 @@ public class ManaOptions extends ArrayList { public ManaOptions() { } - ; - public ManaOptions(final ManaOptions options) { for (Mana mana : options) { this.add(mana.copy()); diff --git a/Mage/src/main/java/mage/abilities/mana/TriggeredManaAbility.java b/Mage/src/main/java/mage/abilities/mana/TriggeredManaAbility.java index 4ef715e220d..ab686c04d6d 100644 --- a/Mage/src/main/java/mage/abilities/mana/TriggeredManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/TriggeredManaAbility.java @@ -97,6 +97,6 @@ public abstract class TriggeredManaAbility extends TriggeredAbilityImpl implemen */ @Override public boolean definesMana() { - return netMana.size() > 0; + return !netMana.isEmpty(); } } diff --git a/Mage/src/main/java/mage/cards/Sets.java b/Mage/src/main/java/mage/cards/Sets.java index 7fc0e1374e8..afa3a1d5653 100644 --- a/Mage/src/main/java/mage/cards/Sets.java +++ b/Mage/src/main/java/mage/cards/Sets.java @@ -146,10 +146,10 @@ public class Sets extends HashMap { Map deckCards = new HashMap<>(); Map sideboard = new HashMap<>(); try (PrintWriter out = new PrintWriter(file)) { - if (deck.getName() != null && deck.getName().length() > 0) { + if (deck.getName() != null && !deck.getName().isEmpty()) { out.println("NAME:" + deck.getName()); } - if (deck.getAuthor() != null && deck.getAuthor().length() > 0) { + if (deck.getAuthor() != null && !deck.getAuthor().isEmpty()) { out.println("AUTHOR:" + deck.getAuthor()); } for (DeckCardInfo deckCardInfo : deck.getCards()) { diff --git a/Mage/src/main/java/mage/cards/decks/importer/DckDeckImporter.java b/Mage/src/main/java/mage/cards/decks/importer/DckDeckImporter.java index 6593401fc1c..67837022b80 100644 --- a/Mage/src/main/java/mage/cards/decks/importer/DckDeckImporter.java +++ b/Mage/src/main/java/mage/cards/decks/importer/DckDeckImporter.java @@ -73,7 +73,7 @@ public class DckDeckImporter extends DeckImporter { if (cardInfo == null) { // Try alternate based on name String cardName = m.group(5); - if (cardName != null && cardName.length() > 0) { + if (cardName != null && !cardName.isEmpty()) { cardInfo = CardRepository.instance.findPreferedCoreExpansionCard(cardName, false); sbMessage.append("Could not find card '").append(cardName).append("' in set ").append(setCode).append(" of number ").append(cardNum).append(".\n"); if (cardInfo != null) { diff --git a/Mage/src/main/java/mage/filter/FilterCard.java b/Mage/src/main/java/mage/filter/FilterCard.java index a59885e9905..035d6e8809c 100644 --- a/Mage/src/main/java/mage/filter/FilterCard.java +++ b/Mage/src/main/java/mage/filter/FilterCard.java @@ -115,7 +115,7 @@ public class FilterCard extends FilterObject { } public boolean hasPredicates() { - return predicates.size() > 0; + return !predicates.isEmpty(); } @Override diff --git a/Mage/src/main/java/mage/game/GameCommanderImpl.java b/Mage/src/main/java/mage/game/GameCommanderImpl.java index 3be3b93eb95..44c61134d5a 100644 --- a/Mage/src/main/java/mage/game/GameCommanderImpl.java +++ b/Mage/src/main/java/mage/game/GameCommanderImpl.java @@ -72,7 +72,7 @@ public abstract class GameCommanderImpl extends GameImpl { for (UUID playerId : state.getPlayerList(startingPlayerId)) { Player player = getPlayer(playerId); if (player != null) { - while (player.getSideboard().size() > 0) { + while (!player.getSideboard().isEmpty()) { Card commander = this.getCard(player.getSideboard().iterator().next()); if (commander != null) { player.addCommanderId(commander.getId()); diff --git a/Mage/src/main/java/mage/game/GameImpl.java b/Mage/src/main/java/mage/game/GameImpl.java index f24110ca596..c85f5f2550c 100644 --- a/Mage/src/main/java/mage/game/GameImpl.java +++ b/Mage/src/main/java/mage/game/GameImpl.java @@ -1898,7 +1898,7 @@ public abstract class GameImpl implements Game, Serializable { //20091005 - 704.5q If a creature is attached to an object or player, it becomes unattached and remains on the battlefield. // Similarly, if a permanent thatÂ’s neither an Aura, an Equipment, nor a Fortification is attached to an object or player, // it becomes unattached and remains on the battlefield. - if (perm.getAttachments().size() > 0) { + if (!perm.getAttachments().isEmpty()) { for (UUID attachmentId : perm.getAttachments()) { Permanent attachment = getPermanent(attachmentId); if (attachment != null diff --git a/Mage/src/main/java/mage/game/GameStates.java b/Mage/src/main/java/mage/game/GameStates.java index b65cbccea3c..e4e82b2efbf 100644 --- a/Mage/src/main/java/mage/game/GameStates.java +++ b/Mage/src/main/java/mage/game/GameStates.java @@ -60,7 +60,7 @@ public class GameStates implements Serializable { } public GameState rollback(int index) { - if (states.size() > 0 && index < states.size()) { + if (!states.isEmpty() && index < states.size()) { while (states.size() > index + 1) { states.remove(states.size() - 1); } @@ -72,8 +72,8 @@ public class GameStates implements Serializable { } public int remove(int index) { - if (states.size() > 0 && index < states.size()) { - while (states.size() > index && states.size() > 0) { + if (!states.isEmpty() && index < states.size()) { + while (states.size() > index && !states.isEmpty()) { states.remove(states.size() - 1); } } diff --git a/Mage/src/main/java/mage/game/ZonesHandler.java b/Mage/src/main/java/mage/game/ZonesHandler.java index fc733a970b8..9f293231bd8 100644 --- a/Mage/src/main/java/mage/game/ZonesHandler.java +++ b/Mage/src/main/java/mage/game/ZonesHandler.java @@ -34,7 +34,7 @@ public class ZonesHandler { public static boolean moveCard(ZoneChangeInfo info, Game game) { List list = new ArrayList<>(); list.add(info); - return moveCards(list, game).size() > 0; + return !moveCards(list, game).isEmpty(); } public static List moveCards(List zoneChangeInfos, Game game) { diff --git a/Mage/src/main/java/mage/game/combat/Combat.java b/Mage/src/main/java/mage/game/combat/Combat.java index edd139d5abe..fdf52a3d698 100644 --- a/Mage/src/main/java/mage/game/combat/Combat.java +++ b/Mage/src/main/java/mage/game/combat/Combat.java @@ -514,7 +514,7 @@ public class Combat implements Serializable, Copyable { } } if (attackerExists) { - if (group.getBlockers().size() > 0) { + if (!group.getBlockers().isEmpty()) { sb.append("blocked by "); for (UUID blockingCreatureId : group.getBlockerOrder()) { Permanent blockingCreature = game.getPermanent(blockingCreatureId); diff --git a/Mage/src/main/java/mage/game/combat/CombatGroup.java b/Mage/src/main/java/mage/game/combat/CombatGroup.java index b18d6f76105..ca898f12bf4 100644 --- a/Mage/src/main/java/mage/game/combat/CombatGroup.java +++ b/Mage/src/main/java/mage/game/combat/CombatGroup.java @@ -134,7 +134,7 @@ public class CombatGroup implements Serializable, Copyable { } public void assignDamageToBlockers(boolean first, Game game) { - if (attackers.size() > 0 && (!first || hasFirstOrDoubleStrike(game))) { + if (!attackers.isEmpty() && (!first || hasFirstOrDoubleStrike(game))) { if (blockers.isEmpty()) { unblockedDamage(first, game); } else { @@ -156,7 +156,7 @@ public class CombatGroup implements Serializable, Copyable { } public void assignDamageToAttackers(boolean first, Game game) { - if (blockers.size() > 0 && (!first || hasFirstOrDoubleStrike(game))) { + if (!blockers.isEmpty() && (!first || hasFirstOrDoubleStrike(game))) { if (attackers.size() == 1) { singleAttackerDamage(first, game); } else { @@ -581,7 +581,7 @@ public class CombatGroup implements Serializable, Copyable { for (UUID uuid : attackers) { Permanent attacker = game.getPermanent(uuid); // Check if there are enough blockers to have a legal block - if (attacker != null && this.blocked && attacker.getMinBlockedBy() > 1 && blockers.size() > 0 && blockers.size() < attacker.getMinBlockedBy()) { + if (attacker != null && this.blocked && attacker.getMinBlockedBy() > 1 && !blockers.isEmpty() && blockers.size() < attacker.getMinBlockedBy()) { for (UUID blockerId : blockers) { Permanent blocker = game.getPermanent(blockerId); if (blocker != null) { diff --git a/Mage/src/main/java/mage/game/draft/DraftCube.java b/Mage/src/main/java/mage/game/draft/DraftCube.java index b120bb0a94a..8a9c1cb647a 100644 --- a/Mage/src/main/java/mage/game/draft/DraftCube.java +++ b/Mage/src/main/java/mage/game/draft/DraftCube.java @@ -108,7 +108,7 @@ public abstract class DraftCube { if (!cardId.getExtension().isEmpty()) { CardCriteria criteria = new CardCriteria().name(cardId.getName()).setCodes(cardId.extension); List cardList = CardRepository.instance.findCards(criteria); - if (cardList != null && cardList.size() > 0) { + if (cardList != null && !cardList.isEmpty()) { cardInfo = cardList.get(0); } } else { diff --git a/Mage/src/main/java/mage/game/draft/RandomBoosterDraft.java b/Mage/src/main/java/mage/game/draft/RandomBoosterDraft.java index bc50b7a72f4..887f1bed3d4 100644 --- a/Mage/src/main/java/mage/game/draft/RandomBoosterDraft.java +++ b/Mage/src/main/java/mage/game/draft/RandomBoosterDraft.java @@ -63,7 +63,7 @@ public class RandomBoosterDraft extends BoosterDraft { } private ExpansionSet getNextBooster() { - if (0 == useBoosters.size()){ + if (useBoosters.isEmpty()){ resetBoosters(); } ExpansionSet theBooster = useBoosters.get(0); diff --git a/Mage/src/main/java/mage/game/match/MatchPlayer.java b/Mage/src/main/java/mage/game/match/MatchPlayer.java index f2c5d483dd4..3bc8a66edd9 100644 --- a/Mage/src/main/java/mage/game/match/MatchPlayer.java +++ b/Mage/src/main/java/mage/game/match/MatchPlayer.java @@ -105,7 +105,7 @@ public class MatchPlayer implements Serializable { public Deck generateDeck() { //TODO: improve this - while (deck.getCards().size() < 40 && deck.getSideboard().size() > 0) { + while (deck.getCards().size() < 40 && !deck.getSideboard().isEmpty()) { Card card = deck.getSideboard().iterator().next(); deck.getCards().add(card); deck.getSideboard().remove(card); diff --git a/Mage/src/main/java/mage/game/permanent/token/Token.java b/Mage/src/main/java/mage/game/permanent/token/Token.java index ef5f13c8241..46b7fd49188 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Token.java @@ -284,7 +284,7 @@ public class Token extends MageObjectImpl { } public void setExpansionSetCodeForImage(String code) { - if (availableImageSetCodes.size() > 0) { + if (!availableImageSetCodes.isEmpty()) { if (availableImageSetCodes.contains(code)) { setOriginalExpansionSetCode(code); } else // we should not set random set if appropriate set is already used diff --git a/Mage/src/main/java/mage/game/stack/Spell.java b/Mage/src/main/java/mage/game/stack/Spell.java index 38c49d6ded3..2f2871b641a 100644 --- a/Mage/src/main/java/mage/game/stack/Spell.java +++ b/Mage/src/main/java/mage/game/stack/Spell.java @@ -315,7 +315,7 @@ public class Spell extends StackObjImpl implements Card { boolean legalTargetedMode = false; for (UUID modeId : spellAbility.getModes().getSelectedModes()) { Mode mode = spellAbility.getModes().get(modeId); - if (mode.getTargets().size() > 0) { + if (!mode.getTargets().isEmpty()) { targetedMode = true; if (mode.getTargets().stillLegal(spellAbility, game)) { legalTargetedMode = true; diff --git a/Mage/src/main/java/mage/game/stack/StackAbility.java b/Mage/src/main/java/mage/game/stack/StackAbility.java index 2ba1f248d6c..430820956fd 100644 --- a/Mage/src/main/java/mage/game/stack/StackAbility.java +++ b/Mage/src/main/java/mage/game/stack/StackAbility.java @@ -589,7 +589,7 @@ public class StackAbility extends StackObjImpl implements Ability { newAbility.newId(); StackAbility newStackAbility = new StackAbility(newAbility, newControllerId); game.getStack().push(newStackAbility); - if (chooseNewTargets && newAbility.getTargets().size() > 0) { + if (chooseNewTargets && !newAbility.getTargets().isEmpty()) { Player controller = game.getPlayer(newControllerId); Outcome outcome = newAbility.getEffects().isEmpty() ? Outcome.Detriment : newAbility.getEffects().get(0).getOutcome(); if (controller.chooseUse(outcome, "Choose new targets?", source, game)) { diff --git a/Mage/src/main/java/mage/game/tournament/TournamentImpl.java b/Mage/src/main/java/mage/game/tournament/TournamentImpl.java index a227b824217..3c48e1611b6 100644 --- a/Mage/src/main/java/mage/game/tournament/TournamentImpl.java +++ b/Mage/src/main/java/mage/game/tournament/TournamentImpl.java @@ -202,7 +202,7 @@ public abstract class TournamentImpl implements Tournament { round.addPairing(new TournamentPairing(player1, player2)); } - if (roundPlayers.size() > 0) { + if (!roundPlayers.isEmpty()) { // player free round - add to bye players of this round TournamentPlayer player1 = roundPlayers.get(0); round.getPlayerByes().add(player1); diff --git a/Mage/src/main/java/mage/game/tournament/pairing/SwissPairingSimple.java b/Mage/src/main/java/mage/game/tournament/pairing/SwissPairingSimple.java index 0af702e22c2..249fa0b116d 100644 --- a/Mage/src/main/java/mage/game/tournament/pairing/SwissPairingSimple.java +++ b/Mage/src/main/java/mage/game/tournament/pairing/SwissPairingSimple.java @@ -67,7 +67,7 @@ public class SwissPairingSimple { }); // create pairings - while (players.size() > 0) { + while (!players.isEmpty()) { TournamentPlayer player1 = players.get(0); players.remove(0); TournamentPlayer playerForPossibleSecondPairing = null; diff --git a/Mage/src/main/java/mage/players/PlayerImpl.java b/Mage/src/main/java/mage/players/PlayerImpl.java index f9bc0cb6aeb..9f972c8c369 100644 --- a/Mage/src/main/java/mage/players/PlayerImpl.java +++ b/Mage/src/main/java/mage/players/PlayerImpl.java @@ -680,7 +680,7 @@ public abstract class PlayerImpl implements Player, Serializable { } if (this.getHand().size() == 1 || this.getHand().size() == amount) { discardedCards.addAll(this.getHand()); - while (this.getHand().size() > 0) { + while (!this.getHand().isEmpty()) { discard(this.getHand().get(this.getHand().iterator().next(), game), source, game); } return discardedCards; @@ -1495,7 +1495,7 @@ public abstract class PlayerImpl implements Player, Serializable { filter.add(Predicates.not(new PermanentIdPredicate(permanent.getId()))); } // while targets left and there is still allowed to untap - while (canRespond() && leftForUntap.size() > 0 && numberToUntap > 0) { + while (canRespond() && !leftForUntap.isEmpty() && numberToUntap > 0) { // player has to select the permanent he wants to untap for this restriction Ability ability = handledEntry.getKey().getValue().iterator().next(); if (ability != null) { @@ -2817,14 +2817,14 @@ public abstract class PlayerImpl implements Player, Serializable { if (ability.isModal()) { addModeOptions(options, ability, game); - } else if (ability.getTargets().getUnchosen().size() > 0) { + } else if (!ability.getTargets().getUnchosen().isEmpty()) { // TODO: Handle other variable costs than mana costs - if (ability.getManaCosts().getVariableCosts().size() > 0) { + if (!ability.getManaCosts().getVariableCosts().isEmpty()) { addVariableXOptions(options, ability, 0, game); } else { addTargetOptions(options, ability, 0, game); } - } else if (ability.getCosts().getTargets().getUnchosen().size() > 0) { + } else if (!ability.getCosts().getTargets().getUnchosen().isEmpty()) { addCostTargetOptions(options, ability, 0, game); } @@ -2838,13 +2838,13 @@ public abstract class PlayerImpl implements Player, Serializable { newOption.getModes().getSelectedModes().clear(); newOption.getModes().getSelectedModes().add(mode.getId()); newOption.getModes().setActiveMode(mode); - if (newOption.getTargets().getUnchosen().size() > 0) { - if (newOption.getManaCosts().getVariableCosts().size() > 0) { + if (!newOption.getTargets().getUnchosen().isEmpty()) { + if (!newOption.getManaCosts().getVariableCosts().isEmpty()) { addVariableXOptions(options, newOption, 0, game); } else { addTargetOptions(options, newOption, 0, game); } - } else if (newOption.getCosts().getTargets().getUnchosen().size() > 0) { + } else if (!newOption.getCosts().getTargets().getUnchosen().isEmpty()) { addCostTargetOptions(options, newOption, 0, game); } else { options.add(newOption); @@ -2871,7 +2871,7 @@ public abstract class PlayerImpl implements Player, Serializable { } if (targetNum < option.getTargets().size() - 2) { addTargetOptions(options, newOption, targetNum + 1, game); - } else if (option.getCosts().getTargets().size() > 0) { + } else if (!option.getCosts().getTargets().isEmpty()) { addCostTargetOptions(options, newOption, 0, game); } else { options.add(newOption); @@ -3115,7 +3115,7 @@ public abstract class PlayerImpl implements Player, Serializable { case GRAVEYARD: fromZone = game.getState().getZone(cards.iterator().next().getId()); successfulMovedCards = moveCardsToGraveyardWithInfo(cards, source, game, fromZone); - return successfulMovedCards.size() > 0; + return !successfulMovedCards.isEmpty(); case BATTLEFIELD: // new logic that does not yet add the permanents to battlefield while replacement effects are handled List infoList = new ArrayList<>(); for (Card card : cards) { @@ -3175,7 +3175,7 @@ public abstract class PlayerImpl implements Player, Serializable { default: throw new UnsupportedOperationException("to Zone" + toZone.toString() + " not supported yet"); } - return successfulMovedCards.size() > 0; + return !successfulMovedCards.isEmpty(); } @Override diff --git a/Mage/src/main/java/mage/target/TargetImpl.java b/Mage/src/main/java/mage/target/TargetImpl.java index 38996f4128f..88c29215aca 100644 --- a/Mage/src/main/java/mage/target/TargetImpl.java +++ b/Mage/src/main/java/mage/target/TargetImpl.java @@ -314,7 +314,7 @@ public abstract class TargetImpl implements Target { chosen = targets.size() >= getNumberOfTargets(); if (isRandom()) { Set possibleTargets = possibleTargets(source.getSourceId(), playerId, game); - if (possibleTargets.size() > 0) { + if (!possibleTargets.isEmpty()) { int i = 0; int rnd = RandomUtil.nextInt(possibleTargets.size()); Iterator it = possibleTargets.iterator(); @@ -370,7 +370,7 @@ public abstract class TargetImpl implements Target { } } - return targets.size() > 0; + return !targets.isEmpty(); } /** @@ -483,7 +483,7 @@ public abstract class TargetImpl implements Target { @Override public UUID getFirstTarget() { - if (targets.size() > 0) { + if (!targets.isEmpty()) { return targets.keySet().iterator().next(); } return null; diff --git a/Mage/src/main/java/mage/target/targetpointer/FirstTargetPointer.java b/Mage/src/main/java/mage/target/targetpointer/FirstTargetPointer.java index d9b1db245e8..01d2b3c7db8 100644 --- a/Mage/src/main/java/mage/target/targetpointer/FirstTargetPointer.java +++ b/Mage/src/main/java/mage/target/targetpointer/FirstTargetPointer.java @@ -30,7 +30,7 @@ public class FirstTargetPointer implements TargetPointer { @Override public void init(Game game, Ability source) { - if (source.getTargets().size() > 0) { + if (!source.getTargets().isEmpty()) { for (UUID target : source.getTargets().get(0).getTargets()) { Card card = game.getCard(target); if (card != null) { @@ -43,7 +43,7 @@ public class FirstTargetPointer implements TargetPointer { @Override public List getTargets(Game game, Ability source) { ArrayList target = new ArrayList<>(); - if (source.getTargets().size() > 0) { + if (!source.getTargets().isEmpty()) { for (UUID targetId : source.getTargets().get(0).getTargets()) { Card card = game.getCard(targetId); if (card != null && zoneChangeCounter.containsKey(targetId) diff --git a/Mage/src/main/java/mage/util/TournamentUtil.java b/Mage/src/main/java/mage/util/TournamentUtil.java index 2448a3277af..ccf6c18673d 100644 --- a/Mage/src/main/java/mage/util/TournamentUtil.java +++ b/Mage/src/main/java/mage/util/TournamentUtil.java @@ -61,7 +61,7 @@ public class TournamentUtil { // if sets have no basic lands and also it has no parent or parent has no lands get last set with lands // select a set with basic lands by random List basicLandSets = ExpansionRepository.instance.getSetsWithBasicLandsByReleaseDate(); - if (basicLandSets.size() > 0) { + if (!basicLandSets.isEmpty()) { landSetCodes.add(basicLandSets.get(RandomUtil.nextInt(basicLandSets.size())).getCode()); } } diff --git a/Mage/src/main/java/mage/util/trace/TraceUtil.java b/Mage/src/main/java/mage/util/trace/TraceUtil.java index b4da8fb9850..ca1df9ea87e 100644 --- a/Mage/src/main/java/mage/util/trace/TraceUtil.java +++ b/Mage/src/main/java/mage/util/trace/TraceUtil.java @@ -66,7 +66,7 @@ public class TraceUtil { } } if (cantBeBlocked(attacker)) { - if (group.getBlockers().size() > 0) { + if (!group.getBlockers().isEmpty()) { Permanent blocker = game.getPermanent(group.getBlockers().get(0)); if (blocker != null) { log.warn("Found creature that can't be blocked by some other creature");