Changeset 308 for scripts/usr/local/lib/7dtd/monitor-log.sh

Timestamp:

Aug 7, 2017, 7:18:35 AM (7 years ago)

Author:

alloc

Message:

Scripts 109

File:

• scripts/usr/local/lib/7dtd/monitor-log.sh (modified) (3 diffs)

scripts/usr/local/lib/7dtd/monitor-log.sh

@@ -56 +56 @@
         for H in $(getHooksFor playerDisconnect $INSTANCE); do
                 $H $INSTANCE "$playerId" "$entityId" "$NICKNAME" "$STEAMID"
+        done
+}
+
+handlePlayerSpawnedInWorld() {
+        local entityId="$1"
+        local playerId="$2"
+        local ownerId="$3"
+        local playerName="$4"
+        local reason="$5"
+        local position="$6"
+        
+        for H in $(getHooksFor playerSpawned $INSTANCE); do
+                $H $INSTANCE "$entityId" "$playerId" "$ownerId" "$playerName" "$reason" "$position"
         done
 }
@@ -133 +146 @@
                         handleConnect "$entityId" "$playerName" "$steamId" "$ip" "$steamOwner"
                         unset entityId playerName steamId steamOwner ip
-                else
                 #Player disconnected: EntityID=[0-9]*, PlayerID='[0-9]*', OwnerID='[0-9]*', PlayerName='.*'$ 
-                if [ -n "$(echo "$line" | grep '^Player disconnected: ')" ]; then 
+                elif [ -n "$(echo "$line" | grep '^Player disconnected: ')" ]; then 
                         playerId=$(expr "$line" : "Player disconnected: EntityID=[0-9]*, PlayerID='\([0-9]*\)', OwnerID='[0-9]*', PlayerName='.*'$") 
                         entityId=$(expr "$line" : "Player disconnected: EntityID=\([0-9]*\), PlayerID='[0-9]*', OwnerID='[0-9]*', PlayerName='.*'$") 
                         handleDisconnect "$playerId" "$entityId"
                         unset playerId entityId
-                else
+                #PlayerSpawnedInWorld (reason: .+, position: [0-9]+, [0-9]+, [0-9]+): EntityID=[0-9]+, PlayerID='[0-9]+', OwnerID='[0-9]+', PlayerName='.*'
+                elif [ -n "$(echo "$line" | grep '^PlayerSpawnedInWorld ')" ]; then
+                        reason=$(expr "$line" : "PlayerSpawnedInWorld (reason: \(.+\), position: [0-9]+, [0-9]+, [0-9]+): EntityID=[0-9]+, PlayerID='[0-9]+', OwnerID='[0-9]+', PlayerName='.*'$") 
+                        position=$(expr "$line" : "PlayerSpawnedInWorld (reason: .+, position: \([0-9]+, [0-9]+, [0-9]+\)): EntityID=[0-9]+, PlayerID='[0-9]+', OwnerID='[0-9]+', PlayerName='.*'$") 
+                        entityId=$(expr "$line" : "PlayerSpawnedInWorld (reason: .+, position: [0-9]+, [0-9]+, [0-9]+): EntityID=\([0-9]+\), PlayerID='[0-9]+', OwnerID='[0-9]+', PlayerName='.*'$") 
+                        playerId=$(expr "$line" : "PlayerSpawnedInWorld (reason: .+, position: [0-9]+, [0-9]+, [0-9]+): EntityID=[0-9]+, PlayerID='\([0-9]+\)', OwnerID='[0-9]+', PlayerName='.*'$") 
+                        ownerId=$(expr "$line" : "PlayerSpawnedInWorld (reason: .+, position: [0-9]+, [0-9]+, [0-9]+): EntityID=[0-9]+, PlayerID='[0-9]+', OwnerID='\([0-9]+\)', PlayerName='.*'$") 
+                        playerName=$(expr "$line" : "PlayerSpawnedInWorld (reason: .+, position: [0-9]+, [0-9]+, [0-9]+): EntityID=[0-9]+, PlayerID='[0-9]+', OwnerID='[0-9]+', PlayerName='\(.*\)'$") 
+                        handlePlayerSpawnedInWorld "$entityId" "$playerId" "$ownerId" "$playerName" "$reason" "$position"
+                        unset reason position entityId playerId ownerId playerName
                 #GMSG: .*$
-                if [ -n "$(echo "$line" | grep -E '^GMSG: .+')" ]; then
+                elif [ -n "$(echo "$line" | grep -E '^GMSG: .+')" ]; then
                         msg=$(expr "$line" : 'GMSG: \(.*\)$')
                         handleGmsg "$msg"
                         unset msg
-                else
                 #Chat: 'name': .*$
-                if [ -n "$(echo "$line" | grep -E '^Chat: .+')" ]; then
+                elif [ -n "$(echo "$line" | grep -E '^Chat: .+')" ]; then
                         name=$(expr "$line" : "Chat: '\(.*\)': .*$")
                         msg=$(expr "$line" : "Chat: '.*': \(.*\)$")
                         handleChat "$name" "$msg"
                         unset name msg
-                else
                 #Executing command ".*" from client ".*"$ 
-                if [ -n "$(echo "$line" | grep '^Executing command '.*' from client')" ]; then 
+                elif [ -n "$(echo "$line" | grep '^Executing command '.*' from client')" ]; then 
                         cmd=$(expr "$line" : "Executing command '\(.*\)' from client .*$") 
                         nick=$(expr "$line" : "Executing command '.*' from client \(.*\)$") 
                         handleRemoteCommand "$cmd" "$nick"
                         unset cmd nick
-                else
                 #Executing command ".*" by Telnet from .*$ 
-                if [ -n "$(echo "$line" | grep '^Executing command '.*' by Telnet from ')" ]; then 
+                elif [ -n "$(echo "$line" | grep '^Executing command '.*' by Telnet from ')" ]; then 
                         cmd=$(expr "$line" : "Executing command '\(.*\)' by Telnet from .*$") 
                         ip=$(expr "$line" : "Executing command '.*' by Telnet from \(.*\)$") 
@@ -168 +186 @@
                         unset cmd ip
                 fi
-                fi
-                fi
-                fi
-                fi
-                fi
         fi
 done