Upstream
/
ChestShop-3
mirror of https://github.com/ChestShop-authors/ChestShop-3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update Residence

This commit is contained in:
Andrzej Pomirski 2014-06-29 17:35:49 +02:00
parent 3cb4a17be5
commit e39825aa1f
22 changed files with 48 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Residence.jar Normal file
View File

Binary file not shown.

6
pom.xml
View File

@ -80,7 +80,7 @@
<dependency>
<groupId>com.herocraftonline.heroes</groupId>
<artifactId>heroes</artifactId>
<version>1.5.2-dev-b1705</version>
<version>LATEST</version>
</dependency>
<dependency>
<groupId>com.griefcraft.lwc</groupId>
@ -108,9 +108,9 @@
<version>1.7.9</version>
</dependency>
<dependency>
<groupId>com.bekvon.bukkit.residence</groupId>
<groupId>net.t00thpick1</groupId>
<artifactId>residence</artifactId>
<version>2.6.6.3</version>
<version>3.0.0q-SNAPSHOT</version>
</dependency>
</dependencies>

BIN
repo/com/bekvon/bukkit/residence/residence/2.6.6.3/residence-2.6.6.3.jar
View File

Binary file not shown.

1
repo/com/bekvon/bukkit/residence/residence/2.6.6.3/residence-2.6.6.3.jar.md5
View File

@ -1 +0,0 @@
c288abe5ad73d0d781b03462fedab859

1
repo/com/bekvon/bukkit/residence/residence/2.6.6.3/residence-2.6.6.3.jar.sha1
View File

@ -1 +0,0 @@
b5cb3489880cba5e70cc0d630191c936994b6d7e

1
repo/com/bekvon/bukkit/residence/residence/2.6.6.3/residence-2.6.6.3.pom.md5
View File

@ -1 +0,0 @@
80eebf7358e0b24a1603c3d91c0084e0

1
repo/com/bekvon/bukkit/residence/residence/2.6.6.3/residence-2.6.6.3.pom.sha1
View File

@ -1 +0,0 @@
d2ad2cfea6ac2ba9b897f8b2e3bc13d5fd3100d0

1
repo/com/bekvon/bukkit/residence/residence/maven-metadata-local.xml.md5
View File

@ -1 +0,0 @@
0d631fa3e5f6be116e2894b875cb84a3

1
repo/com/bekvon/bukkit/residence/residence/maven-metadata-local.xml.sha1
View File

@ -1 +0,0 @@
831ca82cccbfc921495544182212b3eed99e18ba

24
repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/maven-metadata-local.xml Normal file
View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata modelVersion="1.1.0">
<groupId>net.t00thpick1</groupId>
<artifactId>residence</artifactId>
<version>3.0.0q-SNAPSHOT</version>
<versioning>
<snapshot>
<localCopy>true</localCopy>
</snapshot>
<lastUpdated>20140629150451</lastUpdated>
<snapshotVersions>
<snapshotVersion>
<extension>jar</extension>
<value>3.0.0q-SNAPSHOT</value>
<updated>20140629150451</updated>
</snapshotVersion>
<snapshotVersion>
<extension>pom</extension>
<value>3.0.0q-SNAPSHOT</value>
<updated>20140629150451</updated>
</snapshotVersion>
</snapshotVersions>
</versioning>
</metadata>

1
repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/maven-metadata-local.xml.md5 Normal file
View File

@ -0,0 +1 @@
d6395958ea8e8bfa44d476608b1fb990

1
repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/maven-metadata-local.xml.sha1 Normal file
View File

@ -0,0 +1 @@
f364e694abbd6efe96635a22b101157b0f5f2e6d

BIN
repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/residence-3.0.0q-SNAPSHOT.jar Normal file
View File

Binary file not shown.

1
repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/residence-3.0.0q-SNAPSHOT.jar.md5 Normal file
View File

@ -0,0 +1 @@
c17eb71c42adf83e9d7ecd19a56f46e3

1
repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/residence-3.0.0q-SNAPSHOT.jar.sha1 Normal file
View File

@ -0,0 +1 @@
cda76504b52d728ef3ebe4b90d3c212d71de7fb4

4
repo/com/bekvon/bukkit/residence/residence/2.6.6.3/residence-2.6.6.3.pom → repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/residence-3.0.0q-SNAPSHOT.pom
View File

@ -2,8 +2,8 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>com.bekvon.bukkit.residence</groupId>
<groupId>net.t00thpick1</groupId>
<artifactId>residence</artifactId>
<version>2.6.6.3</version>
<version>3.0.0q-SNAPSHOT</version>
<description>POM was created from install:install-file</description>
</project>

1
repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/residence-3.0.0q-SNAPSHOT.pom.md5 Normal file
View File

@ -0,0 +1 @@
88f1e831b70e82d15f327471103442e6

1
repo/net/t00thpick1/residence/3.0.0q-SNAPSHOT/residence-3.0.0q-SNAPSHOT.pom.sha1 Normal file
View File

@ -0,0 +1 @@
3d116d9d5e97e783ed1953f3fc320d212e3f0afc

7
repo/com/bekvon/bukkit/residence/residence/maven-metadata-local.xml → repo/net/t00thpick1/residence/maven-metadata-local.xml
View File

@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>com.bekvon.bukkit.residence</groupId>
<groupId>net.t00thpick1</groupId>
<artifactId>residence</artifactId>
<versioning>
<release>2.6.6.3</release>
<versions>
<version>2.6.6.3</version>
<version>3.0.0q-SNAPSHOT</version>
</versions>
<lastUpdated>20130308191747</lastUpdated>
<lastUpdated>20140629150451</lastUpdated>
</versioning>
</metadata>

1
repo/net/t00thpick1/residence/maven-metadata-local.xml.md5 Normal file
View File

@ -0,0 +1 @@
362ac5203d5aa3841a90caa7e0cf35df

1
repo/net/t00thpick1/residence/maven-metadata-local.xml.sha1 Normal file
View File

@ -0,0 +1 @@
1d6a3c2680f9e18250428165450aa32562e0ed98

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

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