ChromaGaming/LimitedCreative
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases 2 Packages Wiki Activity

Reintegrated AuthMe Inventory-Events

Browse source
This commit is contained in:
Jascha Starke 2013-09-14 15:13:53 +02:00
parent 57ad7aaa8d
commit 8e9dcd59f8
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pom.xml
View file

@ -84,7 +84,7 @@
<!-- http://dev.bukkit.org/server-mods/authme-reloaded/ --> <!-- http://dev.bukkit.org/server-mods/authme-reloaded/ -->
<groupId>uk.org.whoami</groupId> <groupId>uk.org.whoami</groupId>
<artifactId>authme</artifactId> <artifactId>authme</artifactId>
<version>2.7.12</version> <version>2.9.3</version>
</dependency> </dependency>
<dependency> <dependency>
<!-- http://dev.bukkit.org/server-mods/multiverse-core/ --> <!-- http://dev.bukkit.org/server-mods/multiverse-core/ -->
@ -146,7 +146,8 @@
<softdepend> <softdepend>
<param>WorldGuard</param> <param>WorldGuard</param>
<param>WorldEdit</param> <param>WorldEdit</param>
<param>MultiInv</param> <param>Multiverse-Core</param>
<param>Multiworld</param>
<param>xAuth</param> <param>xAuth</param>
<param>AuthMe</param> <param>AuthMe</param>
<param>MultiInv</param> <param>MultiInv</param>

5
src/main/java/de/jaschastarke/minecraft/limitedcreative/ModInventories.java
View file

@ -10,6 +10,7 @@ import org.bukkit.inventory.ItemStack;
import de.jaschastarke.bukkit.lib.CoreModule; import de.jaschastarke.bukkit.lib.CoreModule;
import de.jaschastarke.minecraft.limitedcreative.inventories.ArmoryConfig; import de.jaschastarke.minecraft.limitedcreative.inventories.ArmoryConfig;
import de.jaschastarke.minecraft.limitedcreative.inventories.AuthMeInventories;
import de.jaschastarke.minecraft.limitedcreative.inventories.Inventory; import de.jaschastarke.minecraft.limitedcreative.inventories.Inventory;
import de.jaschastarke.minecraft.limitedcreative.inventories.InventoryConfig; import de.jaschastarke.minecraft.limitedcreative.inventories.InventoryConfig;
import de.jaschastarke.minecraft.limitedcreative.inventories.InventoryPermissions; import de.jaschastarke.minecraft.limitedcreative.inventories.InventoryPermissions;
@ -45,7 +46,9 @@ public class ModInventories extends CoreModule<LimitedCreative> {
entry.initialState = ModuleState.DISABLED; entry.initialState = ModuleState.DISABLED;
return; return;
} }
if (plugin.getServer().getPluginManager().isPluginEnabled("AuthMe")) {
addModule(new AuthMeInventories(plugin, this));
}
String incomp = Hooks.InventoryIncompatible.test(); String incomp = Hooks.InventoryIncompatible.test();
if (config.getEnabled() && incomp != null) { if (config.getEnabled() && incomp != null) {
getLog().warn(plugin.getLocale().trans("inventory.warning.conflict", incomp, this.getName())); getLog().warn(plugin.getLocale().trans("inventory.warning.conflict", incomp, this.getName()));