.BANCHO. .FIX. Fix not parting channels when leaving multiplayer matches

This commit is contained in:
Nyo
2016-08-10 12:24:41 +02:00
parent a5fd8b0431
commit 59bcb351cf
6 changed files with 19 additions and 55 deletions

View File

@@ -1,38 +1,10 @@
"""
Event called when someone parts a channel
"""
from helpers import consoleHelper
from constants import bcolors
from objects import glob
from constants import clientPackets
from constants import serverPackets
from helpers import logHelper as log
from helpers import chatHelper as chat
def handle(userToken, packetData):
# Channel join packet
packetData = clientPackets.channelPart(packetData)
chat.partChannel(token=userToken, channel=packetData["channel"])
"""def partChannel(userToken, channelName, kick = False):
# Get usertoken data
username = userToken.username
userID = userToken.userID
# Remove us from joined users and joined channels
if channelName in glob.channels.channels:
# Check that user is in channel
if channelName in userToken.joinedChannels:
userToken.partChannel(channelName)
# Check if user is in channel
if userID in glob.channels.channels[channelName].connectedUsers:
glob.channels.channels[channelName].userPart(userID)
# Force close tab if needed
if kick == True:
userToken.enqueue(serverPackets.channelKicked(channelName))
# Console output
log.info("{} parted channel {}".format(username, channelName))"""
chat.partChannel(token=userToken, channel=packetData["channel"])

View File

@@ -1,6 +1,5 @@
from objects import glob
from helpers import chatHelper as chat
from constants import serverPackets
def handle(userToken, _):
# get data from usertoken
@@ -24,7 +23,7 @@ def handle(userToken, _):
match.userLeft(userID)
# Part #multiplayer channel
chat.partChannel(token=userToken, channel="#multi_{}".format(matchID))
#chat.partChannel(token=userToken, channel="#multi_{}".format(matchID), kick=True)
# Set usertoken match to -1
userToken.partMatch()