Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-07 17:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #437 from JOO200/master

Browse Source 
Add check for unchanged materials in BlockBagExtent
This commit is contained in:
Matthew Miller 2018-12-06 15:07:14 +10:00 committed by GitHub
commit b1d8d4901d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
worldedit-core/src/main/java/com/sk89q/worldedit/extent/inventory/BlockBagExtent.java
View File

@ -86,25 +86,27 @@ public class BlockBagExtent extends AbstractDelegateExtent {
if (blockBag != null) { if (blockBag != null) {
BlockState existing = getExtent().getBlock(position); BlockState existing = getExtent().getBlock(position);
if (!block.getBlockType().getMaterial().isAir()) { if (!block.getBlockType().equals(existing.getBlockType())) {
try { if (!block.getBlockType().getMaterial().isAir()) {
blockBag.fetchPlacedBlock(block.toImmutableState()); try {
} catch (UnplaceableBlockException e) { blockBag.fetchPlacedBlock(block.toImmutableState());
return false; } catch (UnplaceableBlockException e) {
} catch (BlockBagException e) { return false;
if (!missingBlocks.containsKey(block.getBlockType())) { } catch (BlockBagException e) {
missingBlocks.put(block.getBlockType(), 1); if (!missingBlocks.containsKey(block.getBlockType())) {
} else { missingBlocks.put(block.getBlockType(), 1);
missingBlocks.put(block.getBlockType(), missingBlocks.get(block.getBlockType()) + 1); } else {
missingBlocks.put(block.getBlockType(), missingBlocks.get(block.getBlockType()) + 1);
}
return false;
} }
return false;
} }
}
if (!existing.getBlockType().getMaterial().isAir()) { if (!existing.getBlockType().getMaterial().isAir()) {
try { try {
blockBag.storeDroppedBlock(existing); blockBag.storeDroppedBlock(existing);
} catch (BlockBagException ignored) { } catch (BlockBagException ignored) {
}
} }
} }
} }