Upstream/ChestShop-3
1
0
Fork 0
mirror of https://github.com/ChestShop-authors/ChestShop-3.git synced 2024-11-12 13:34:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Dan Mulloy 2017-01-16 13:53:21 -05:00 committed by GitHub
commit 87071ca384
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -146,10 +146,6 @@
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId> <artifactId>bukkit</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>

4
src/main/java/com/Acrobot/ChestShop/ChestShop.java
View File

@ -263,9 +263,9 @@ public class ChestShop extends JavaPlugin {
registerEvent(new ItemInfoListener()); registerEvent(new ItemInfoListener());
registerEvent(new GarbageTextListener()); registerEvent(new GarbageTextListener());
Plugin authMe = getServer().getPluginManager().getPlugin("AuthMe"); Plugin authMe = getServer().getPluginManager().getPlugin("AuthMe");
if (authMe != null && authMe.isEnabled()){ if (authMe != null && authMe.isEnabled()) {
registerEvent(new AuthMeChestShopListener()); registerEvent(new AuthMeChestShopListener());
} }