From 7b1df65e6486a13dfdbef75f0c40b12af2d6c949 Mon Sep 17 00:00:00 2001
From: MrZ_26 <1046101471@qq.com>
Date: Mon, 24 Oct 2022 19:15:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=94=A8=E6=88=B7=E5=90=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9B=B8=E5=85=B3=EF=BC=8C=E5=8F=AA=E6=9C=89?=
 =?UTF-8?q?=E6=92=AD=E6=94=BE=E5=BD=95=E5=83=8F=E6=89=8D=E4=BC=9A=E5=BC=BA?=
 =?UTF-8?q?=E5=88=B6=E7=94=A8=E6=88=B7=E5=90=8D=EF=BC=8C=E5=90=A6=E5=88=99?=
 =?UTF-8?q?=E9=83=BD=E7=94=A8uid=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/modes/blind_wtf.lua | 2 +-
 parts/net.lua             | 2 +-
 parts/player/draw.lua     | 2 +-
 parts/player/init.lua     | 5 +----
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/parts/modes/blind_wtf.lua b/parts/modes/blind_wtf.lua
index f9c4e531..df6d3533 100644
--- a/parts/modes/blind_wtf.lua
+++ b/parts/modes/blind_wtf.lua
@@ -33,7 +33,7 @@ return{
                     GC.rectangle('line',488,20,100,80,5)
                     GC.draw(border,-17+150,-12)
                     setFont(30)
-                    GC.mStr(P.username,300,-60)
+                    GC.mStr(P.username or USERS.getUsername(P.uid),300,-60)
                 end
                 GC.pop()
             end
diff --git a/parts/net.lua b/parts/net.lua
index 4dd63d4c..e33b05bb 100644
--- a/parts/net.lua
+++ b/parts/net.lua
@@ -452,7 +452,7 @@ local function _pumpStream(d)
             if res then
                 DATA.pumpRecording(stream,P.stream)
             else
-                MES.new('error',"Bad stream from "..P.username.."#"..P.uid,.1)
+                MES.new('error',"Bad stream from "..USERS.getUsername(P.uid).."#"..P.uid,.1)
             end
             return
         end
diff --git a/parts/player/draw.lua b/parts/player/draw.lua
index ea5d4199..97454b1c 100644
--- a/parts/player/draw.lua
+++ b/parts/player/draw.lua
@@ -722,7 +722,7 @@ function draw.norm(P,repMode)
         -- Draw username
         setFont(30)
         gc_setColor(.97,.97,.97)
-        GC.mStr(P.username,300,-60)
+        GC.mStr(P.username or USERS.getUsername(P.uid),300,-60)
 
         -- Draw HUD
         if ENV.nextCount>0 then _drawNext(P,repMode) end
diff --git a/parts/player/init.lua b/parts/player/init.lua
index 1e2cee4a..5f8d491f 100644
--- a/parts/player/init.lua
+++ b/parts/player/init.lua
@@ -119,7 +119,6 @@ local function _newEmptyPlayer(id,mini)
     P.atker,P.atking,P.lastRecv={}
 
     -- User-related
-    P.username=""
     P.uid=false
     P.sid=false
 
@@ -209,7 +208,7 @@ local function _loadRemoteEnv(P,confStr)-- Load gameEnv
     confStr=JSON.decode(confStr)
     if not confStr then
         confStr={}
-        MES.new('warn',"Bad conf from "..P.username.."#"..P.uid)
+        MES.new('warn',"Bad conf from "..USERS.getUsername(P.uid).."#"..P.uid)
     end
 
     P.gameEnv={}-- Current game setting environment
@@ -407,7 +406,6 @@ function PLY.newRemotePlayer(id,mini,p)
     P:startStreaming()
 
     P.uid=p.uid
-    P.username=USERS.getUsername(p.uid)
     P.sid=NET.uid_sid[p.uid]
 
     _loadRemoteEnv(P,p.config)
@@ -429,7 +427,6 @@ function PLY.newPlayer(id,mini)
     P.type='human'
     P.sound=true
 
-    P.username=USERS.getUsername(USER.uid)
     P.uid=USER.uid
     P.sid=NET.uid_sid[USER.uid]