From 8d77f4dcf4fe7e1b833e44be7bdb767f09634f6b Mon Sep 17 00:00:00 2001 From: yoyosource Date: Fri, 1 Dec 2023 16:19:55 +0100 Subject: [PATCH] Fix Fight.publicOnly method --- FightSystem_Core/src/config.yml | 2 +- .../src/de/steamwar/fightsystem/fight/Fight.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/FightSystem_Core/src/config.yml b/FightSystem_Core/src/config.yml index 3ec764b..6b0c977 100644 --- a/FightSystem_Core/src/config.yml +++ b/FightSystem_Core/src/config.yml @@ -74,7 +74,7 @@ Schematic: PasteAligned: false # defaults to false if missing # If only public schematics are allowed OnlyPublicSchematics: false # defaults to false if missing - # If the public only force should be completely disabled # TODO: I think this value is now obsolete! + # If the public only force should be completely disabled IgnorePublicOnly: false # defaults to false if missing # If obsidian and bedrock should be replaced during PRE_RUNNING ReplaceObsidianBedrock: false # defaults to false if missing diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/fight/Fight.java b/FightSystem_Core/src/de/steamwar/fightsystem/fight/Fight.java index c50cf60..defed4c 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/fight/Fight.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/fight/Fight.java @@ -143,9 +143,9 @@ public class Fight { if (Config.OnlyPublicSchematics) { return true; } - if (redTeam.isPublicsOnly() || blueTeam.isPublicsOnly()) { - return true; + if (Config.IgnorePublicOnly) { + return false; } - return false; + return redTeam.isPublicsOnly() || blueTeam.isPublicsOnly(); } }