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

Try/finally refactored to try with resources

Browse source
This commit is contained in:
vraskulin 2017-01-26 20:58:40 +03:00
parent d8c4e60138
commit 31589778ca
7 changed files with 61 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Mage.Server/src/main/java/mage/server/util/SystemUtil.java
View file

@ -56,7 +56,7 @@ public class SystemUtil {
try (Scanner scanner = new Scanner(f)) {
while (scanner.hasNextLine()) {
String line = scanner.nextLine().trim();
if (line.trim().isEmpty() || line.startsWith("#")) {
if (line.isEmpty() || line.startsWith("#")) {
continue;
}
@ -69,11 +69,12 @@ public class SystemUtil {
String zone = m.group(1);
String nickname = m.group(2);
Player player = findPlayer(game, nickname);
if (player == null) {
Optional<Player> playerOptional = findPlayer(game, nickname);
if (!playerOptional.isPresent()) {
logger.warn("Was skipped: " + line);
continue;
}
Player player = playerOptional.get();
Zone gameZone;
if ("hand".equalsIgnoreCase(zone)) {
@ -148,13 +149,13 @@ public class SystemUtil {
* @param name
* @return
*/
private static Player findPlayer(Game game, String name) {
private static Optional<Player> findPlayer(Game game, String name) {
for (Player player : game.getPlayers().values()) {
if (player.getName().equals(name)) {
return player;
return Optional.of(player);
}
}
return null;
return Optional.empty();
}
public static String sanitize(String input) {