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

Blocks should now be fully removed correctly so that they don't drop items.

Browse Source
This commit is contained in:
sk89q 2010-11-26 23:24:55 -08:00
parent d6d6624a04
commit 2e3c3404d4
2 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/EditSession.java
View File

@ -48,15 +48,23 @@ public class EditSession {
/** /**
* Stores the original blocks before modification. * Stores the original blocks before modification.
*/ */
private DoubleArrayList<BlockVector,BaseBlock> original = new DoubleArrayList<BlockVector,BaseBlock>(); private DoubleArrayList<BlockVector,BaseBlock> original =
new DoubleArrayList<BlockVector,BaseBlock>();
/** /**
* Stores the current blocks. * Stores the current blocks.
*/ */
private DoubleArrayList<BlockVector,BaseBlock> current = new DoubleArrayList<BlockVector,BaseBlock>(); private DoubleArrayList<BlockVector,BaseBlock> current =
new DoubleArrayList<BlockVector,BaseBlock>();
/** /**
* Queue. * Blocks that should be placed before last.
*/ */
private DoubleArrayList<BlockVector,BaseBlock> queue = new DoubleArrayList<BlockVector,BaseBlock>(); private DoubleArrayList<BlockVector,BaseBlock> queueAfter =
new DoubleArrayList<BlockVector,BaseBlock>();
/**
* Blocks that should be placed last.
*/
private DoubleArrayList<BlockVector,BaseBlock> queueLast =
new DoubleArrayList<BlockVector,BaseBlock>();
/** /**
* The maximum number of blocks to change at a time. If this number is * The maximum number of blocks to change at a time. If this number is
* exceeded, a MaxChangedBlocksException exception will be * exceeded, a MaxChangedBlocksException exception will be
@ -194,13 +202,16 @@ public class EditSession {
*/ */
private boolean smartSetBlock(Vector pt, BaseBlock block) { private boolean smartSetBlock(Vector pt, BaseBlock block) {
if (queued) { if (queued) {
if (!block.isAir() && BlockType.shouldPlaceLast(block.getID()) // Place torches, etc. last
&& rawGetBlock(pt.add(0, -1, 0)).isAir()) { if (BlockType.shouldPlaceLast(block.getID())) {
queue.put(pt.toBlockVector(), block); queueLast.put(pt.toBlockVector(), block);
return getBlock(pt).getID() != block.getID();
// Destroy torches, etc. first
} else if (BlockType.shouldPlaceLast(getBlock(pt).getID())) {
rawSetBlock(pt, new BaseBlock(0));
} else {
queueAfter.put(pt.toBlockVector(), block);
return getBlock(pt).getID() != block.getID(); return getBlock(pt).getID() != block.getID();
} else if (block.isAir()
&& BlockType.shouldPlaceLast(rawGetBlock(pt.add(0, 1, 0)).getID())) {
rawSetBlock(pt.add(0, 1, 0), new BaseBlock(0)); // Prevent items from being dropped
} }
} }
@ -337,10 +348,18 @@ public class EditSession {
public void flushQueue() { public void flushQueue() {
if (!queued) { return; } if (!queued) { return; }
for (Map.Entry<BlockVector,BaseBlock> entry : queue) { for (Map.Entry<BlockVector,BaseBlock> entry : queueAfter) {
BlockVector pt = (BlockVector)entry.getKey(); BlockVector pt = (BlockVector)entry.getKey();
rawSetBlock(pt, (BaseBlock)entry.getValue()); rawSetBlock(pt, (BaseBlock)entry.getValue());
} }
for (Map.Entry<BlockVector,BaseBlock> entry : queueLast) {
BlockVector pt = (BlockVector)entry.getKey();
rawSetBlock(pt, (BaseBlock)entry.getValue());
}
queueAfter.clear();
queueLast.clear();
} }
/** /**

8
src/com/sk89q/worldedit/DoubleArrayList.java
View File

@ -60,6 +60,14 @@ public class DoubleArrayList<A,B> implements Iterable<Map.Entry<A,B>> {
return listA.size(); return listA.size();
} }
/**
* Clear the list.
*/
public void clear() {
listA.clear();
listB.clear();
}
/** /**
* Get an entry set. * Get an entry set.
* *