Merge branch 'master' into add-minimum-rating-option

2018-09-29 19:15:46 -07:00 · 2018-09-29 19:15:46 -07:00 · 5cd57199c7
commit 5cd57199c7
parent 81c2a62250 acfcb19c7b
348 changed files with 1560 additions and 1096 deletions
--- a/Mage.Server/src/main/java/mage/server/MageServerImpl.java
+++ b/Mage.Server/src/main/java/mage/server/MageServerImpl.java
@ -686,7 +686,7 @@ public class MageServerImpl implements MageServer {
        } catch (Exception ex) {
            handleException(ex);
        }
-        return null;
+        return Optional.empty();
    }

    @Override