Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

list.size > 0 changed to !list.isEmpty

Browse source 
We care about if it's empty or not, not about it's size
This commit is contained in:
vraskulin 2017-01-27 16:04:56 +03:00
parent 0de8bd2f70
commit fc54c0156c
366 changed files with 532 additions and 548 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage.Server/src/main/java/mage/server/game/GameController.java
View file

@ -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<UUID> 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) {

3
Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java
View file

@ -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<String, SimpleCardsView> handCards = new HashMap<>();
for (UUID controlledPlayerId : player.getPlayersUnderYourControl()) {
Player opponent = game.getPlayer(controlledPlayerId);