Brandon/FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix inventory mode + nbt

Browse Source
This commit is contained in:
Jesse Boyd 2018-09-23 17:29:40 +10:00
parent 671c781a7c
commit b8a0dea4bd
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/src/main/java/com/boydti/fawe/object/changeset/BlockBagChangeSet.java
View File

@ -5,6 +5,8 @@ import com.boydti.fawe.object.exception.FaweException;
import com.boydti.fawe.util.ReflectionUtils; import com.boydti.fawe.util.ReflectionUtils;
import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.CompoundTag;
import com.sk89q.jnbt.Tag; import com.sk89q.jnbt.Tag;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.extent.inventory.BlockBag; import com.sk89q.worldedit.extent.inventory.BlockBag;
import com.sk89q.worldedit.extent.inventory.BlockBagException; import com.sk89q.worldedit.extent.inventory.BlockBagException;
import com.sk89q.worldedit.extent.inventory.UnplaceableBlockException; import com.sk89q.worldedit.extent.inventory.UnplaceableBlockException;
@ -65,7 +67,19 @@ public class BlockBagChangeSet extends AbstractDelegateChangeSet {
} }
@Override @Override
public void add(int x, int y, int z, int combinedFrom, int combinedTo) { public void add(Vector loc, BaseBlock from, BaseBlock to) {
int x = loc.getBlockX();
int y = loc.getBlockY();
int z = loc.getBlockZ();
add(x, y, z, from, to);
}
@Override
public void add(int x, int y, int z, BaseBlock from, BaseBlock to) {
check(from.getCombined(), to.getCombined());
}
public void check(int combinedFrom, int combinedTo) {
if (combinedTo != 0) { if (combinedTo != 0) {
try { try {
blockBag.fetchPlacedBlock(FaweCache.getId(combinedTo), FaweCache.getData(combinedTo)); blockBag.fetchPlacedBlock(FaweCache.getId(combinedTo), FaweCache.getData(combinedTo));
@ -84,6 +98,11 @@ public class BlockBagChangeSet extends AbstractDelegateChangeSet {
} }
} }
} }
}
@Override
public void add(int x, int y, int z, int combinedFrom, int combinedTo) {
check(combinedFrom, combinedTo);
super.add(x, y, z, combinedFrom, combinedTo); super.add(x, y, z, combinedFrom, combinedTo);
} }