1
0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2026-02-21 11:13:00 +01:00

Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable

This commit is contained in:
nossr50
2019-06-26 21:55:41 -07:00
50 changed files with 1771 additions and 1301 deletions

View File

@@ -39,6 +39,7 @@ import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
import com.gmail.nossr50.util.skills.RankUtils;
import com.gmail.nossr50.util.skills.SkillUtils;
import com.gmail.nossr50.worldguard.WorldGuardManager;
import com.gmail.nossr50.worldguard.WorldGuardUtils;
import net.shatteredlands.shatt.backup.ZipLibrary;
import org.bstats.bukkit.Metrics;
import org.bukkit.Bukkit;
@@ -67,6 +68,7 @@ public class mcMMO extends JavaPlugin {
private static NotificationManager notificationManager;
private static CommandRegistrationManager commandRegistrationManager;
private static NBTManager nbtManager;
private static WorldGuardManager worldGuardManager;
/* File Paths */
private static String mainDirectory;
@@ -196,9 +198,13 @@ public class mcMMO extends JavaPlugin {
}
@Override
public void onLoad() {
if (getServer().getPluginManager().getPlugin("WorldGuard") != null)
WorldGuardManager.getInstance().registerFlags();
public void onLoad()
{
worldGuardManager = new WorldGuardManager();
if(getServer().getPluginManager().getPlugin("WorldGuard") != null) {
worldGuardManager.registerFlags();
}
}
/**
@@ -610,4 +616,8 @@ public class mcMMO extends JavaPlugin {
public static NotificationManager getNotificationManager() {
return notificationManager;
}
public WorldGuardManager getWorldGuardManager() {
return worldGuardManager;
}
}