Upstream/ChestShop-3
1
0
Fork 0
mirror of https://github.com/ChestShop-authors/ChestShop-3.git synced 2025-02-04 04:21:19 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17 from Eredrim/master

Browse Source 
Update residence comptibility
This commit is contained in:
Dan Mulloy 2017-01-08 10:44:18 -05:00 committed by GitHub
commit e44d9e9710
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pom.xml
View File

@ -237,11 +237,10 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.t00thpick1</groupId> <groupId>com.bekvon.bukkit.residence</groupId>
<artifactId>residence</artifactId> <artifactId>Residence</artifactId>
<version>3.0.0q-SNAPSHOT</version> <version>4.5.3.0</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>

14
src/main/java/com/Acrobot/ChestShop/Plugins/ResidenceChestProtection.java
View File

@ -1,10 +1,10 @@
package com.Acrobot.ChestShop.Plugins; package com.Acrobot.ChestShop.Plugins;
import com.Acrobot.ChestShop.Events.Protection.ProtectionCheckEvent; import com.Acrobot.ChestShop.Events.Protection.ProtectionCheckEvent;
import net.t00thpick1.residence.Residence; import com.bekvon.bukkit.residence.Residence;
import net.t00thpick1.residence.api.ResidenceAPI; import com.bekvon.bukkit.residence.api.ResidenceApi;
import net.t00thpick1.residence.api.areas.ResidenceArea; import com.bekvon.bukkit.residence.containers.Flags;
import net.t00thpick1.residence.api.flags.FlagManager; import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Event; import org.bukkit.event.Event;
@ -25,10 +25,10 @@ public class ResidenceChestProtection implements Listener {
Block block = event.getBlock(); Block block = event.getBlock();
Player player = event.getPlayer(); Player player = event.getPlayer();
ResidenceArea area = ResidenceAPI.getResidenceManager().getByLocation(block.getLocation()); ClaimedResidence residence = ResidenceApi.getResidenceManager().getByLoc(block.getLocation());
if (area != null) { if (residence != null) {
if (!area.allowAction(player.getName(), FlagManager.CONTAINER) && !Residence.getInstance().isAdminMode(player)) { if (!residence.getPermissions().playerHas(player, Flags.container, true) && !Residence.isResAdminOn(player)) {
//Doesn't have permissions to that chest. //Doesn't have permissions to that chest.
event.setResult(Event.Result.DENY); event.setResult(Event.Result.DENY);
} }