Mirror von
https://github.com/IntellectualSites/FastAsyncWorldEdit.git
synchronisiert 2024-09-06 16:12:51 +02:00
Removed redundant null checks and fixed a potential file separator issue
Dieser Commit ist enthalten in:
Ursprung
277046d5c9
Commit
4c1d0bc9a6
@ -188,7 +188,7 @@ public class FaweAPI {
|
||||
if (!file.getName().toLowerCase(Locale.ROOT).endsWith(".bd")) {
|
||||
throw new IllegalArgumentException("Not a BD file!");
|
||||
}
|
||||
String[] path = file.getPath().split(File.separator);
|
||||
String[] path = file.getPath().split(File.separatorChar=='\\' ? "\\\\" : File.separator);
|
||||
if (path.length < 3) {
|
||||
throw new IllegalArgumentException("Not in history directory!");
|
||||
}
|
||||
|
@ -77,11 +77,9 @@ public class FastByteArrayOutputStream extends OutputStream {
|
||||
// Check if we have a list of buffers
|
||||
int pos = 0;
|
||||
|
||||
if (buffers != null) {
|
||||
for (byte[] bytes : buffers) {
|
||||
System.arraycopy(bytes, 0, data, pos, bytes.length);
|
||||
pos += bytes.length;
|
||||
}
|
||||
for (byte[] bytes : buffers) {
|
||||
System.arraycopy(bytes, 0, data, pos, bytes.length);
|
||||
pos += bytes.length;
|
||||
}
|
||||
|
||||
// write the internal buffer directly
|
||||
|
@ -59,12 +59,11 @@ public abstract class BlockBag {
|
||||
}
|
||||
fetchBlock(blockState);
|
||||
} catch (OutOfBlocksException e) {
|
||||
BlockState placed = blockState; // TODO BlockType.getBlockBagItem(id, data);
|
||||
if (placed == null || placed.getBlockType().getMaterial().isAir()) {
|
||||
if (blockState.getBlockType().getMaterial().isAir()) {
|
||||
throw e; // TODO: check
|
||||
}
|
||||
|
||||
fetchBlock(placed);
|
||||
fetchBlock(blockState);
|
||||
}
|
||||
}
|
||||
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren