Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-11-19 10:25:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

NullPointer fix for /schematic list (#781)

Browse Source 
* fixed null pointer

* fixed rest of similarly caused null pointers

* checkstyle
This commit is contained in:
Ivan Volkov 2020-12-13 09:20:10 -05:00 committed by GitHub
parent bfc657d3f6
commit 04ba545aa2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java
View File

@ -601,11 +601,14 @@ public class SchematicCommands {
long totalBytes = 0; long totalBytes = 0;
File parentDir = new File(dir.getAbsolutePath() + (playerFolder ? File.separator + uuid.toString() : "")); File parentDir = new File(dir.getAbsolutePath() + (playerFolder ? File.separator + uuid.toString() : ""));
try { try {
for (File schem : getFiles(parentDir, null, null)) { List<File> toAddUp = getFiles(parentDir, null, null);
if (toAddUp != null && toAddUp.size() != 0) {
for (File schem : toAddUp) {
if (schem.getName().endsWith(".schem") || schem.getName().endsWith(".schematic")) { if (schem.getName().endsWith(".schem") || schem.getName().endsWith(".schematic")) {
totalBytes += Files.size(Paths.get(schem.getAbsolutePath())); totalBytes += Files.size(Paths.get(schem.getAbsolutePath()));
} }
} }
}
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -736,15 +739,15 @@ public class SchematicCommands {
int numFiles = -1; int numFiles = -1;
if (checkFilesize) { if (checkFilesize) {
File parentDir = new File(file.getParent()); List<File> toAddUp = getFiles(rootDir, null, null);
if (toAddUp != null && toAddUp.size() != 0) {
for (File child : getFiles(rootDir, null, null)) { for (File child : toAddUp) {
if (child.getName().endsWith(".schem") || child.getName().endsWith(".schematic")) { if (child.getName().endsWith(".schem") || child.getName().endsWith(".schematic")) {
directorysizeKb += Files.size(Paths.get(child.getAbsolutePath())) / 1000.0; directorysizeKb += Files.size(Paths.get(child.getAbsolutePath())) / 1000.0;
numFiles++; numFiles++;
} }
} }
}
if (overwrite) { if (overwrite) {
oldKbOverwritten = Files.size(Paths.get(file.getAbsolutePath())) / 1000.0; oldKbOverwritten = Files.size(Paths.get(file.getAbsolutePath())) / 1000.0;
int iter = 1; int iter = 1;
@ -760,12 +763,15 @@ public class SchematicCommands {
if (numFiles == -1) { if (numFiles == -1) {
numFiles = 0; numFiles = 0;
for (File child : getFiles(rootDir, null, null)) { List<File> toAddUp = getFiles(rootDir, null, null);
if (toAddUp != null && toAddUp.size() != 0) {
for (File child : toAddUp) {
if (child.getName().endsWith(".schem") || child.getName().endsWith(".schematic")) { if (child.getName().endsWith(".schem") || child.getName().endsWith(".schematic")) {
numFiles++; numFiles++;
} }
} }
} }
}
int limit = Settings.IMP.EXPERIMENTAL.PER_PLAYER_FILE_NUM_LIMIT; int limit = Settings.IMP.EXPERIMENTAL.PER_PLAYER_FILE_NUM_LIMIT;
if (numFiles >= limit) { if (numFiles >= limit) {