Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2020-10-05 17:09:30 -04:00
2 changed files with 10 additions and 1 deletions

View File

@@ -192,7 +192,7 @@ public class BlockIndexer{
if(other == null) continue;
if(other.team == team && pred.get(other) && intSet.add(other.pos())){
if((team == null || other.team == team) && pred.get(other) && intSet.add(other.pos())){
cons.get(other);
any = true;
}