Add op check to deny perm check.

TheNewEconomy · Feb 18, 2024 · 7e4cc5e · 7e4cc5e
1 parent c1567fc
commit 7e4cc5e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/src/main/java/me/lokka30/phantomworlds/PhantomWorlds.java b/src/main/java/me/lokka30/phantomworlds/PhantomWorlds.java
@@ -30,7 +30,6 @@
 import org.bukkit.World;
 import org.bukkit.WorldType;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.potion.PotionEffectType;
 import org.bukkit.scheduler.BukkitTask;
 
 import java.io.File;

diff --git a/src/main/java/me/lokka30/phantomworlds/listeners/player/PlayerChangeWorldListener.java b/src/main/java/me/lokka30/phantomworlds/listeners/player/PlayerChangeWorldListener.java
@@ -74,7 +74,7 @@ public void onChangeWorld(PlayerChangedWorldEvent event) {
     }
 
     if(PhantomWorlds.instance().getConfig().contains(cfgPath + ".effects") &&
-            PhantomWorlds.instance().getConfig().isConfigurationSection(cfgPath + ".effects")) {
+            PhantomWorlds.instance().getConfig().isConfigurationSection(cfgPath + ".effects") && !event.getPlayer().hasPermission("phantomworlds.world.bypass.effects")) {
 
       for(final String effName : PhantomWorlds.instance().getConfig().getConfigurationSection(cfgPath + ".effects").getKeys(false)) {
         final int duration = PhantomWorlds.instance().getConfig().getInt(cfgPath + ".effects." + effName, 60);

diff --git a/src/main/java/me/lokka30/phantomworlds/listeners/player/PlayerTeleportListener.java b/src/main/java/me/lokka30/phantomworlds/listeners/player/PlayerTeleportListener.java
@@ -54,7 +54,7 @@ public void onPortal(PlayerTeleportEvent event) {
       return;
     }
 
-    if(event.getPlayer().hasPermission("phantomworlds.world.deny." + event.getTo().getWorld().getName())) {
+    if(!event.getPlayer().isOp() && event.getPlayer().hasPermission("phantomworlds.world.deny." + event.getTo().getWorld().getName())) {
       event.setCancelled(true);
     }
   }

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -5,8 +5,8 @@
 # /     /    | `.__/| /    |  \__/  `._.' /   '   / |,'  \,'    `._.' /     /\__ `___,' \___.'
 
 name: 'PhantomWorlds'
-version: '${project.version}'
-description: '${project.description}'
+version: '2.05'
+description: 'The Robust World Manager for Minecraft Servers'
 authors: [ 'creatorfromhell', 'lokka30' ]
 website: 'https://github.com/lokka30/PhantomWorlds'
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,7 +54,7 @@ public void onPortal(PlayerTeleportEvent event) { @@
           return;
         }
-        if(event.getPlayer().hasPermission("phantomworlds.world.deny." + event.getTo().getWorld().getName())) {
+        if(!event.getPlayer().isOp() && event.getPlayer().hasPermission("phantomworlds.world.deny." + event.getTo().getWorld().getName())) {
           event.setCancelled(true);
         }
       }
@@ Expand Down @@