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

Merged with upstream

Browse Source
This commit is contained in:
Sunpy
2018-04-08 21:20:26 +02:00
parent c2af1b9772 ea4e2bd4fd
commit 2cd69a9a63
11 changed files with 114 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
events/createMatchEvent.py
View File

@@ -1,5 +1,5 @@
from common.log import logUtils as log
from constants import clientPackets
from constants import clientPackets, serverPackets
from constants import exceptions
from objects import glob
@@ -12,9 +12,14 @@ def handle(userToken, packetData):
# Read packet data
packetData = clientPackets.createMatch(packetData)
# Make sure the name is valid
matchName = packetData["matchName"].strip()
if not matchName:
raise exceptions.matchCreateError()
# Create a match object
# TODO: Player number check
matchID = glob.matches.createMatch(packetData["matchName"], packetData["matchPassword"], packetData["beatmapID"], packetData["beatmapName"], packetData["beatmapMD5"], packetData["gameMode"], userID)
matchID = glob.matches.createMatch(matchName, packetData["matchPassword"].strip(), packetData["beatmapID"], packetData["beatmapName"], packetData["beatmapMD5"], packetData["gameMode"], userID)
# Make sure the match has been created
if matchID not in glob.matches.matches:
@@ -30,3 +35,4 @@ def handle(userToken, packetData):
match.changePassword(packetData["matchPassword"])
except exceptions.matchCreateError:
log.error("Error while creating match!")
userToken.enqueue(serverPackets.matchJoinFail())