Changeset 482 for scripts/usr/local/lib/7dtd/playerlog.sh

Timestamp:

Nov 14, 2023, 5:44:17 PM (12 months ago)

Author:

alloc

Message:

Scripts

File:

• scripts/usr/local/lib/7dtd/playerlog.sh (modified) (3 diffs)

scripts/usr/local/lib/7dtd/playerlog.sh

@@ -54 +54 @@
         local ENTITYID="$2"
         local NICKNAME="$3"
-        local STEAMID="$4"
-        local IP="$5"
-        local OWNERID="$6"
+        local PLATFORMID="$4"
+        local CROSSID="$5"
+        local IP="$6"
+        local OWNERID="$7"
 
-        echo "$(timestamp) +++ $ENTITYID $NICKNAME $STEAMID $IP $OWNERID" >> "$PLAYERSLOG"
+        echo "$(timestamp) +++ $ENTITYID $NICKNAME $PLATFORMID $CROSSID $IP $OWNERID" >> "$PLAYERSLOG"
 
         createPlayerList
         
-        XPATHBASE="/Players/Player[@steamid='$STEAMID']"
+        XPATHBASE="/Players/Player[@platformid='$PLATFORMID']"
 
-        if [ -z $($XMLSTARLET sel -t -v "$XPATHBASE/@steamid" "$PLAYERSXML") ]; then
+        if [ -z $($XMLSTARLET sel -t -v "$XPATHBASE/@platformid" "$PLAYERSXML") ]; then
                 $XMLSTARLET ed -L \
                         -s "/Players" -t elem -n "Player" -v "" \
-                        -i "/Players/Player[not(@steamid)]" -t attr -n "steamid" -v "$STEAMID" \
+                        -i "/Players/Player[not(@platformid)]" -t attr -n "platformid" -v "$PLATFORMID" \
+                        -i "$XPATHBASE" -t attr -n "crossid" -v "$CROSSID" \
                         -i "$XPATHBASE" -t attr -n "nick" -v "$NICKNAME" \
                         -i "$XPATHBASE" -t attr -n "playtime" -v "0" \
@@ -104 +106 @@
 
         if [ -f $PLAYERSXML ]; then
-                if [ ! -z $($XMLSTARLET sel -t -v "$XPATHBASE/@steamid" "$PLAYERSXML") ]; then
+                if [ ! -z $($XMLSTARLET sel -t -v "$XPATHBASE/@platformid" "$PLAYERSXML") ]; then
                         NICKNAME=$($XMLSTARLET sel -t -v "$XPATHBASE/@nick" "$PLAYERSXML")
-                        STEAMID=$($XMLSTARLET sel -t -v "$XPATHBASE/@steamid" "$PLAYERSXML")
+                        PLATFORMID=$($XMLSTARLET sel -t -v "$XPATHBASE/@platformid" "$PLAYERSXML")
+                        CROSSID=$($XMLSTARLET sel -t -v "$XPATHBASE/@crossid" "$PLAYERSXML")
+                        IP=$($XMLSTARLET sel -t -v "$XPATHBASE/@lastIp" "$PLAYERSXML")
+                        OWNERID=$($XMLSTARLET sel -t -v "$XPATHBASE/@steamOwner" "$PLAYERSXML")
                         LOGINTIME=$($XMLSTARLET sel -t -v "$XPATHBASE/@lastlogin" "$PLAYERSXML")
                         PLAYTIME=$($XMLSTARLET sel -t -v "$XPATHBASE/@playtime" "$PLAYERSXML")
@@ -118 +123 @@
         fi
 
-        echo "$(timestamp) --- $ENTITYID $NICKNAME $STEAMID" >> "$PLAYERSLOG"
+        echo "$(timestamp) --- $ENTITYID $NICKNAME $PLATFORMID $CROSSID" >> "$PLAYERSLOG"
 }