EZPPFarm/pep.py
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

.BANCHO. .FIX. Make sure match data is cached before sending it

Browse Source
This commit is contained in:
Nyo
2016-10-08 20:35:09 +02:00
parent 2d26d36fbf
commit 8ff493f706
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
objects/match.py
View File

@@ -1,8 +1,4 @@
import copy import copy
import dill
from common import generalUtils
from common.constants import gameModes
from common.log import logUtils as log from common.log import logUtils as log
from constants import dataTypes from constants import dataTypes
from constants import matchModModes from constants import matchModModes
@@ -48,6 +44,7 @@ class match:
self.mods = 0 self.mods = 0
self.matchName = matchName self.matchName = matchName
self.matchPassword = matchPassword self.matchPassword = matchPassword
log.debug("Password: {}".format(self.matchPassword))
# NOTE: Password used to be md5-hashed, but the client doesn't like that. # NOTE: Password used to be md5-hashed, but the client doesn't like that.
# So we're back to plain text passwords, like in normal osu! # So we're back to plain text passwords, like in normal osu!
#if matchPassword != "": #if matchPassword != "":
@@ -73,6 +70,7 @@ class match:
# Create streams # Create streams
glob.streams.add(self.streamName) glob.streams.add(self.streamName)
glob.streams.add(self.playingStreamName) glob.streams.add(self.playingStreamName)
self.sendUpdates()
# Create #multiplayer channel # Create #multiplayer channel
glob.channels.addTempChannel("#multi_{}".format(self.matchID)) glob.channels.addTempChannel("#multi_{}".format(self.matchID))
@@ -578,8 +576,11 @@ class match:
def sendUpdates(self): def sendUpdates(self):
self.matchDataCache = serverPackets.updateMatch(self.matchID) self.matchDataCache = serverPackets.updateMatch(self.matchID)
glob.streams.broadcast(self.streamName, self.matchDataCache) if self.matchDataCache is not None:
glob.streams.broadcast("lobby", self.matchDataCache) glob.streams.broadcast(self.streamName, self.matchDataCache)
glob.streams.broadcast("lobby", self.matchDataCache)
else:
log.error("MPROOM{}: Can't send match update packet, match data is None!!!".format(self.matchID))
def checkTeams(self): def checkTeams(self):
""" """