1

server/imserver_new/player/playermgr.go

@@ -233,26 +233,27 @@ func (this *playerMgr) GetPlayerByAccountId(accountId string) common.Player {
 	}
 }
 
+func (this *playerMgr) GetPlayerBySocket(socket f5.WspCliConn) common.Player {
+	hum := this.internalGetPlayerBySocket(socket)
+	if hum != nil {
+		return hum
+	} else {
+		return nil
+	}
+}
+
 func (this *playerMgr) internalGetPlayerByAccountId(accountId string) *player {
-	player, ok := this.accountIdHash[accountId]
+	hum, ok := this.accountIdHash[accountId]
 	if ok {
-		return player
+		return hum
 	}
 	return nil
 }
 
 func (this *playerMgr) internalGetPlayerBySocket(socket f5.WspCliConn) *player {
-	player, ok := this.socketHash[socket]
+	hum, ok := this.socketHash[socket]
 	if ok {
-		return player
-	}
-	return nil
-}
-
-func (this *playerMgr) getPlayerBySocket(socket f5.WspCliConn) *player {
-	player, ok := this.socketHash[socket]
-	if ok {
-		return player
+		return hum
 	}
 	return nil
 }