Move some methods out of config and check properly if movecraft class…

…es are present
Intybyte · Dec 4, 2024 · 9fa4587 · 9fa4587
1 parent 1a281dd
commit 9fa4587
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/cannons-bukkit/src/main/java/at/pavlov/cannons/Cannons.java b/cannons-bukkit/src/main/java/at/pavlov/cannons/Cannons.java
@@ -85,9 +85,19 @@ public static Cannons getPlugin() {
 
 	public void onLoad() {
 		//must be done in onLoad because "movecraft"
+		this.config = new Config(this);
+
+		if (!config.isMovecraftEnabled()) {
+			return;
+		}
+
 		try {
-			MaxCannonsProperty.register();
-		} catch (Exception ignored) {}
+			Class.forName("net.countercraft.movecraft.craft.type.property.Property");
+		} catch (Exception ignored) {
+			return;
+		}
+
+		MaxCannonsProperty.register();
 	}
 
 	public void onDisable() {
@@ -118,10 +128,14 @@ public void onDisable() {
 	public void onEnable()
 	{
 		DesignStorage.initialize(this);
-		this.config = new Config(this);
 		ProjectileManager.initialize(this);
 		CannonSelector.initialize(this);
 
+		DesignStorage.getInstance().loadCannonDesigns();
+		config.getProjectileStorage().loadProjectiles();
+		config.getCannonManager().updateCannons();
+		config.getUserMessage().loadLanguage();
+
 		pm = getServer().getPluginManager();
 		if (!checkWorldEdit())
 		{

diff --git a/cannons-bukkit/src/main/java/at/pavlov/cannons/config/Config.java b/cannons-bukkit/src/main/java/at/pavlov/cannons/config/Config.java
@@ -211,10 +211,7 @@ public void loadConfig()
         setCancelItems(ParseUtils.toItemHolderList(config.getStringList("cancelEventForLoadingItem")));
 
 		//load other configs
-        DesignStorage.getInstance().loadCannonDesigns();
-		projectileStorage.loadProjectiles();
-        cannonManager.updateCannons();
-		userMessage.loadLanguage();
+
         plugin.setDebugMode(debugMode);
 	}