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

Update residence dependency

This commit is contained in:
Jesse Boyd 2016-12-29 07:44:41 +11:00
parent d43dbab7c5
commit 39f12be5f9
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bukkit/build.gradle
View File

@ -10,7 +10,7 @@ dependencies {
compile 'com.massivecraft:mcore:7.0.1' compile 'com.massivecraft:mcore:7.0.1'
compile 'net.sacredlabyrinth.Phaed:PreciousStones:10.0.4-SNAPSHOT' compile 'net.sacredlabyrinth.Phaed:PreciousStones:10.0.4-SNAPSHOT'
compile 'net.jzx7:regios:5.9.9' compile 'net.jzx7:regios:5.9.9'
compile 'com.bekvon.bukkit:residence:2.6.6.6' compile 'com.bekvon.bukkit.residence:Residence:4.5._13.1'
compile 'com.palmergames.bukkit:towny:0.84.0.9' compile 'com.palmergames.bukkit:towny:0.84.0.9'
compile 'com.worldcretornica:plotme_core:0.16.3' compile 'com.worldcretornica:plotme_core:0.16.3'
compile 'junit:junit:4.11' compile 'junit:junit:4.11'

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

@ -25,7 +25,7 @@ public class ResidenceFeature extends BukkitMaskManager implements Listener {
public BukkitMask getMask(final FawePlayer<Player> fp, MaskType type) { public BukkitMask getMask(final FawePlayer<Player> fp, 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.getResidenceManager().getByLoc(location); final ClaimedResidence residence = Residence.getInstance().getResidenceManager().getByLoc(location);
if (residence != null) { if (residence != null) {
if (residence.getOwner().equals(player.getName()) || residence.getOwner().equals(player.getUniqueId().toString()) || type == MaskType.MEMBER && residence.getPlayersInResidence().contains(player)) { if (residence.getOwner().equals(player.getName()) || residence.getOwner().equals(player.getUniqueId().toString()) || type == MaskType.MEMBER && residence.getPlayersInResidence().contains(player)) {
final CuboidArea area = residence.getAreaArray()[0]; final CuboidArea area = residence.getAreaArray()[0];