alois/OpenFrontIO
1
0
Fork 0
mirror of https://github.com/openfrontio/OpenFrontIO.git synced 2026-06-26 18:14:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

* resolve conflict

Browse Source
This commit is contained in:
Mittani
2024-12-25 19:34:04 +01:00
committed by evanpelle
parent 697b4c6111
commit 0cce2b3b57
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/Server.ts
+13 -13
View File
@@ -135,18 +135,18 @@ wss.on('connection', (ws, req) => {
? forwarded[0] // Get the first IP if it's an array
: forwarded || req.socket.remoteAddress;
const username = clientMsg.username;
const { isValid, error } = validateUsername(username);
if (!isValid) {
const errorMsg = error || "Invalid username.";
// Send error back to the client
ws.send(JSON.stringify({
type: 'error',
input: 'username-input',
message: errorMsg,
}));
return;
}
const username = clientMsg.username;
const { isValid, error } = validateUsername(username);
if (!isValid) {
const errorMsg = error || "Invalid username.";
// Send error back to the client
ws.send(JSON.stringify({
type: 'error',
input: 'username-input',
message: errorMsg,
}));
return;
}
// If username is valid, add the client
gm.addClient(
@@ -154,7 +154,7 @@ wss.on('connection', (ws, req) => {
clientMsg.clientID,
clientMsg.persistentID,
ip,
username,
clientMsg.username,
ws
),
clientMsg.gameID,