mirror/WorldEdit
2
0
Fork 0
mirror of https://github.com/EngineHub/WorldEdit.git synced 2024-12-21 04:49:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Changed EditSession.rawSetBlock() to call setBlock() on World.

Browse Source
This commit is contained in:
sk89q 2012-08-24 13:38:00 -07:00
parent 2bc86ea525
commit 39d451438f
1 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,8 +37,6 @@
import com.sk89q.worldedit.blocks.BaseBlock; import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.blocks.BlockID; import com.sk89q.worldedit.blocks.BlockID;
import com.sk89q.worldedit.blocks.BlockType; import com.sk89q.worldedit.blocks.BlockType;
import com.sk89q.worldedit.blocks.ContainerBlock;
import com.sk89q.worldedit.blocks.TileEntityBlock;
import com.sk89q.worldedit.expression.Expression; import com.sk89q.worldedit.expression.Expression;
import com.sk89q.worldedit.expression.ExpressionException; import com.sk89q.worldedit.expression.ExpressionException;
import com.sk89q.worldedit.expression.runtime.RValue; import com.sk89q.worldedit.expression.runtime.RValue;
@ -222,33 +220,19 @@ public boolean rawSetBlock(Vector pt, BaseBlock block) {
} }
} }
} }
final boolean result; boolean result;
if (world.usesBlockData(type)) { if (type == 0) {
if (fastMode) { if (fastMode) {
result = world.setTypeIdAndDataFast(pt, type, block.getData() > -1 ? block.getData() : 0); result = world.setBlockTypeFast(pt, 0);
} else { } else {
result = world.setTypeIdAndData(pt, type, block.getData() > -1 ? block.getData() : 0); result = world.setBlockType(pt, 0);
} }
} else { } else {
if (fastMode) { result = world.setBlock(pt, block, fastMode);
result = world.setBlockTypeFast(pt, type);
} else {
result = world.setBlockType(pt, type);
}
}
//System.out.println(pt + "" +result);
if (type != 0) {
if (block instanceof ContainerBlock) {
if (blockBag == null) {
world.copyToWorld(pt, block);
}
} else if (block instanceof TileEntityBlock) {
world.copyToWorld(pt, block);
}
} }
return result; return result;
} }