From b64a75aa4bb4e222c9d4b6c57aebf75148255052 Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Thu, 6 Jun 2019 16:55:17 +0400 Subject: [PATCH] Typo fix --- .../src/main/java/mage/player/ai/ComputerPlayer.java | 6 +++--- .../src/mage/player/human/HumanPlayer.java | 6 +++--- .../src/test/java/org/mage/test/player/TestPlayer.java | 4 ++-- Mage.Tests/src/test/java/org/mage/test/stub/PlayerStub.java | 2 +- Mage/src/main/java/mage/players/Player.java | 2 +- Mage/src/main/java/mage/players/StubPlayer.java | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) 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 6afcdc257a2..44acf69fdb8 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 @@ -1502,11 +1502,11 @@ public class ComputerPlayer extends PlayerImpl implements Player { } @Override - public int announceXMana(int min, int max, int multilier, String message, Game game, Ability ability) { + public int announceXMana(int min, int max, int multiplier, String message, Game game, Ability ability) { log.debug("announceXMana"); //TODO: improve this - int xMin = min * multilier; - int xMax = (max == Integer.MAX_VALUE ? max : max * multilier); + int xMin = min * multiplier; + int xMax = (max == Integer.MAX_VALUE ? max : max * multiplier); int numAvailable = getAvailableManaProducers(game).size() - ability.getManaCosts().convertedManaCost(); if (numAvailable < 0) { numAvailable = 0; 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 593c8a4fca6..7a30469ed1f 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 @@ -1128,12 +1128,12 @@ public class HumanPlayer extends PlayerImpl { /** * Gets the amount of mana the player want to spent for a x spell * - * @param multilier - X multiplier after replace events + * @param multiplier - X multiplier after replace events */ @Override - public int announceXMana(int min, int max, int multilier, String message, Game game, Ability ability) { + public int announceXMana(int min, int max, int multiplier, String message, Game game, Ability ability) { int xValue = 0; - String extraMessage = (multilier == 1 ? "" : ", X will be increased by " + multilier + " times"); + String extraMessage = (multiplier == 1 ? "" : ", X will be increased by " + multiplier + " times"); updateGameStatePriority("announceXMana", game); do { prepareForResponse(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 96cbc4cf9e4..b11671fa0b8 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 @@ -1994,7 +1994,7 @@ public class TestPlayer implements Player { } @Override - public int announceXMana(int min, int max, int multilier, String message, Game game, Ability ability) { + public int announceXMana(int min, int max, int multiplier, String message, Game game, Ability ability) { if (!choices.isEmpty()) { for (String choice : choices) { if (choice.startsWith("X=")) { @@ -2006,7 +2006,7 @@ public class TestPlayer implements Player { } this.chooseStrictModeFailed(game, getInfo(ability) + "; " + message); - return computerPlayer.announceXMana(min, max, multilier, message, game, ability); + return computerPlayer.announceXMana(min, max, multiplier, message, game, ability); } @Override diff --git a/Mage.Tests/src/test/java/org/mage/test/stub/PlayerStub.java b/Mage.Tests/src/test/java/org/mage/test/stub/PlayerStub.java index a14084d8379..8649ddeba93 100644 --- a/Mage.Tests/src/test/java/org/mage/test/stub/PlayerStub.java +++ b/Mage.Tests/src/test/java/org/mage/test/stub/PlayerStub.java @@ -912,7 +912,7 @@ public class PlayerStub implements Player { } @Override - public int announceXMana(int min, int max, int multilier, String message, Game game, Ability ability) { + public int announceXMana(int min, int max, int multiplier, String message, Game game, Ability ability) { return min; } diff --git a/Mage/src/main/java/mage/players/Player.java b/Mage/src/main/java/mage/players/Player.java index 85fad9738d5..9f52e0cf0ad 100644 --- a/Mage/src/main/java/mage/players/Player.java +++ b/Mage/src/main/java/mage/players/Player.java @@ -568,7 +568,7 @@ public interface Player extends MageItem, Copyable { return announceXMana(min, max, 1, message, game, ability); } - int announceXMana(int min, int max, int multilier, String message, Game game, Ability ability); + int announceXMana(int min, int max, int multiplier, String message, Game game, Ability ability); // set the value for non mana X costs int announceXCost(int min, int max, String message, Game game, Ability ability, VariableCost variableCost); diff --git a/Mage/src/main/java/mage/players/StubPlayer.java b/Mage/src/main/java/mage/players/StubPlayer.java index d453d04e444..095cfa5c833 100644 --- a/Mage/src/main/java/mage/players/StubPlayer.java +++ b/Mage/src/main/java/mage/players/StubPlayer.java @@ -149,7 +149,7 @@ public class StubPlayer extends PlayerImpl implements Player { } @Override - public int announceXMana(int min, int max, int multilier, String message, Game game, Ability ability) { + public int announceXMana(int min, int max, int multiplier, String message, Game game, Ability ability) { return 0; }