Fix to PlayerCap config and try to fix podium empty bug

Author: Igoorx

match.py

@@ -120,7 +120,9 @@ def getPlayersData(self):
     def broadPlayerUpdate(self, player, pktData):
         data = Buffer().writeInt16(player.id).write(pktData).toBytes()
         for p in self.players:
-            if not p.loaded or p.id == player.id or p.level != player.level or p.zone != player.zone:
+            if not p.loaded or p.id == player.id:
+                continue
+            if not p.win and (p.level != player.level or p.zone != player.zone):
                 continue
             p.sendBin(0x12, data)
 

player.py

@@ -108,7 +108,7 @@ def handlePkt(self, code, b, pktData):
             self.match.broadBin(0x10, Buffer().writeInt16(self.id).write(pktData).writeInt16(self.skin))
 
         elif code == 0x11: # KILL_PLAYER_OBJECT
-            if self.dead:
+            if self.dead or self.win:
                 return
 
             self.dead = True
@@ -138,7 +138,7 @@ def handlePkt(self, code, b, pktData):
             self.match.broadPlayerUpdate(self, pktData)
 
         elif code == 0x13: # PLAYER_OBJECT_EVENT
-            if self.dead:
+            if self.dead or self.win:
                 return
 
             type = b.readInt8()
@@ -168,15 +168,22 @@ def handlePkt(self, code, b, pktData):
             self.client.startDCTimer(120)
 
             pos = self.match.getWinners()
-            if self.server.discordWebhook is not None and pos == 1 and not self.match.private:
-                name = self.name
-                # We already filter players that have a squad so...
-                if len(self.team) == 0 and self.server.checkCurse(self.name):
-                    name = "[ censored ]"
-                embed = DiscordEmbed(description='**%s** has achieved **#1** victory royale!' % name, color=0xffff00)
-                self.server.discordWebhook.add_embed(embed)
-                self.server.discordWebhook.execute()
-                self.server.discordWebhook.remove_embed(0)
+            try:
+                # Maybe this should be assynchronous?
+                if self.server.discordWebhook is not None and pos == 1 and not self.match.private:
+                    name = self.name
+                    # We already filter players that have a squad so...
+                    if len(self.team) == 0 and self.server.checkCurse(self.name):
+                        name = "[ censored ]"
+                    embed = DiscordEmbed(description='**%s** has achieved **#1** victory royale!' % name, color=0xffff00)
+                    self.server.discordWebhook.add_embed(embed)
+                    self.server.discordWebhook.execute()
+                    self.server.discordWebhook.remove_embed(0)
+            except:
+                pass
+
+            # Make sure that everyone knows that the player is at the axe
+            self.match.broadPlayerUpdate(self, self.lastUpdatePkt)
 
             self.match.broadBin(0x18, Buffer().writeInt16(self.id).writeInt8(pos).writeInt8(0))
 

server.py

@@ -1,7 +1,7 @@
 import os
 import sys
 
-NUM_SKINS = 6   #temporary until shop is implemented
+NUM_SKINS = 22   #temporary until shop is implemented
 
 if sys.version_info.major != 3:
     sys.stderr.write("You need python 3.7 or later to run this script\n")
@@ -74,8 +74,8 @@ def onOpen(self):
         if not self.address:
             self.address = self.transport.getPeer().host
 
-        # A connection can only be alive for 30 minutes
-        self.maxConLifeTimer = reactor.callLater(30 * 60, self.sendClose)
+        # A connection can only be alive for 20 minutes
+        self.maxConLifeTimer = reactor.callLater(20 * 60, self.sendClose)
 
         self.startDCTimer(25)
         self.setState("l")
@@ -261,7 +261,7 @@ def onBinaryMessage(self):
         b = Buffer(self.recv[1:pktLen])
         del self.recv[:pktLen]
 
-        if not self.player.loaded or self.blocked or (not self.player.match.closed and self.player.match.playing):
+        if self.player is None or not self.player.loaded or self.blocked or (not self.player.match.closed and self.player.match.playing):
             self.recv.clear()
             return False
 
@@ -329,7 +329,15 @@ def readConfig(self, cfgHash):
         self.maxSimulIP = config.getint('Server', 'MaxSimulIP')
         self.discordWebhookUrl = config.get('Server', 'DiscordWebhookUrl').strip()
         self.playerMin = config.getint('Match', 'PlayerMin')
-        self.playerCap = config.getint('Match', 'PlayerCap')
+        newCap = config.getint('Match', 'PlayerCap')
+        if newCap < self.playerCap:
+            try:
+                for match in self.matches:
+                    if len(match.players) >= newCap:
+                        match.start()
+            except:
+                print("Couldn't start matches after player cap change...")
+        self.playerCap = newCap
         self.autoStartTime = config.getint('Match', 'AutoStartTime')
         self.startTimer = config.getint('Match', 'StartTimer')
         self.enableVoteStart = config.getboolean('Match', 'EnableVoteStart')