tale
/
ProjectAres
mirror of https://github.com/OvercastNetwork/ProjectAres.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Allow players to join team blitz mid-match

This commit is contained in:
Electroid 2017-06-07 13:31:03 -07:00
parent 1243973bdd
commit 82edbf220f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PGM/src/main/java/tc/oc/pgm/blitz/BlitzMatchModuleImpl.java
View File

@ -248,7 +248,8 @@ public class BlitzMatchModuleImpl extends MatchModule implements BlitzMatchModul
public JoinResult queryJoin(MatchPlayer joining, JoinRequest request) {
if(activated() &&
match.hasStarted() &&
!EnumSet.of(JoinMethod.FORCE, JoinMethod.REMOTE).contains(request.method())) {
!EnumSet.of(JoinMethod.FORCE, JoinMethod.REMOTE).contains(request.method()) &&
request.competitor().map(this::lives).map(opt -> !opt.map(Lives::empty).orElse(false)).orElse(true)) {
// This message should NOT look like an error, because remotely joining players will see it often.
// It also should not say "Blitz" because not all maps that use this module want to be labelled "Blitz".
return JoinDenied.friendly("command.gameplay.join.matchStarted");