From 1dccb62d107541aed903d03f267eb9bc16af11d0 Mon Sep 17 00:00:00 2001 From: Bruno Chevalier Date: Mon, 31 Aug 2020 10:51:24 +0200 Subject: [PATCH 1/5] Rename BasicSaheekiSublimeArtificerTest.java to BasicSaheeliSublimeArtificerTest.java --- ...ava => BasicSaheeliSublimeArtificerTest.java} | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) rename Mage.Tests/src/test/java/org/mage/test/oathbreaker/FFA3/{BasicSaheekiSublimeArtificerTest.java => BasicSaheeliSublimeArtificerTest.java} (92%) diff --git a/Mage.Tests/src/test/java/org/mage/test/oathbreaker/FFA3/BasicSaheekiSublimeArtificerTest.java b/Mage.Tests/src/test/java/org/mage/test/oathbreaker/FFA3/BasicSaheeliSublimeArtificerTest.java similarity index 92% rename from Mage.Tests/src/test/java/org/mage/test/oathbreaker/FFA3/BasicSaheekiSublimeArtificerTest.java rename to Mage.Tests/src/test/java/org/mage/test/oathbreaker/FFA3/BasicSaheeliSublimeArtificerTest.java index da1dae2834..38d1577020 100644 --- a/Mage.Tests/src/test/java/org/mage/test/oathbreaker/FFA3/BasicSaheekiSublimeArtificerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/oathbreaker/FFA3/BasicSaheeliSublimeArtificerTest.java @@ -15,7 +15,7 @@ import org.mage.test.serverside.base.CardTestOathbreaker3PlayersFFA; * @author LevelX2 */ -public class BasicSaheekiSublimeArtificerTest extends CardTestOathbreaker3PlayersFFA { +public class BasicSaheeliSublimeArtificerTest extends CardTestOathbreaker3PlayersFFA { /** * Check that if a player left the game, it's commander is also removed @@ -35,7 +35,7 @@ public class BasicSaheekiSublimeArtificerTest extends CardTestOathbreaker3Player assertCommandZoneCount(playerA, "Thoughtcast", 0); } - + @Test public void castCommanderTest() { @@ -44,18 +44,18 @@ public class BasicSaheekiSublimeArtificerTest extends CardTestOathbreaker3Player // Planeswalker 5 Loyality Counter // Whenever you cast a noncreature spell, create a 1/1 colorless Servo artifact creature token. - // -2: Target artifact you control becomes a copy of another target artifact or creature you control until end of turn, - // except it's an artifact in addition to its other types. + // -2: Target artifact you control becomes a copy of another target artifact or creature you control until end of turn, + // except it's an artifact in addition to its other types. castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Saheeli, Sublime Artificer"); // Planeswalker 5 {1}{U/R}{U/R} // Affinity for artifacts - // Draw two cards. + // Draw two cards. castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Thoughtcast"); // Sorcery {4}{U} - + setStopAt(1, PhaseStep.DECLARE_ATTACKERS); execute(); - + assertCommandZoneCount(playerB, "Saheeli, Sublime Artificer", 1); assertCommandZoneCount(playerB, "Thoughtcast", 1); assertCommandZoneCount(playerC, "Saheeli, Sublime Artificer", 1); @@ -66,4 +66,4 @@ public class BasicSaheekiSublimeArtificerTest extends CardTestOathbreaker3Player assertCommandZoneCount(playerA, "Thoughtcast", 1); } -} \ No newline at end of file +} From 9b89eecab511d83bb963692bee3aaa9e4193454d Mon Sep 17 00:00:00 2001 From: Bruno Chevalier Date: Mon, 31 Aug 2020 13:50:23 +0200 Subject: [PATCH 2/5] S3Uploader.java: Remove redundant null check --- Mage.Client/src/main/java/mage/client/remote/S3Uploader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage.Client/src/main/java/mage/client/remote/S3Uploader.java b/Mage.Client/src/main/java/mage/client/remote/S3Uploader.java index 95be10c267..85968f6ea0 100644 --- a/Mage.Client/src/main/java/mage/client/remote/S3Uploader.java +++ b/Mage.Client/src/main/java/mage/client/remote/S3Uploader.java @@ -21,7 +21,7 @@ public class S3Uploader { if (accessKeyId == null || accessKeyId.isEmpty() || secretKeyId == null || secretKeyId.isEmpty() - || existingBucketName == null || existingBucketName.isEmpty()) { + || existingBucketName.isEmpty()) { logger.info("Aborting json log sync."); return false; } From 21c80a3caad6af202b60fbdd73742099f6254b9d Mon Sep 17 00:00:00 2001 From: Bruno Chevalier Date: Mon, 31 Aug 2020 13:54:09 +0200 Subject: [PATCH 3/5] Effects.java: remove redundant check. When in the else part, the lastRule already is guaranteed to not end on a dot --- Mage/src/main/java/mage/abilities/effects/Effects.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage/src/main/java/mage/abilities/effects/Effects.java b/Mage/src/main/java/mage/abilities/effects/Effects.java index dce5556d72..d93b1c21c5 100644 --- a/Mage/src/main/java/mage/abilities/effects/Effects.java +++ b/Mage/src/main/java/mage/abilities/effects/Effects.java @@ -72,7 +72,7 @@ public class Effects extends ArrayList { || lastRule.endsWith(".")) { endString = " "; // if lastRule does not have appropriate punctuation, add the default ". " - } else if (!lastRule.endsWith(".") && !lastRule.endsWith("
")) { + } else if (!lastRule.endsWith("
")) { endString = ". "; } if (nextRule.length() > 3) { From 672b78982f2235a199c6eb8508565c587453b81d Mon Sep 17 00:00:00 2001 From: Bruno Chevalier Date: Mon, 31 Aug 2020 14:14:25 +0200 Subject: [PATCH 4/5] TableController.java: change warning message when match == null to avoid nullpointer exception --- Mage.Server/src/main/java/mage/server/TableController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage.Server/src/main/java/mage/server/TableController.java b/Mage.Server/src/main/java/mage/server/TableController.java index 5f42a4c927..12275b72ae 100644 --- a/Mage.Server/src/main/java/mage/server/TableController.java +++ b/Mage.Server/src/main/java/mage/server/TableController.java @@ -971,7 +971,7 @@ public class TableController { if (!(table.getState() == TableState.WAITING || table.getState() == TableState.STARTING || table.getState() == TableState.READY_TO_START)) { if (match == null) { logger.warn("- Match table with no match:"); - logger.warn("-- matchId:" + match.getId() + " , table : " + table.getId()); + logger.warn("-- match: null , table : " + table.getId()); // return false; } else if (match.isDoneSideboarding() && match.getGame() == null) { // no sideboarding and not active game -> match seems to hang (maybe the Draw bug) From 0bfafff47ad7fdf6e98daa57678b5258aabe1282 Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Wed, 9 Sep 2020 01:03:08 +0400 Subject: [PATCH 5/5] Reverted already fixed line from, see #7021 --- Mage/src/main/java/mage/abilities/effects/Effects.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage/src/main/java/mage/abilities/effects/Effects.java b/Mage/src/main/java/mage/abilities/effects/Effects.java index d93b1c21c5..dce5556d72 100644 --- a/Mage/src/main/java/mage/abilities/effects/Effects.java +++ b/Mage/src/main/java/mage/abilities/effects/Effects.java @@ -72,7 +72,7 @@ public class Effects extends ArrayList { || lastRule.endsWith(".")) { endString = " "; // if lastRule does not have appropriate punctuation, add the default ". " - } else if (!lastRule.endsWith("
")) { + } else if (!lastRule.endsWith(".") && !lastRule.endsWith("
")) { endString = ". "; } if (nextRule.length() > 3) {