Prevent weak Punishments from overriding stronger ones (#3542)
Prevent weak Punishments from overriding stronger ones (#3542)

This fixes the following problems:
- Users frequently get locked and weeklocked in two different places.
What punishment they end up getting depends on which is applied first
- Namelocking weeklocked users reduces the duration
- Autolocks could potentially reduce punishments
xfix/Pokemon-Showdown,svivian/Pokemon-Showdown,urkerab/Pokemon-Showdown,sirDonovan/Pokemon-Showdown,DesoGit/Tsunami_PS,danpantry/Pokemon-Showdown,HoeenCoder/SpacialGaze,ShowdownHelper/Saffron,svivian/Pokemon-Showdown,HoeenCoder/SpacialGaze,xfix/Pokemon-Showdown,xCrystal/Pokemon-Showdown,xCrystal/Pokemon-Showdown,panpawn/Pokemon-Showdown,jumbowhales/Pokemon-Showdown,jumbowhales/Pokemon-Showdown,svivian/Pokemon-Showdown,Enigami/Pokemon-Showdown,urkerab/Pokemon-Showdown,panpawn/Pokemon-Showdown,QuiteQuiet/Pokemon-Showdown,ShowdownHelper/Saffron,QuiteQuiet/Pokemon-Showdown,sirDonovan/Pokemon-Showdown,jumbowhales/Pokemon-Showdown,urkerab/Pokemon-Showdown,Enigami/Pokemon-Showdown,danpantry/Pokemon-Showdown,xfix/Pokemon-Showdown,AWailOfATail/Pokemon-Showdown,panpawn/Gold-Server,sirDonovan/Pokemon-Showdown,Zarel/Pokemon-Showdown,svivian/Pokemon-Showdown,xCrystal/Pokemon-Showdown,ShowdownHelper/Saffron,Zarel/Pokemon-Showdown,HoeenCoder/SpacialGaze,Enigami/Pokemon-Showdown,AustinXII/Pokemon-Showdown,AustinXII/Pokemon-Showdown,Zarel/Pokemon-Showdown,QuiteQuiet/Pokemon-Showdown,AustinXII/Pokemon-Showdown,AWailOfATail/Pokemon-Showdown,AWailOfATail/Pokemon-Showdown,xfix/Pokemon-Showdown,DesoGit/Tsunami_PS,DesoGit/Tsunami_PS,HoeenCoder/SpacialGaze,panpawn/Gold-Server,panpawn/Gold-Server,Enigami/Pokemon-Showdown,svivian/Pokemon-Showdown,xfix/Pokemon-Showdown