Fork/mmocore
1
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity

Moved 'useSSL=false' over to default flags

Browse Source
This commit is contained in:
Indyuce 2020-03-19 12:13:35 +01:00
parent a3743f6fd3
commit 4c4889b600
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/net/Indyuce/mmocore/MMOCore.java
View File

@ -106,6 +106,13 @@ public class MMOCore extends JavaPlugin {
public RequestManager requestManager; public RequestManager requestManager;
public ConfigItemManager configItems; public ConfigItemManager configItems;
public SkillManager skillManager; 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 ClassManager classManager = new ClassManager();
public final DropTableManager dropTableManager = new DropTableManager(); public final DropTableManager dropTableManager = new DropTableManager();
public final CustomBlockManager mineManager = new CustomBlockManager(); public final CustomBlockManager mineManager = new CustomBlockManager();
@ -115,13 +122,6 @@ public class MMOCore extends JavaPlugin {
public final QuestManager questManager = new QuestManager(); public final QuestManager questManager = new QuestManager();
public final ProfessionManager professionManager = new ProfessionManager(); public final ProfessionManager professionManager = new ProfessionManager();
public final EntityManager entities = new EntityManager(); 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 * professions
@ -229,7 +229,7 @@ public class MMOCore extends JavaPlugin {
if (player.isOnline() && !player.getPlayer().isDead()) if (player.isOnline() && !player.getPlayer().isDead())
for (PlayerResource resource : PlayerResource.values()) { for (PlayerResource resource : PlayerResource.values()) {
double d = player.getProfess().getHandler(resource).getRegen(player); double d = player.getProfess().getHandler(resource).getRegen(player);
if (d > 0) if (d != 0)
resource.regen(player, d); resource.regen(player, d);
} }
} }

4
src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLDataProvider.java
View File

@ -68,11 +68,11 @@ public class MySQLDataProvider implements DataProvider {
port = config.getInt("port", 3306); port = config.getInt("port", 3306);
userid = config.getString("user", "mmolover"); userid = config.getString("user", "mmolover");
password = config.getString("pass", "ILoveAria"); password = config.getString("pass", "ILoveAria");
flags = config.getString("flags", "?allowReconnect=true"); flags = config.getString("flags", "?allowReconnect=true&useSSL=false");
} }
public String getConnectionString() { public String getConnectionString() {
return "jdbc:mysql://" + hostname + ":" + port + "/" + database + flags + "&useSSL=false"; return "jdbc:mysql://" + hostname + ":" + port + "/" + database + flags;
} }
public String getUser() { public String getUser() {

2
src/main/resources/config.yml
View File

@ -15,7 +15,7 @@ mysql:
port: 3306 port: 3306
user: mmolover user: mmolover
pass: ILoveAria pass: ILoveAria
flags: "?allowReconnect=true" flags: '?allowReconnect=true&useSSL=false'
# The list of all conditions which must be met for the # The list of all conditions which must be met for the
# BLOCK REGEN and BLOCK RESTRICTIONS to apply. # BLOCK REGEN and BLOCK RESTRICTIONS to apply.