Removed health scaling (moved to MMOLib)

src/main/java/net/Indyuce/mmocore/MMOCore.java

@@ -52,7 +52,6 @@ import net.Indyuce.mmocore.listener.PlayerListener;
 import net.Indyuce.mmocore.listener.SpellCast;
 import net.Indyuce.mmocore.listener.WaypointsListener;
 import net.Indyuce.mmocore.listener.option.DeathExperienceLoss;
-import net.Indyuce.mmocore.listener.option.HealthScale;
 import net.Indyuce.mmocore.listener.option.NoSpawnerEXP;
 import net.Indyuce.mmocore.listener.option.RedirectVanillaExp;
 import net.Indyuce.mmocore.listener.option.VanillaExperienceOverride;
@@ -147,8 +146,7 @@ public class MMOCore extends JavaPlugin {
 		if (Bukkit.getPluginManager().getPlugin("Citizens") != null)
 			loadManager.registerLoader(new CitizensMMOLoader());
 
-		if (Bukkit.getPluginManager().getPlugin("Vault") != null)
+		if (Bukkit.getPluginManager().getPlugin("Vault") != null) loadManager.registerLoader(new VaultMMOLoader());
-			loadManager.registerLoader(new VaultMMOLoader());
 
 		if (Bukkit.getPluginManager().getPlugin("MythicMobs") != null)
 			loadManager.registerLoader(new MythicMobsMMOLoader());
@@ -157,8 +155,7 @@ public class MMOCore extends JavaPlugin {
 		 * WorldGuard closes the flag registry after 'onLoad()', so it must be
 		 * registered here or it will throw an IllegalStateException
 		 */
-		if (Bukkit.getPluginManager().getPlugin("WorldGuard") != null)
+		if (Bukkit.getPluginManager().getPlugin("WorldGuard") != null) flagPlugin = new WorldGuardFlags();
-			flagPlugin = new WorldGuardFlags();
 	}
 
 	public void onEnable() {
@@ -179,8 +176,7 @@ public class MMOCore extends JavaPlugin {
 		if (getConfig().isConfigurationSection("default-playerdata"))
 			dataProvider.getDataManager().loadDefaultData(getConfig().getConfigurationSection("default-playerdata"));
 
-		if (Bukkit.getPluginManager().getPlugin("Vault") != null)
+		if (Bukkit.getPluginManager().getPlugin("Vault") != null) economy = new VaultEconomy();
-			economy = new VaultEconomy();
 
 		if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) {
 			placeholderParser = new PlaceholderAPIParser();
@@ -231,8 +227,7 @@ public class MMOCore extends JavaPlugin {
 					if (player.isOnline() && !player.getPlayer().isDead())
 						for (PlayerResource resource : PlayerResource.values()) {
 							double d = player.getProfess().getHandler(resource).getRegen(player);
-							if (d != 0)
+							if (d != 0) resource.regen(player, d);
-								resource.regen(player, d);
 						}
 			}
 		}.runTaskTimer(MMOCore.plugin, 100, 20);
@@ -244,8 +239,7 @@ public class MMOCore extends JavaPlugin {
 		new BukkitRunnable() {
 			public void run() {
 				for (LootChest chest : new HashSet<>(lootChests.getActive()))
-					if (chest.shouldExpire())
+					if (chest.shouldExpire()) chest.unregister(false);
-						chest.unregister(false);
 			}
 		}.runTaskTimer(this, 5 * 60 * 20, 5 * 60 * 20);
 
@@ -255,11 +249,9 @@ public class MMOCore extends JavaPlugin {
 		 * not reading the installation guide...
 		 */
 		if (Bukkit.getPluginManager().getPlugin("MMOItemsMana") != null) {
-			getLogger().log(Level.SEVERE,
+			getLogger().log(Level.SEVERE, ChatColor.DARK_RED + "MMOCore is not meant to be used with MMOItems ManaAndStamina");
-					ChatColor.DARK_RED + "MMOCore is not meant to be used with MMOItems ManaAndStamina");
 			getLogger().log(Level.SEVERE, ChatColor.DARK_RED + "Please read the installation guide!");
-			Bukkit.broadcastMessage(
+			Bukkit.broadcastMessage(ChatColor.DARK_RED + "[MMOCore] MMOCore is not meant to be used with MMOItems ManaAndStamina");
-					ChatColor.DARK_RED + "[MMOCore] MMOCore is not meant to be used with MMOItems ManaAndStamina");
 			Bukkit.broadcastMessage(ChatColor.DARK_RED + "[MMOCore] Please read the installation guide!");
 			return;
 		}
@@ -267,8 +259,7 @@ public class MMOCore extends JavaPlugin {
 		reloadPlugin();
 
 		if (getConfig().getBoolean("vanilla-exp-redirection.enabled"))
-			Bukkit.getPluginManager().registerEvents(
+			Bukkit.getPluginManager().registerEvents(new RedirectVanillaExp(getConfig().getDouble("vanilla-exp-redirection.ratio")), this);
-					new RedirectVanillaExp(getConfig().getDouble("vanilla-exp-redirection.ratio")), this);
 
 		/*
 		 * enable debug mode for extra debug tools.
@@ -281,9 +272,6 @@ public class MMOCore extends JavaPlugin {
 		if (configManager.overrideVanillaExp = getConfig().getBoolean("override-vanilla-exp"))
 			Bukkit.getPluginManager().registerEvents(new VanillaExperienceOverride(), this);
 
-		if (getConfig().getBoolean("health-scale.enabled"))
-			Bukkit.getPluginManager().registerEvents(new HealthScale(), this);
-
 		if (getConfig().getBoolean("prevent-spawner-xp"))
 			Bukkit.getPluginManager().registerEvents(new NoSpawnerEXP(), this);
 
@@ -449,8 +437,7 @@ public class MMOCore extends JavaPlugin {
 	}
 
 	public static void debug(int value, Level level, String message) {
-		if (DebugMode.level > (value - 1))
+		if (DebugMode.level > (value - 1)) plugin.getLogger().log(level, message);
-			plugin.getLogger().log(level, message);
 	}
 
 	public File getJarFile() {

src/main/java/net/Indyuce/mmocore/listener/option/HealthScale.java

@@ -1,19 +0,0 @@
-package net.Indyuce.mmocore.listener.option;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerJoinEvent;
-
-import net.Indyuce.mmocore.MMOCore;
-
-public class HealthScale implements Listener {
-	private final double scale = MMOCore.plugin.getConfig().getDouble("health-scale.scale");
-
-	@EventHandler
-	public void a(PlayerJoinEvent event) {
-		Player player = event.getPlayer();
-		player.setHealthScaled(true);
-		player.setHealthScale(scale);
-	}
-}