diff --git a/AreaShop/src/main/java/nl/evolutioncoding/areashop/commands/AddCommand.java b/AreaShop/src/main/java/nl/evolutioncoding/areashop/commands/AddCommand.java index 8734191..87ba0ce 100644 --- a/AreaShop/src/main/java/nl/evolutioncoding/areashop/commands/AddCommand.java +++ b/AreaShop/src/main/java/nl/evolutioncoding/areashop/commands/AddCommand.java @@ -127,8 +127,8 @@ public class AddCommand extends CommandAreaShop { if(current < finalRegions.size()) { ProtectedRegion region = finalRegions.get(current); // Determine if the player is an owner or member of the region - boolean isMember = finalPlayer != null && region.getMembers().contains(finalPlayer.getUniqueId()); - boolean isOwner = finalPlayer != null && region.getOwners().contains(finalPlayer.getUniqueId()); + boolean isMember = finalPlayer != null && plugin.getWorldGuardHandler().containsMember(region, finalPlayer.getUniqueId()); + boolean isOwner = finalPlayer != null && plugin.getWorldGuardHandler().containsMember(region, finalPlayer.getUniqueId()); String type = null; if(isRent) { type = "rent"; diff --git a/AreaShop/src/main/java/nl/evolutioncoding/areashop/listeners/SignChangeListener.java b/AreaShop/src/main/java/nl/evolutioncoding/areashop/listeners/SignChangeListener.java index 811f2fb..1ed28fa 100644 --- a/AreaShop/src/main/java/nl/evolutioncoding/areashop/listeners/SignChangeListener.java +++ b/AreaShop/src/main/java/nl/evolutioncoding/areashop/listeners/SignChangeListener.java @@ -137,8 +137,8 @@ public final class SignChangeListener implements Listener { // Add rent to the FileManager final RentRegion rent = new RentRegion(plugin, secondLine, event.getPlayer().getWorld()); - boolean isMember = player != null && region.getMembers().contains(player.getUniqueId()); - boolean isOwner = player != null && region.getOwners().contains(player.getUniqueId()); + boolean isMember = player != null && plugin.getWorldGuardHandler().containsMember(rent.getRegion(), player.getUniqueId()); + boolean isOwner = player != null && plugin.getWorldGuardHandler().containsOwner(rent.getRegion(), player.getUniqueId()); boolean landlord = (!player.hasPermission("areashop.createrent") && ((player.hasPermission("areashop.createrent.owner") && isOwner) || (player.hasPermission("areashop.createrent.member") && isMember))); @@ -250,8 +250,8 @@ public final class SignChangeListener implements Listener { // Add buy to the FileManager final BuyRegion buy = new BuyRegion(plugin, secondLine, event.getPlayer().getWorld()); - boolean isMember = player != null && region.getMembers().contains(player.getUniqueId()); - boolean isOwner = player != null && region.getOwners().contains(player.getUniqueId()); + boolean isMember = player != null && plugin.getWorldGuardHandler().containsMember(buy.getRegion(), player.getUniqueId()); + boolean isOwner = player != null && plugin.getWorldGuardHandler().containsOwner(buy.getRegion(), player.getUniqueId()); boolean landlord = (!player.hasPermission("areashop.createbuy") && ((player.hasPermission("areashop.createbuy.owner") && isOwner) || (player.hasPermission("areashop.createbuy.member") && isMember))); diff --git a/AreaShop/src/main/java/nl/evolutioncoding/areashop/managers/FileManager.java b/AreaShop/src/main/java/nl/evolutioncoding/areashop/managers/FileManager.java index 4856e47..7ab51a7 100644 --- a/AreaShop/src/main/java/nl/evolutioncoding/areashop/managers/FileManager.java +++ b/AreaShop/src/main/java/nl/evolutioncoding/areashop/managers/FileManager.java @@ -279,8 +279,8 @@ public class FileManager { player = (Player)sender; } // Determine if the player is an owner or member of the region - boolean isMember = player != null && region.getMembers().contains(player.getUniqueId()); - boolean isOwner = player != null && region.getOwners().contains(player.getUniqueId()); + boolean isMember = player != null && plugin.getWorldGuardHandler().containsMember(region, player.getUniqueId()); + boolean isOwner = player != null && plugin.getWorldGuardHandler().containsOwner(region, player.getUniqueId()); AreaShop.debug("checkRegionAdd: isOwner=" + isOwner + ", isMember=" + isMember); String typeString = null; if(type == RegionType.RENT) {