Leahnaya/DeathGarden_API_Rebirth
0
0
Fork 0
mirror of https://github.com/wolfswolke/DeathGarden_API_Rebirth.git synced 2026-04-26 00:10:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed more broken lobbys

Browse Source
This commit is contained in:
ZKWolf 2024-02-17 03:53:01 +01:00
parent 41dd2d2c42
commit c41aaf871f
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/logic/queue_handler.py
View File

@ -1,3 +1,4 @@
import os
import uuid import uuid
import random import random
from logic.time_handler import get_time from logic.time_handler import get_time
@ -146,7 +147,11 @@ class MatchmakingQueue:
try: try:
# Check if user is owner of broken lobby # Check if user is owner of broken lobby
for openLobby in self.openLobbies:
if openLobby.host == userId:
self.openLobbies.pop(self.openLobbies.index(openLobby))
logger.graylog_logger(level="info", handler="matchmaking_queuePlayer",
message="Killed broken lobby from queuePlayer")
current_timestamp, expiration_timestamp = get_time() current_timestamp, expiration_timestamp = get_time()
queuedPlayer = QueuedPlayer(userId, side, queuedPlayer = QueuedPlayer(userId, side,
current_timestamp) current_timestamp)
@ -181,6 +186,12 @@ class MatchmakingQueue:
queuedPlayer, index = self.getQueuedPlayer(userId) queuedPlayer, index = self.getQueuedPlayer(userId)
if not queuedPlayer: if not queuedPlayer:
return {} return {}
if os.environ['DEV'] == "true":
max_players_b = 2
else:
max_players_b = 5
if side == 'B': if side == 'B':
if self.openLobbies: if self.openLobbies:
for openLobby in self.openLobbies: for openLobby in self.openLobbies:
@ -208,7 +219,7 @@ class MatchmakingQueue:
matchConfig=openLobby.matchConfig) matchConfig=openLobby.matchConfig)
self.queuedPlayers.pop(index) self.queuedPlayers.pop(index)
return data return data
if len(openLobby.nonHosts) < 5: if len(openLobby.nonHosts) < max_players_b:
if additional_user_ids: if additional_user_ids:
open_slots = 5 - len(openLobby.nonHosts) open_slots = 5 - len(openLobby.nonHosts)
queued_player_count = 1 + len(additional_user_ids) queued_player_count = 1 + len(additional_user_ids)
@ -319,9 +330,9 @@ class MatchmakingQueue:
def createMatchResponse(self, matchId, killed=None, userId=None): def createMatchResponse(self, matchId, killed=None, userId=None):
try: try:
if userId in self.devs: if os.environ['DEV'] == "true":
countA = 1 countA = 1
countB = 1 countB = 2
else: else:
countA = 1 countA = 1
countB = 5 countB = 5
@ -390,9 +401,9 @@ class MatchmakingQueue:
try: try:
lobby, index = self.getLobbyById(matchId) lobby, index = self.getLobbyById(matchId)
self.openLobbies[index].last_host_check = get_time()[0] + 3 self.openLobbies[index].last_host_check = get_time()[0] + 3
if region: if os.environ['DEV'] == "true":
countA = 1 countA = 1
countB = 1 countB = 2
else: else:
countA = 1 countA = 1
countB = 5 countB = 5