Compare commits

..

No commits in common. "268d435f84d79b205a794a19d57b6e743d677aec" and "64b731f18c2783c9f2ec78d0dcee34eee75bbbcc" have entirely different histories.

2 changed files with 21 additions and 6 deletions

View File

@ -32,7 +32,7 @@ export const config: Config = {
http: 100,
ws: 100,
motd: 100,
skins: 1000, // adjust as necessary
skins: 100, // adjust as necessary
skinsIp: 10000,
connect: 100,
},

View File

@ -38,7 +38,7 @@ export function setSG(svr: ServerGlobals) {
export function disconectIdle() {
SERVER.players.forEach((client) => {
if (client.state == ConnectionState.AUTH && Date.now() - client.lastStatusUpdate > MAX_LIFETIME_AUTH) {
client.gameClient.end("Timed out waiting for user to login via Microsoft!");
client.gameClient.end("Timed out waiting for user to login via Microsoft");
} else if (client.state == ConnectionState.SUCCESS && Date.now() - client.lastStatusUpdate > MAX_LIFETIME_CONNECTED) {
client.gameClient.end(Enums.ChatColor.RED + "Please enter the IP of the server you'd like to connect to in chat.");
}
@ -139,15 +139,15 @@ export function sendMessageWarning(client: Client, msg: string) {
export function sendMessageLogin(client: Client, url: string, token: string) {
client.write("chat", {
message: JSON.stringify({
text: "Please open ",
text: "Please go to ",
color: Enums.ChatColor.RESET,
extra: [
{
text: "this link",
text: url,
color: "gold",
clickEvent: {
action: "open_url",
value: `${url}/?otc=${token}`,
value: url,
},
hoverEvent: {
action: "show_text",
@ -155,7 +155,22 @@ export function sendMessageLogin(client: Client, url: string, token: string) {
},
},
{
text: " to authenticate via Microsoft.",
text: " and login via the code ",
},
{
text: token,
color: "gold",
hoverEvent: {
action: "show_text",
value: Enums.ChatColor.GOLD + "Click me to copy to chat!",
},
clickEvent: {
action: "suggest_command",
value: token,
},
},
{
text: ".",
},
],
}),