Cleanup

2020-06-01 18:55:19 -04:00
parent 68f1efdbdd
commit 69d0751e65
9 changed files with 58 additions and 14 deletions
@@ -63,11 +63,8 @@ public class Build{

    /** Returns whether a tile can be placed at this location by this team. */
    public static boolean validPlace(Team team, int x, int y, Block type, int rotation){
-        if(type == null || !type.isVisible() || type.isHidden()){
-            return false;
-        }
-
-        if(state.rules.bannedBlocks.contains(type) && !(state.rules.waves && team == state.rules.waveTeam)){
+        //the wave team can build whatever they want as long as it's visible - banned blocks are not applicable
+        if(type == null || (!type.isPlaceable() && !(state.rules.waves && team == state.rules.waveTeam && type.isVisible()))){
            return false;
        }