.BANCHO. .FIX. Fix multiplayer free mods

This commit is contained in:
Nyo 2016-09-04 17:26:58 +02:00
parent 6aa7eb6b69
commit f5a34d9048
2 changed files with 7 additions and 10 deletions

View File

@ -24,12 +24,14 @@ def handle(userToken, packetData):
packetData = clientPackets.userActionChange(packetData) packetData = clientPackets.userActionChange(packetData)
# If we are not in spectate status but we're spectating someone, stop spectating # If we are not in spectate status but we're spectating someone, stop spectating
'''if userToken.spectating != 0 and userToken.actionID != actions.WATCHING and userToken.actionID != actions.IDLE and userToken.actionID != actions.AFK: '''
userToken.stopSpectating() if userToken.spectating != 0 and userToken.actionID != actions.WATCHING and userToken.actionID != actions.IDLE and userToken.actionID != actions.AFK:
userToken.stopSpectating()
# If we are not in multiplayer but we are in a match, part match # If we are not in multiplayer but we are in a match, part match
if userToken.matchID != -1 and userToken.actionID != actions.MULTIPLAYING and userToken.actionID != actions.MULTIPLAYER and userToken.actionID != actions.AFK: if userToken.matchID != -1 and userToken.actionID != actions.MULTIPLAYING and userToken.actionID != actions.MULTIPLAYER and userToken.actionID != actions.AFK:
userToken.partMatch()''' userToken.partMatch()
'''
# Update cached stats if our pp changedm if we've just submitted a score or we've changed gameMode # Update cached stats if our pp changedm if we've just submitted a score or we've changed gameMode
if (userToken.actionID == actions.PLAYING or userToken.actionID == actions.MULTIPLAYING) or (userToken.pp != userHelper.getPP(userID, userToken.gameMode)) or (userToken.gameMode != packetData["gameMode"]): if (userToken.actionID == actions.PLAYING or userToken.actionID == actions.MULTIPLAYING) or (userToken.pp != userHelper.getPP(userID, userToken.gameMode)) or (userToken.gameMode != packetData["gameMode"]):

View File

@ -16,14 +16,9 @@ def handle(userToken, packetData):
return return
match = glob.matches.matches[matchID] match = glob.matches.matches[matchID]
# Host check
if userID != match.hostUserID:
return
# Set slot or match mods according to modType # Set slot or match mods according to modType
if match.matchModMode == matchModModes.freeMod: if match.matchModMode == matchModModes.freeMod:
# Freemod # Freemod
# Host can set global DT/HT # Host can set global DT/HT
if userID == match.hostUserID: if userID == match.hostUserID:
# If host has selected DT/HT and Freemod is enabled, set DT/HT as match mod # If host has selected DT/HT and Freemod is enabled, set DT/HT as match mod