Index: /scripts/usr/local/lib/7dtd/VERSION
===================================================================
--- /scripts/usr/local/lib/7dtd/VERSION	(revision 233)
+++ /scripts/usr/local/lib/7dtd/VERSION	(revision 234)
@@ -1,4 +1,4 @@
-Version: 83
-Release: 2015-04-18
-DediBuild: 593110
+Version: 86
+Release: 2015-05-01
+DediBuild: 605981
 
Index: /scripts/usr/local/lib/7dtd/monitor-log.sh
===================================================================
--- /scripts/usr/local/lib/7dtd/monitor-log.sh	(revision 233)
+++ /scripts/usr/local/lib/7dtd/monitor-log.sh	(revision 234)
@@ -20,19 +20,18 @@
 
 handleConnect() {
-	local clientId="$1"
-	local entityId="$2"
-	local name="$3"
-	local steamId="$4"
-	local ip="$5"
+	local entityId="$1"
+	local name="$2"
+	local steamId="$3"
+	local ip="$4"
 	
 	logPlayerConnect $INSTANCE "$entityId" "$name" "$steamId" "$ip"
 
 	for H in $(getHooksFor playerConnect); do
-		$H $INSTANCE "$clientId" "$entityId" "$name" "$steamId" "$ip"
+		$H $INSTANCE "$entityId" "$name" "$steamId" "$ip"
 	done
 }
 
 handleDisconnect() {
-	local clientId="$1"
+	local playerId="$1"
 	local entityId="$2"
 
@@ -40,5 +39,5 @@
 
 	for H in $(getHooksFor playerDisconnect); do
-		$H $INSTANCE "$clientId" "$entityId" "$NICKNAME" "$STEAMID"
+		$H $INSTANCE "$playerId" "$entityId" "$NICKNAME" "$STEAMID"
 	done
 }
@@ -99,19 +98,19 @@
 while read line ; do
 	if [ -n "$line" ]; then
-		#Player connected, clientid=[0-9]*, entityid=[0-9]*, name=.*, steamid=[0-9]*, ip=[0-9.]*$
+		#Player connected, entityid=1278, name=termo2, steamid=76561197997439820, ip=178.203.27.140 
+		#Player connected, entityid=[0-9]*, name=.*, steamid=[0-9]*, ip=[0-9.]*$ 
 		if [ -n "$(echo "$line" | grep '^Player connected,')" ]; then
-			clientId=$(expr "$line" : 'Player connected, clientid=\([0-9]*\), entityid=[0-9]*, name=.*, steamid=[0-9]*, ip=[0-9.]*$')
-			entityId=$(expr "$line" : 'Player connected, clientid=[0-9]*, entityid=\([0-9]*\), name=.*, steamid=[0-9]*, ip=[0-9.]*$')
-			playerName=$(expr "$line" : 'Player connected, clientid=[0-9]*, entityid=[0-9]*, name=\(.*\), steamid=[0-9]*, ip=[0-9.]*$')
-			steamId=$(expr "$line" : 'Player connected, clientid=[0-9]*, entityid=[0-9]*, name=.*, steamid=\([0-9]*\), ip=[0-9.]*$')
-			ip=$(expr "$line" : 'Player connected, clientid=[0-9]*, entityid=[0-9]*, name=.*, steamid=[0-9]*, ip=\([0-9.]*\)$')
+			entityId=$(expr "$line" : 'Player connected, entityid=\([0-9]*\), name=.*, steamid=[0-9]*, ip=[0-9.]*$')
+			playerName=$(expr "$line" : 'Player connected, entityid=[0-9]*, name=\(.*\), steamid=[0-9]*, ip=[0-9.]*$')
+			steamId=$(expr "$line" : 'Player connected, entityid=[0-9]*, name=.*, steamid=\([0-9]*\), ip=[0-9.]*$')
+			ip=$(expr "$line" : 'Player connected, entityid=[0-9]*, name=.*, steamid=[0-9]*, ip=\([0-9.]*\)$')
 			sleep 1
-			handleConnect "$clientId" "$entityId" "$playerName" "$steamId" "$ip"
-			unset clientId entityId playerName steamId ip
+			handleConnect "$entityId" "$playerName" "$steamId" "$ip"
+			unset entityId playerName steamId ip
 		else
-		#Removing player with id clientId=[0-9]*, entityId=[0-9]*$
-		if [ -n "$(echo "$line" | grep '^Removing player with id ')" ]; then
-			playerId=$(expr "$line" : 'Removing player with id clientId=\([0-9]*\), entityId=[0-9]*$')
-			entityId=$(expr "$line" : 'Removing player with id clientId=[0-9]*, entityId=\([0-9]*\)$')
+		#Player disconnected: EntityID=[0-9]*, PlayerID='[0-9]*', OwnerID='[0-9]*', PlayerName='.*'$ 
+		if [ -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
@@ -123,15 +122,15 @@
 			unset msg
 		else
-		#Executed command ".*" from player ".*"$
-		if [ -n "$(echo "$line" | grep '^Executed command ')" ]; then
-			cmd=$(expr "$line" : 'Executed command "\(.*\)" from player ".*"$')
-			nick=$(expr "$line" : 'Executed command ".*" from player "\(.*\)"$')
+		#Executing command ".*" from client ".*"$ 
+		if [ -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
-		#Telnet executed ".*" from: .*$
-		if [ -n "$(echo "$line" | grep '^Telnet executed ')" ]; then
-			cmd=$(expr "$line" : 'Telnet executed "\(.*\)" from: .*$')
-			ip=$(expr "$line" : 'Telnet executed ".*" from: \(.*\)$')
+		#Executing command ".*" by Telnet from .*$ 
+		if [ -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 \(.*\)$") 
 			handleTelnetCommand "$cmd" "$ip"
 			unset cmd ip