Skip to content
This repository was archived by the owner on May 27, 2024. It is now read-only.

Fix typo in custom_model_data and fix Vault #116

Merged
gmitch215 merged 10 commits into from
Oct 7, 2023
Merged

Fix typo in custom_model_data and fix Vault #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ad2fc11
Fix #114
AJH123 Oct 6, 2023
7544406
Fix another typo
AJH123 Oct 7, 2023
b135c59
Remove testing comments
AJH123 Oct 7, 2023
b5c048c
Fully Remove testing comments
AJH123 Oct 7, 2023
46890b0
Make vault load once database has
AJH123 Oct 7, 2023
57c5149
Merge branch 'ver/1.8.2' into master
Oct 7, 2023
19c7e95
Move vault and loadFiles into onLoad
AJH123 Oct 7, 2023
35fe1be
Merge branch 'master' of https://github.com/ajh123/Novaconomy
AJH123 Oct 7, 2023
6ea8312
Fix Plugin attempted to register task while disabled initializing
AJH123 Oct 7, 2023
625863f
Fix another register task while disabled initializing
AJH123 Oct 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/src/main/java/us/teaminceptus/novaconomy/api/corporation/Corporation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1096,7 +1096,7 @@ private static void checkTable() throws SQLException {

try {
if (!(rs = md.getColumns(null, null, "corporations", "custom_model_data")).next())
db.createStatement().execute("ALTER TABLE corporations ADD COLUMN custom_model_dat INT NOT NULL");
db.createStatement().execute("ALTER TABLE corporations ADD COLUMN custom_model_data INT NOT NULL");
} finally {
if (rs != null) rs.close();
}
Expand Down
33 changes: 20 additions & 13 deletions plugin/src/main/java/us/teaminceptus/novaconomy/Novaconomy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,6 @@ private void loadFiles() {
getLogger().info("Database found! Connecting...");

connectDB(true);
PING_DB_RUNNABLE.runTaskTimerAsynchronously(this, 60 * 20, 60 * 20);

getLogger().info("Connection Successful!");
convertToDatabase();
Expand Down Expand Up @@ -941,6 +940,9 @@ private static Map<String, Object> toMap(Map<String, Object> serial) {
@Override
public void onLoad() {
config = getConfig();
loadFiles();

getLogger().info("Loaded Files...");

if (hasVault()) {
getLogger().info("Vault Found! Hooking...");
Expand All @@ -960,9 +962,7 @@ public void onEnable() {
interest = config.getConfigurationSection("Interest");
ncauses = config.getConfigurationSection("NaturalCauses");

loadFiles();

getLogger().info("Loaded Files...");
loadTasks();

SERIALIZABLE.forEach(ConfigurationSerialization::registerClass);
getLogger().info("Initialized Serializables...");
Expand Down Expand Up @@ -1038,6 +1038,22 @@ public void onEnable() {
getLogger().info("Successfully loaded Novaconomy");
}

// Some tasks that were loaded by loadFiles or Vault are needed to be ran in onEnable
private void loadTasks() {
if (isDatabaseEnabled()) {
PING_DB_RUNNABLE.runTaskTimerAsynchronously(this, 60 * 20, 60 * 20);
}

boolean scheduled = false;
try {
RESTOCK_RUNNABLE.getTaskId();
scheduled = true;
} catch (IllegalStateException ignored) {}

if (isMarketEnabled() && isMarketRestockEnabled() && !scheduled)
RESTOCK_RUNNABLE.runTaskTimerAsynchronously(this, getMarketRestockInterval(), getMarketRestockInterval());
}

@Override
public void onDisable() {
writeMarket();
Expand Down Expand Up @@ -1996,15 +2012,6 @@ private void loadMarket() {
.map(Material::matchMaterial)
.filter(w::isItem)
.forEach(m -> stock.putIfAbsent(m, getMarketRestockAmount()));

boolean scheduled = false;
try {
RESTOCK_RUNNABLE.getTaskId();
scheduled = true;
} catch (IllegalStateException ignored) {}

if (isMarketEnabled() && isMarketRestockEnabled() && !scheduled)
RESTOCK_RUNNABLE.runTaskTimerAsynchronously(this, getMarketRestockInterval(), getMarketRestockInterval());
}

private void writeMarket() {
Expand Down