From 39f12be5f9ec65b590158eec69dfba472c4583bf Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Thu, 29 Dec 2016 07:44:41 +1100 Subject: [PATCH] Update residence dependency --- bukkit/build.gradle | 2 +- .../java/com/boydti/fawe/bukkit/regions/ResidenceFeature.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bukkit/build.gradle b/bukkit/build.gradle index c7fe27b3..b53e2f7c 100644 --- a/bukkit/build.gradle +++ b/bukkit/build.gradle @@ -10,7 +10,7 @@ dependencies { compile 'com.massivecraft:mcore:7.0.1' compile 'net.sacredlabyrinth.Phaed:PreciousStones:10.0.4-SNAPSHOT' 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.worldcretornica:plotme_core:0.16.3' compile 'junit:junit:4.11' diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/regions/ResidenceFeature.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/regions/ResidenceFeature.java index 9b1443c1..7a21186c 100644 --- a/bukkit/src/main/java/com/boydti/fawe/bukkit/regions/ResidenceFeature.java +++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/regions/ResidenceFeature.java @@ -25,7 +25,7 @@ public class ResidenceFeature extends BukkitMaskManager implements Listener { public BukkitMask getMask(final FawePlayer fp, MaskType type) { final Player player = fp.parent; 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.getOwner().equals(player.getName()) || residence.getOwner().equals(player.getUniqueId().toString()) || type == MaskType.MEMBER && residence.getPlayersInResidence().contains(player)) { final CuboidArea area = residence.getAreaArray()[0];