forked from SteamWar/SteamWar
Merge branch 'main' into exposed
# Conflicts: # CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java # CommonCore/SQL/src/de/steamwar/sql/Punishment.java
This commit is contained in:
+1
@@ -35,6 +35,7 @@ public class SchematicSystem extends JavaPlugin {
|
||||
|
||||
public static GameModeConfig<Material, String> getGameModeConfig(SchematicType type){
|
||||
GameModeConfig<Material, String> gameModeConfig = GameModeConfig.getBySchematicType(type);
|
||||
if (gameModeConfig == null) return null;
|
||||
if (gameModeConfig.CheckQuestions.isEmpty() && gameModeConfig.Schematic.ManualCheck) return null;
|
||||
return gameModeConfig;
|
||||
}
|
||||
|
||||
+1
-1
@@ -62,7 +62,7 @@ public class ModifyPart extends SWCommand {
|
||||
|
||||
SchematicType.values().parallelStream()
|
||||
.filter(SchematicType::isAssignable)
|
||||
.filter(type -> finalClipboard == null || SchematicSystem.getGameModeConfig(type) == null || AutoChecker.sizeCheck(finalClipboard, SchematicSystem.getGameModeConfig(type)).fastOk())
|
||||
.filter(type -> finalClipboard != null && SchematicSystem.getGameModeConfig(type) != null && AutoChecker.sizeCheck(finalClipboard, SchematicSystem.getGameModeConfig(type)).fastOk())
|
||||
.forEach(type -> {
|
||||
TextComponent component = new TextComponent(type.name() + " ");
|
||||
component.setColor(ChatColor.GRAY);
|
||||
|
||||
Reference in New Issue
Block a user