EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-11-04 02:53:43 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4152 from FlXME/master

Browse Source 
Fix various bugs
This commit is contained in:
Robert Alan Chapton
2020-05-01 14:29:35 -07:00
committed by GitHub
parent e4a76e667d 69a4ec80cd
commit 53c5fb7328
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/gmail/nossr50/config/WorldBlacklist.java
View File

@@ -54,15 +54,15 @@ public class WorldBlacklist {
if(!blacklist.contains(currentLine)) if(!blacklist.contains(currentLine))
blacklist.add(currentLine); blacklist.add(currentLine);
} }
//Close readers
bufferedReader.close();
fileReader.close();
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
e.printStackTrace(); e.printStackTrace();
} catch (IOException e) } catch (IOException e)
{ {
e.printStackTrace(); e.printStackTrace();
} finally {
//Close readers
if(bufferedReader != null) bufferedReader.close();
if(fileReader != null) fileReader.close();
} }
plugin.getLogger().info(blacklist.size()+" entries in mcMMO World Blacklist"); plugin.getLogger().info(blacklist.size()+" entries in mcMMO World Blacklist");

2
src/main/java/com/gmail/nossr50/util/blockmeta/HashChunkletManager.java
View File

@@ -346,7 +346,7 @@ public class HashChunkletManager implements ChunkletManager {
try { try {
fileIn = new FileInputStream(location); fileIn = new FileInputStream(location);
objIn = new ObjectInputStream(fileIn); objIn = new ObjectInputStream(new BufferedInputStream(fileIn));
storeIn = (ChunkletStore) objIn.readObject(); storeIn = (ChunkletStore) objIn.readObject();
} }
catch (IOException ex) { catch (IOException ex) {

2
src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionMain.java
View File

@@ -75,7 +75,7 @@ public class BlockStoreConversionMain implements Runnable {
public void softStop() { public void softStop() {
stop(); stop();
if (this.dataDir.exists() || this.dataDir.isDirectory()) { if (this.dataDir.exists() && this.dataDir.isDirectory()) {
start(); start();
return; return;
} }

4
src/main/java/com/gmail/nossr50/util/uuid/UUIDFetcher.java
View File

@@ -49,7 +49,9 @@ public class UUIDFetcher implements Callable<Map<String, UUID>> {
String body = array.toString(); String body = array.toString();
writeBody(connection, body); writeBody(connection, body);
JsonObject[] jsonStreamArray = gson.fromJson(new InputStreamReader(connection.getInputStream()), JsonObject[].class); InputStreamReader tempStream = new InputStreamReader(connection.getInputStream());
JsonObject[] jsonStreamArray = gson.fromJson(tempStream, JsonObject[].class);
tempStream.close();
for (JsonObject jsonProfile : jsonStreamArray) { for (JsonObject jsonProfile : jsonStreamArray) {
String id = jsonProfile.get("id").getAsString(); String id = jsonProfile.get("id").getAsString();