Upstream/AreaShop
1
0
Fork 0
mirror of https://github.com/NLthijs48/AreaShop.git synced 2024-10-05 02:47:28 +02:00
Code Issues Projects Releases Wiki Activity

Change additional places where the contains is used

Browse Source
This commit is contained in:
Thijs Wiefferink 2015-06-13 22:56:27 +02:00
parent 2f6874a16e
commit 401f52e687
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AreaShop/src/main/java/nl/evolutioncoding/areashop/commands/AddCommand.java
View File

@ -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";

8
AreaShop/src/main/java/nl/evolutioncoding/areashop/listeners/SignChangeListener.java
View File

@ -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)));

4
AreaShop/src/main/java/nl/evolutioncoding/areashop/managers/FileManager.java
View File

@ -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) {