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

Alert users when entering tournament matches, make impossible to join tournament matches from ui

Browse Source
This commit is contained in:
Giuseppe Guerra 2017-08-02 00:29:08 +02:00
parent af554c94d5
commit 86995feb34
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
events/joinMatchEvent.py
View File

@ -25,9 +25,8 @@ def handle(userToken, packetData):
# password = generalUtils.stringMd5(password) # password = generalUtils.stringMd5(password)
# Check password # Check password
# TODO: Admins can enter every match # Always send wrong password if this is a tourney match
if match.matchPassword != "": if (match.matchPassword != "" and match.matchPassword != password) or match.isTourney:
if match.matchPassword != password:
raise exceptions.matchWrongPasswordException raise exceptions.matchWrongPasswordException
# Password is correct, join match # Password is correct, join match

4
objects/osuToken.py
View File

@ -308,6 +308,10 @@ class token:
chat.joinChannel(token=self, channel="#multi_{}".format(self.matchID)) chat.joinChannel(token=self, channel="#multi_{}".format(self.matchID))
self.enqueue(serverPackets.matchJoinSuccess(matchID)) self.enqueue(serverPackets.matchJoinSuccess(matchID))
# Alert the user if we have just joined a tourney match
if match.isTourney:
self.enqueue(serverPackets.notification("You are now in a tournament match."))
def leaveMatch(self): def leaveMatch(self):
""" """
Leave joined match, match stream and match channel Leave joined match, match stream and match channel