Merge pull request #324 from Team-Silver-Sphere/322-fix

Adds Support for #322

README.md

@@ -210,7 +210,7 @@ Interested in creating your own plugin? [See more here](./squad-server/plugins/r
            <h6>Description</h6>
            <p>Message SquadJS will send to players warning them they will be kicked</p>
            <h6>Default</h6>
-           <pre><code>Join a squad, you are are unassigned and will be kicked</code></pre></li>
+           <pre><code>Join a squad, you are unassigned and will be kicked</code></pre></li>
 <li><h4>kickMessage</h4>
            <h6>Description</h6>
            <p>Message to send to players when they are kicked</p>

config.json

@@ -43,7 +43,7 @@
     {
       "plugin": "AutoKickUnassigned",
       "enabled": true,
-      "warningMessage": "Join a squad, you are are unassigned and will be kicked",
+      "warningMessage": "Join a squad, you are unassigned and will be kicked",
       "kickMessage": "Unassigned - automatically removed",
       "frequencyOfWarnings": 30,
       "unassignedTimer": 360,

squad-server/log-parser/player-disconnected.js

@@ -1,16 +1,16 @@
 export default {
   regex:
     /^\[([0-9.:-]+)]\[([ 0-9]*)]LogNet: UChannel::Close: Sending CloseBunch\. ChIndex == [0-9]+\. Name: \[UChannel\] ChIndex: [0-9]+, Closing: [0-9]+ \[UNetConnection\] RemoteAddr: ([0-9]{17}):[0-9]+, Name: SteamNetConnection_[0-9]+, Driver: GameNetDriver SteamNetDriver_[0-9]+, IsServer: YES, PC: ([^ ]+PlayerController_C_[0-9]+), Owner: [^ ]+PlayerController_C_[0-9]+/,
-    onMatch: (args, logParser) => {
-      const data = {
-        raw: args[0],
-        time: args[1],
-        chainID: args[2],
-        steamID: args[3],
-        playerController: args[4]
-      };
+  onMatch: (args, logParser) => {
+    const data = {
+      raw: args[0],
+      time: args[1],
+      chainID: args[2],
+      steamID: args[3],
+      playerController: args[4]
+    };
 
-      logParser.eventStore.disconnected[data.steamID] = true;
-      logParser.emit('PLAYER_DISCONNECTED', data);
-    }
+    logParser.eventStore.disconnected[data.steamID] = true;
+    logParser.emit('PLAYER_DISCONNECTED', data);
+  }
 };

squad-server/rcon.js

@@ -139,8 +139,8 @@ export default class SquadRcon extends Rcon {
 
     const players = [];
 
-    if(!response || response.length < 1) return players;
-    
+    if (!response || response.length < 1) return players;
+
     for (const line of response.split('\n')) {
       const match = line.match(
         /ID: ([0-9]+) \| SteamID: ([0-9]{17}) \| Name: (.+) \| Team ID: ([0-9]+) \| Squad ID: ([0-9]+|N\/A) \| Is Leader: (True|False) \| Role: ([A-Za-z0-9_]*)\b/
@@ -168,7 +168,7 @@ export default class SquadRcon extends Rcon {
     let teamName;
     let teamID;
 
-    if(!responseSquad || responseSquad.length < 1) return squads;
+    if (!responseSquad || responseSquad.length < 1) return squads;
 
     for (const line of responseSquad.split('\n')) {
       const match = line.match(