From f1ae6d7f4c79f17162aba3d0581e9259fe4d8877 Mon Sep 17 00:00:00 2001 From: TONY_All Date: Fri, 16 Jun 2023 00:14:37 +0800 Subject: [PATCH] sync --- src/main/kotlin/cc/maxmc/blastingcrisis/game/Game.kt | 9 +++++---- .../cc/maxmc/blastingcrisis/game/GamePlaceBreakRule.kt | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/cc/maxmc/blastingcrisis/game/Game.kt b/src/main/kotlin/cc/maxmc/blastingcrisis/game/Game.kt index a75816b..30f566d 100644 --- a/src/main/kotlin/cc/maxmc/blastingcrisis/game/Game.kt +++ b/src/main/kotlin/cc/maxmc/blastingcrisis/game/Game.kt @@ -48,21 +48,22 @@ class Game( fun start() { debug("game ${map.name} started.") - placeBreakRule.defaultRule() + placeBreakRule.loadDefaultRule() state = GameState.START timer.startTimer() timer.submitEvent("wall_fall", Duration.ofMinutes(1)) { broadcast { it.sendLang("game_wall_fall") } + placeBreakRule.addRule("allow_center_wall") { _, _, loc -> + map.wall.contains(loc) + } submit { map.wall.forBlocksInArea().forEach { it.block.type = Material.AIR } - placeBreakRule.addRule("allow_center_wall") { _, _, loc -> - map.wall.contains(loc) - } } } + autoJoinTeam() teams.forEach { it.start() diff --git a/src/main/kotlin/cc/maxmc/blastingcrisis/game/GamePlaceBreakRule.kt b/src/main/kotlin/cc/maxmc/blastingcrisis/game/GamePlaceBreakRule.kt index 0f65697..c97343e 100644 --- a/src/main/kotlin/cc/maxmc/blastingcrisis/game/GamePlaceBreakRule.kt +++ b/src/main/kotlin/cc/maxmc/blastingcrisis/game/GamePlaceBreakRule.kt @@ -33,7 +33,7 @@ class GamePlaceBreakRule(val game: Game) { rules[name] = rule } - fun defaultRule() { + fun loadDefaultRule() { // allow mine addRule("allow_mine") { _, _, loc -> game.map.teams.flatMap {