From 1b88215d68bd359061fa3dcd2e98b923b1b4914b Mon Sep 17 00:00:00 2001 From: soshimee <45235204+soshimee@users.noreply.github.com> Date: Wed, 24 Aug 2022 20:18:21 +0900 Subject: [PATCH] Add ignoregamemoderestriction config --- .../MultiverseCore/MultiverseCoreConfiguration.java | 13 +++++++++++++ .../MultiverseCore/api/MultiverseCoreConfig.java | 12 ++++++++++++ .../MultiverseCore/utils/MVPermissions.java | 2 +- 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCoreConfiguration.java b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCoreConfiguration.java index aaf21275c..7c1cba085 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCoreConfiguration.java +++ b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCoreConfiguration.java @@ -77,6 +77,8 @@ public static MultiverseCoreConfiguration getInstance() { private volatile boolean autopurge; @Property private volatile boolean idonotwanttodonate; + @Property + private volatile boolean ignoregamemoderestriction; public MultiverseCoreConfiguration() { super(); @@ -111,6 +113,7 @@ protected void setDefaults() { portalsearchradius = 128; autopurge = true; idonotwanttodonate = false; + ignoregamemoderestriction = false; // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck } @@ -382,4 +385,14 @@ public boolean isShowingDonateMessage() { public void setShowDonateMessage(boolean showDonateMessage) { this.idonotwanttodonate = !showDonateMessage; } + + @Override + public boolean getIgnoreGameModeRestriction() { + return ignoregamemoderestriction; + } + + @Override + public void setIgnoreGameModeRestriction(boolean ignoreGameModeRestriction) { + this.ignoregamemoderestriction = ignoreGameModeRestriction; + } } diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/MultiverseCoreConfig.java b/src/main/java/com/onarandombox/MultiverseCore/api/MultiverseCoreConfig.java index 07b2bb91d..008f3a6e7 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/api/MultiverseCoreConfig.java +++ b/src/main/java/com/onarandombox/MultiverseCore/api/MultiverseCoreConfig.java @@ -239,4 +239,16 @@ public interface MultiverseCoreConfig extends ConfigurationSerializable { * @param idonotwanttodonate True if donation/patreon messages should be shown. */ void setShowDonateMessage(boolean idonotwanttodonate); + + /** + * Sets ignoregamemoderestriction. + * @param ignoreGameModeRestriction The new value. + */ + void setIgnoreGameModeRestriction(boolean ignoreGameModeRestriction); + + /** + * Gets ignoregamemoderestriction. + * @return ignoregamemoderestriction. + */ + boolean getIgnoreGameModeRestriction(); } diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/MVPermissions.java b/src/main/java/com/onarandombox/MultiverseCore/utils/MVPermissions.java index 24ca86924..e45a43d25 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/MVPermissions.java +++ b/src/main/java/com/onarandombox/MultiverseCore/utils/MVPermissions.java @@ -45,7 +45,7 @@ public MVPermissions(MultiverseCore plugin) { * @return True if they should bypass restrictions. */ public boolean canIgnoreGameModeRestriction(Player p, MultiverseWorld w) { - return p.hasPermission("mv.bypass.gamemode." + w.getName()); + return p.hasPermission("mv.bypass.gamemode." + w.getName()) || this.plugin.getMVConfig().getIgnoreGameModeRestriction(); } /**