amalthea-mc/ShopChest
1
0
Fork 0
mirror of https://github.com/amalthea-mc/ShopChest.git synced 2024-11-09 20:21:07 +00:00
Code Issues Projects Releases Wiki Activity

Fix AreaShop integration for regions using capital characters in their name (#190)

Browse Source 
* Use a system dependency for AuthMe (maven repository is down)

* Use maven repository for AreaShop instead of including the jar

https://jenkins.wiefferink.me hosts the maven repository of AreaShop, so it is better to use that

* Fix AreaShop integration for regions that use capital characters
This commit is contained in:
Thijs Wiefferink 2018-05-21 09:40:40 +02:00 committed by EpicEric
parent 3ae16b0c61
commit cf4d1716b8
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/AreaShop-2.4.0.jar
View File

Binary file not shown.

BIN
lib/AuthMe-5.4.0.jar Normal file
View File

Binary file not shown.

12
pom.xml
View File

@ -135,6 +135,10 @@
<id>jitpack-repo</id> <id>jitpack-repo</id>
<url>https://jitpack.io</url> <url>https://jitpack.io</url>
</repository> </repository>
<repository>
<id>nlthijs48-repo</id>
<url>https://jenkins.wiefferink.me</url>
</repository>
</repositories> </repositories>
<dependencies> <dependencies>
@ -158,8 +162,9 @@
<dependency> <dependency>
<groupId>fr.xephi</groupId> <groupId>fr.xephi</groupId>
<artifactId>authme</artifactId> <artifactId>authme</artifactId>
<version>5.2</version> <version>5.4.0</version>
<scope>provided</scope> <scope>system</scope>
<systemPath>${project.basedir}/lib/AuthMe-5.4.0.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.plotsquared</groupId> <groupId>com.plotsquared</groupId>
@ -210,8 +215,7 @@
<groupId>me.wiefferink</groupId> <groupId>me.wiefferink</groupId>
<artifactId>areashop</artifactId> <artifactId>areashop</artifactId>
<version>2.4.0</version> <version>2.4.0</version>
<scope>system</scope> <scope>provided</scope>
<systemPath>${project.basedir}/lib/AreaShop-2.4.0.jar</systemPath>
</dependency> </dependency>
</dependencies> </dependencies>

2
src/main/java/de/epiceric/shopchest/listeners/AreaShopListener.java
View File

@ -60,7 +60,7 @@ public class AreaShopListener implements Listener {
if (!shop.getLocation().getWorld().getName().equals(generalRegion.getWorldName())) continue; if (!shop.getLocation().getWorld().getName().equals(generalRegion.getWorldName())) continue;
for (ProtectedRegion r : regionManager.getApplicableRegions(shop.getLocation())) { for (ProtectedRegion r : regionManager.getApplicableRegions(shop.getLocation())) {
if (generalRegion.getName().equals(r.getId())) { if (generalRegion.getLowerCaseName().equals(r.getId())) {
plugin.getShopUtils().removeShop(shop, true); plugin.getShopUtils().removeShop(shop, true);
break; break;
} }