Brandon/FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes #668

Browse Source
This commit is contained in:
Jesse Boyd 2017-08-21 23:39:20 +10:00
parent 316e55a724
commit a73e44c88c
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bukkit/src/main/java/com/boydti/fawe/bukkit/regions/ResidenceFeature.java
View File

@ -22,28 +22,33 @@ public class ResidenceFeature extends BukkitMaskManager implements Listener {
} }
public boolean isAllowed(Player player, ClaimedResidence residence, MaskType type) { public boolean isAllowed(Player player, ClaimedResidence residence, MaskType type) {
return residence != null && (residence.getOwner().equals(player.getName()) || residence.getOwner().equals(player.getUniqueId().toString()) || type == MaskType.MEMBER && residence.getPlayersInResidence().contains(player)); return residence != null && (residence.getOwner().equals(player.getName()) || residence.getOwner().equals(player.getUniqueId().toString()) || type == MaskType.MEMBER && residence.getPermissions().playerHas(player, "build", false));
} }
@Override @Override
public BukkitMask getMask(final FawePlayer<Player> fp, final MaskType type) { public BukkitMask getMask(final FawePlayer<Player> fp, final MaskType type) {
final Player player = fp.parent; final Player player = fp.parent;
final Location location = player.getLocation(); final Location location = player.getLocation();
final ClaimedResidence residence = Residence.getInstance().getResidenceManager().getByLoc(location); ClaimedResidence residence = Residence.getInstance().getResidenceManager().getByLoc(location);
if (residence != null) { if (residence != null) {
if (isAllowed(player, residence, type)) { boolean isAllowed;
while (!(isAllowed = isAllowed(player, residence, type)) && residence != null) {
residence = residence.getSubzoneByLoc(location);
}
if (isAllowed) {
final CuboidArea area = residence.getAreaArray()[0]; final CuboidArea area = residence.getAreaArray()[0];
final Location pos1 = area.getHighLoc(); final Location pos1 = area.getHighLoc();
final Location pos2 = area.getLowLoc(); final Location pos2 = area.getLowLoc();
final ClaimedResidence finalResidence = residence;
return new BukkitMask(pos1, pos2) { return new BukkitMask(pos1, pos2) {
@Override @Override
public String getName() { public String getName() {
return "RESIDENCE: " + residence.getName(); return "RESIDENCE: " + finalResidence.getName();
} }
@Override @Override
public boolean isValid(FawePlayer player, MaskType type) { public boolean isValid(FawePlayer player, MaskType type) {
return isAllowed((Player) player.parent, residence, type); return isAllowed((Player) player.parent, finalResidence, type);
} }
}; };
} }