Repo-Mirror/rpgregions-2
9
0
Fork 0
mirror of https://gitlab.com/SamB440/rpgregions-2.git synced 2025-12-28 03:09:14 +00:00
Code Issues Releases Activity

Fix server stop errors

Browse Source
This commit is contained in:
SamB440
2020-01-01 16:07:19 +00:00
parent e6427dad4e
commit e789abc343
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle
View File

@@ -37,6 +37,7 @@ dependencies {
implementation 'co.aikar:idb-core:1.0.0-SNAPSHOT'
implementation 'com.zaxxer:HikariCP:2.4.1'
implementation 'org.apache.commons:commons-lang3:3.6'
implementation 'mysql:mysql-connector-java:5.1.33'
compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.2-SNAPSHOT'
compileOnly name: 'languagy-1.2.6'
}

2
src/main/java/net/islandearth/rpgregions/RPGRegions.java
View File

@@ -47,7 +47,7 @@ public final class RPGRegions extends JavaPlugin implements RPGRegionsAPI, Langu
public void onDisable() {
// Save all player data (quit event not called for shutdown)
Bukkit.getOnlinePlayers().forEach(player -> {
this.getManagers().getStorageManager().removeCachedAccount(player.getUniqueId());
if (plugin.getManagers().getStorageManager().getCachedAccounts().containsKey(player.getUniqueId())) this.getManagers().getStorageManager().removeCachedAccount(player.getUniqueId());
});
// Save all region configs

3
src/main/java/net/islandearth/rpgregions/managers/data/RPGRegionsCache.java
View File

@@ -1,6 +1,5 @@
package net.islandearth.rpgregions.managers.data;
import com.google.common.collect.ImmutableMap;
import net.islandearth.rpgregions.RPGRegions;
import net.islandearth.rpgregions.managers.data.region.ConfiguredRegion;
import org.jetbrains.annotations.Nullable;
@@ -31,6 +30,6 @@ public class RPGRegionsCache {
}
public Map<String, ConfiguredRegion> getConfiguredRegions() {
return ImmutableMap.copyOf(configuredRegions);
return configuredRegions;
}
}

2
src/main/java/net/islandearth/rpgregions/managers/data/sql/SqlStorage.java
View File

@@ -29,7 +29,7 @@ public class SqlStorage implements StorageManager {
DatabaseOptions options = DatabaseOptions.builder().mysql(plugin.getConfig().getString("settings.sql.user"),
plugin.getConfig().getString("settings.sql.pass"),
plugin.getConfig().getString("settings.sql.db"),
plugin.getConfig().getString("sql.host") + ":" + plugin.getConfig().getString("sql.port")).build();
plugin.getConfig().getString("settings.sql.host") + ":" + plugin.getConfig().getString("settings.sql.port")).build();
Database db = PooledDatabaseOptions.builder().options(options).createHikariDatabase();
DB.setGlobalDatabase(db);
try {