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

Piston direction

Browse Source
This commit is contained in:
Jesse Boyd 2017-10-07 14:12:04 +11:00
parent 0d9f998c6c
commit 8a8022e1a4
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/com/boydti/fawe/object/clipboard/ClipboardRemapper.java
View File

@ -275,9 +275,11 @@ public class ClipboardRemapper {
mapPEtoPC.put(new BaseBlock(peId,5), new BaseBlock(pcId,3)); mapPEtoPC.put(new BaseBlock(peId,5), new BaseBlock(pcId,3));
} }
for (int id : new int[] {29, 33}) { for (int id : new int[] {29, 33, 34}) {
mapPEtoPC.put(new BaseBlock(id,3), new BaseBlock(id,2)); mapPEtoPC.put(new BaseBlock(id,3), new BaseBlock(id,2));
mapPEtoPC.put(new BaseBlock(id,2), new BaseBlock(id,3)); mapPEtoPC.put(new BaseBlock(id,2), new BaseBlock(id,3));
mapPEtoPC.put(new BaseBlock(id,10), new BaseBlock(id,11));
mapPEtoPC.put(new BaseBlock(id,11), new BaseBlock(id,10));
mapPEtoPC.put(new BaseBlock(id,5), new BaseBlock(id,4)); mapPEtoPC.put(new BaseBlock(id,5), new BaseBlock(id,4));
mapPEtoPC.put(new BaseBlock(id,13), new BaseBlock(id,12)); mapPEtoPC.put(new BaseBlock(id,13), new BaseBlock(id,12));
mapPEtoPC.put(new BaseBlock(id,4), new BaseBlock(id,5)); mapPEtoPC.put(new BaseBlock(id,4), new BaseBlock(id,5));

5
core/src/main/java/com/sk89q/jnbt/NBTInputStream.java
View File

@ -105,6 +105,11 @@ public final class NBTInputStream implements Closeable {
return readTagPayload(type, 0); return readTagPayload(type, 0);
} }
public Object readData() throws IOException {
int type = is.readByte();
return readDataPayload(type, 0);
}
public void readNamedTagLazy(RunnableVal2<String, RunnableVal2> getReader) throws IOException { public void readNamedTagLazy(RunnableVal2<String, RunnableVal2> getReader) throws IOException {
int type = is.readByte(); int type = is.readByte();
String name = readNamedTagName(type); String name = readNamedTagName(type);

7
nukkit/src/main/java/com/boydti/fawe/nukkit/core/converter/MCAFile2LevelDB.java
View File

@ -442,6 +442,7 @@ public class MCAFile2LevelDB extends MapConverter {
CompoundTag tag = (CompoundTag) item.getValue().get("tag"); CompoundTag tag = (CompoundTag) item.getValue().get("tag");
if (tag != null) { if (tag != null) {
Map<String, com.sk89q.jnbt.Tag> tagMap = ReflectionUtils.getMap(tag.getValue());
List<CompoundTag> enchants = (List) tag.getList("ench"); List<CompoundTag> enchants = (List) tag.getList("ench");
if (enchants != null) { if (enchants != null) {
for (CompoundTag ench : enchants) { for (CompoundTag ench : enchants) {
@ -452,12 +453,14 @@ public class MCAFile2LevelDB extends MapConverter {
if (id != null) value.put("lvl", new ShortTag(Short.parseShort(id))); if (id != null) value.put("lvl", new ShortTag(Short.parseShort(id)));
} }
} }
CompoundTag tile = (CompoundTag) tagMap.get("BlockEntityTag");
if (tile != null) {
tagMap.putAll(tile.getValue());
}
} }
return item; return item;
} }
// currentTick
private boolean transform(MCAChunk chunk, CompoundTag tag) { private boolean transform(MCAChunk chunk, CompoundTag tag) {
try { try {
String id = tag.getString("id"); String id = tag.getString("id");