Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 09:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correctly check for null values in EditSession.replaceBlocks()

Browse Source
This commit is contained in:
zml2008 2012-02-05 16:26:19 -08:00
parent 2f2d3f8045
commit 4bb5b56da8
1 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/sk89q/worldedit/EditSession.java
View File

@ -1248,6 +1248,7 @@ public class EditSession {
Set<BaseBlock> definiteBlockTypes = new HashSet<BaseBlock>(); Set<BaseBlock> definiteBlockTypes = new HashSet<BaseBlock>();
Set<Integer> fuzzyBlockTypes = new HashSet<Integer>(); Set<Integer> fuzzyBlockTypes = new HashSet<Integer>();
if (fromBlockTypes != null) {
for (BaseBlock block : fromBlockTypes) { for (BaseBlock block : fromBlockTypes) {
if (block.getData() == -1) { if (block.getData() == -1) {
fuzzyBlockTypes.add(block.getType()); fuzzyBlockTypes.add(block.getType());
@ -1255,6 +1256,7 @@ public class EditSession {
definiteBlockTypes.add(block); definiteBlockTypes.add(block);
} }
} }
}
int affected = 0; int affected = 0;
@ -1275,10 +1277,18 @@ public class EditSession {
for (int z = minZ; z <= maxZ; ++z) { for (int z = minZ; z <= maxZ; ++z) {
Vector pt = new Vector(x, y, z); Vector pt = new Vector(x, y, z);
BaseBlock curBlockType = getBlock(pt); BaseBlock curBlockType = getBlock(pt);
if (fromBlockTypes == null) {
//replace <to-block>
if (curBlockType.isAir()) {
continue;
}
} else {
//replace <from-block> <to-block> //replace <from-block> <to-block>
if (!definiteBlockTypes.contains(curBlockType) && !fuzzyBlockTypes.contains(curBlockType.getType())) { if (!definiteBlockTypes.contains(curBlockType) && !fuzzyBlockTypes.contains(curBlockType.getType())) {
continue; continue;
} }
}
if (setBlock(pt, toBlock)) { if (setBlock(pt, toBlock)) {
++affected; ++affected;
@ -1290,10 +1300,17 @@ public class EditSession {
for (Vector pt : region) { for (Vector pt : region) {
BaseBlock curBlockType = getBlock(pt); BaseBlock curBlockType = getBlock(pt);
if (fromBlockTypes == null) {
//replace <to-block>
if (curBlockType.isAir()) {
continue;
}
} else {
//replace <from-block> <to-block> //replace <from-block> <to-block>
if (!definiteBlockTypes.contains(curBlockType) && !fuzzyBlockTypes.contains(curBlockType.getType())) { if (!definiteBlockTypes.contains(curBlockType) && !fuzzyBlockTypes.contains(curBlockType.getType())) {
continue; continue;
} }
}
if (setBlock(pt, toBlock)) { if (setBlock(pt, toBlock)) {
++affected; ++affected;