diff --git a/src/main/java/dev/plex/listener/impl/WorldListener.java b/src/main/java/dev/plex/listener/impl/WorldListener.java index a2c7a2f..c714ab5 100644 --- a/src/main/java/dev/plex/listener/impl/WorldListener.java +++ b/src/main/java/dev/plex/listener/impl/WorldListener.java @@ -10,11 +10,13 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.entity.EntitySpawnEvent; - import static dev.plex.util.PlexUtils.tl; public class WorldListener extends PlexListener { + // TODO: Actually implement permissions for every world properly + private final String permission = plugin.config.getString("plex.adminworld.permission"); + @EventHandler public void onBlockPlace(BlockPlaceEvent e) { @@ -30,9 +32,10 @@ public class WorldListener extends PlexListener { return; } - } else if (plugin.getSystem().equalsIgnoreCase("permissions")) + } + else if (plugin.getSystem().equalsIgnoreCase("permissions")) { - if (player.hasPermission("plex.adminworld")) + if (player.hasPermission(permission)); { return; } @@ -47,10 +50,6 @@ public class WorldListener extends PlexListener @EventHandler public void onEntitySpawn(EntitySpawnEvent e) { - if (!e.getLocation().getWorld().getName().equals("fionn")) - { - return; - } if (e.getEntityType() != EntityType.SLIME) { return; diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 051ec74..0780c48 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -36,6 +36,7 @@ data: worlds: flatlands: name: "Flatlands" + permission: "plex.world.flatlands" parameters: grass_block: 1 dirt: 32 @@ -43,6 +44,7 @@ worlds: bedrock: 1 adminworld: name: "Admin World" + permission: "plex.world.adminworld" parameters: grass_block: 1 dirt: 32 @@ -50,6 +52,7 @@ worlds: bedrock: 1 masterbuilderworld: name: "MasterBuilder World" + permission: "plex.world.masterbuilderworld" parameters: grass_block: 1 dirt: 32