diff --git a/src/main/java/net/Indyuce/mmocore/MMOCore.java b/src/main/java/net/Indyuce/mmocore/MMOCore.java index b37ef5a4..ab7c053a 100644 --- a/src/main/java/net/Indyuce/mmocore/MMOCore.java +++ b/src/main/java/net/Indyuce/mmocore/MMOCore.java @@ -106,6 +106,13 @@ public class MMOCore extends JavaPlugin { public RequestManager requestManager; public ConfigItemManager configItems; public SkillManager skillManager; + public VaultEconomy economy; + public HologramSupport hologramSupport; + public InventoryManager inventoryManager; + public RegionHandler regionHandler; + public PlayerActionBar actionBarManager; + public PlaceholderParser placeholderParser = new DefaultParser(); + public DataProvider dataProvider = new YAMLDataProvider(); public final ClassManager classManager = new ClassManager(); public final DropTableManager dropTableManager = new DropTableManager(); public final CustomBlockManager mineManager = new CustomBlockManager(); @@ -115,13 +122,6 @@ public class MMOCore extends JavaPlugin { public final QuestManager questManager = new QuestManager(); public final ProfessionManager professionManager = new ProfessionManager(); public final EntityManager entities = new EntityManager(); - public VaultEconomy economy; - public HologramSupport hologramSupport; - public PlaceholderParser placeholderParser = new DefaultParser(); - public InventoryManager inventoryManager; - public RegionHandler regionHandler; - public PlayerActionBar actionBarManager; - public DataProvider dataProvider = new YAMLDataProvider(); /* * professions @@ -229,7 +229,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); } } diff --git a/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLDataProvider.java b/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLDataProvider.java index 6d2fdd3f..f79235e6 100644 --- a/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLDataProvider.java +++ b/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLDataProvider.java @@ -68,11 +68,11 @@ public class MySQLDataProvider implements DataProvider { port = config.getInt("port", 3306); userid = config.getString("user", "mmolover"); password = config.getString("pass", "ILoveAria"); - flags = config.getString("flags", "?allowReconnect=true"); + flags = config.getString("flags", "?allowReconnect=true&useSSL=false"); } public String getConnectionString() { - return "jdbc:mysql://" + hostname + ":" + port + "/" + database + flags + "&useSSL=false"; + return "jdbc:mysql://" + hostname + ":" + port + "/" + database + flags; } public String getUser() { diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 70dcdaff..963a3679 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -15,7 +15,7 @@ mysql: port: 3306 user: mmolover pass: ILoveAria - flags: "?allowReconnect=true" + flags: '?allowReconnect=true&useSSL=false' # The list of all conditions which must be met for the # BLOCK REGEN and BLOCK RESTRICTIONS to apply.