Repo-Mirror/rpgregions-2
9
0
Fork 0
mirror of https://gitlab.com/SamB440/rpgregions-2.git synced 2025-12-27 02:39:07 +00:00
Code Issues Releases Activity

Code cleanup

Browse Source
This commit is contained in:
SamB440
2021-03-31 12:47:20 +01:00
parent 5a81311476
commit 5118fdd5af
5 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/src/main/java/net/islandearth/rpgregions/managers/data/region/ConfiguredRegion.java
View File

@@ -318,11 +318,11 @@ public class ConfiguredRegion {
try {
File file = this.findFile(plugin);
if (file == null) file = new File(plugin.getDataFolder() + "/regions/" + this.id + ".json");
Writer writer = new FileWriter(file);
Gson gson = plugin.getGson();
gson.toJson(this, writer);
writer.flush();
writer.close();
try (Writer writer = new FileWriter(file)) {
Gson gson = plugin.getGson();
gson.toJson(this, writer);
writer.flush();
}
} catch (IOException e) {
e.printStackTrace();
}

1
api/src/main/java/net/islandearth/rpgregions/requirements/PreventType.java
View File

@@ -10,6 +10,7 @@ public enum PreventType {
PUSH;
public void prevent(PlayerMoveEvent event) {
if (event.getTo() == null) return;
Player player = event.getPlayer();
switch (this) {
case TELEPORT:

7
rpgregions/src/main/java/net/islandearth/rpgregions/commands/RPGRegionsCommand.java
View File

@@ -148,11 +148,10 @@ public class RPGRegionsCommand extends BaseCommand {
for (File file : folder.listFiles()) {
// Exclude non-json files
if (file.getName().endsWith(".json")) {
try {
Reader reader = new FileReader(file);
try (Reader reader = new FileReader(file)) {
ConfiguredRegion region = plugin.getGson().fromJson(reader, ConfiguredRegion.class);
if (!region.getId().equals("exampleconfig")) plugin.getManagers().getRegionsCache().addConfiguredRegion(region);
reader.close();
if (!region.getId().equals("exampleconfig"))
plugin.getManagers().getRegionsCache().addConfiguredRegion(region);
} catch (Exception e) {
plugin.getLogger().severe("Error loading region config " + file.getName() + ":");
e.printStackTrace();

4
rpgregions/src/main/java/net/islandearth/rpgregions/managers/RPGRegionsManagers.java
View File

@@ -127,11 +127,9 @@ public class RPGRegionsManagers implements IRPGRegionsManagers {
}
// Exclude non-json files
if (file.getName().endsWith(".json")) {
try {
Reader reader = new FileReader(file);
try (Reader reader = new FileReader(file)) {
ConfiguredRegion region = plugin.getGson().fromJson(reader, ConfiguredRegion.class);
if (!region.getId().equals("exampleconfig")) regionsCache.addConfiguredRegion(region);
reader.close();
} catch (Exception e) {
plugin.getLogger().severe("Error loading region config " + file.getName() + ":");
e.printStackTrace();

2
rpgregions/src/main/java/net/islandearth/rpgregions/managers/data/yml/YamlStorage.java
View File

@@ -51,7 +51,7 @@ public class YamlStorage implements IStorageManager {
}
RPGRegionsAccount account = new RPGRegionsAccount(uuid, regions);
cachedAccounts.put(uuid, account);
cachedAccounts.putIfAbsent(uuid, account);
future.complete(account);
long endTime = System.currentTimeMillis();
long totalTime = endTime - startTime;