Merge branch 'master' into master

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

View File

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

View File

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