From d63c98cf368e13fd11cb9b8db491c8e68d28ebef Mon Sep 17 00:00:00 2001
From: 0xb00bface <0xboobface@gmail.com>
Date: Sun, 26 Jul 2020 15:14:22 +0200
Subject: [PATCH] Fix NPEs in MFCs ServerConfig

---
 .../src/main/java/ctbrec/sites/mfc/ServerConfig.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/common/src/main/java/ctbrec/sites/mfc/ServerConfig.java b/common/src/main/java/ctbrec/sites/mfc/ServerConfig.java
index 52019d44..469e0488 100644
--- a/common/src/main/java/ctbrec/sites/mfc/ServerConfig.java
+++ b/common/src/main/java/ctbrec/sites/mfc/ServerConfig.java
@@ -7,7 +7,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 
 import org.json.JSONArray;
@@ -75,7 +74,7 @@ public class ServerConfig {
     }
 
     public boolean isOnHtml5VideoServer(SessionState state) {
-        int camserv = Objects.requireNonNull(Objects.requireNonNull(state.getU()).getCamserv());
+        int camserv = getCamServ(state);
         return isOnObsServer(state)
                 || h5Servers.containsKey(Integer.toString(camserv))
                 || (camserv >= 904 && camserv <= 915
@@ -87,12 +86,17 @@ public class ServerConfig {
     }
 
     public boolean isOnWzObsVideoServer(SessionState state) {
-        int camserv = Optional.ofNullable(state).map(SessionState::getU).map(User::getCamserv).orElse(-1);
+        int camserv = getCamServ(state);
         return wzobsServers.containsKey(Integer.toString(camserv));
     }
 
     public boolean isOnNgServer(SessionState state) {
-        int camserv = Objects.requireNonNull(Objects.requireNonNull(state.getU()).getCamserv());
+        int camserv = getCamServ(state);
         return ngVideoServers.containsKey(Integer.toString(camserv));
     }
+
+    private static int getCamServ(SessionState state) {
+        int camserv = Optional.ofNullable(state).map(SessionState::getU).map(User::getCamserv).orElse(-1);
+        return camserv;
+    }
 }