Skip to content

Fixed Exception when relocating EnderIO BlockEntity #495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Alexander3a wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed Exception when relocating EnderIO BlockEntity #495

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fb0178
Fixed Exception when relocating EnderIO BlockEntity
Alexander3a Aug 20, 2024
d14838f
Fixed incorrect Logger
Alexander3a Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions src/main/java/net/querz/mcaselector/version/anvil120/Anvil120ChunkRelocator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
import net.querz.mcaselector.version.Helper;
import net.querz.mcaselector.version.anvil118.Anvil118EntityRelocator;
import net.querz.nbt.*;
import org.apache.logging.log4j.LogManager;

import java.util.Map;

import static net.querz.mcaselector.validation.ValidationHelper.silent;
import static net.querz.mcaselector.version.anvil118.Anvil118EntityRelocator.applyOffsetToEntity;

Expand Down Expand Up @@ -175,10 +178,14 @@ static void applyOffsetToTileEntity(CompoundTag tileEntity, Point3i offset, int
}
}

ListTag items = Helper.tagFromCompound(tileEntity, "Items");
if (items != null) {
items.forEach(i -> applyOffsetToItem((CompoundTag) i, offset, dataVersion));
}
Tag itemsTag = Helper.tagFromCompound(tileEntity, "Items");
if (itemsTag != null) {
if(itemsTag instanceof CompoundTag items){
items.forEach(i -> applyOffsetToItem((CompoundTag) i, offset, dataVersion));
}else{
LogManager.getLogger(Anvil120ChunkRelocator.class).warn("Skipping {}", ((StringTag) tileEntity.get("id")).getValue());
}
}
}

static void applyOffsetToItem(CompoundTag item, Point3i offset, int dataVersion) {
Expand Down Expand Up @@ -231,9 +238,13 @@ static void applyOffsetToItem(CompoundTag item, Point3i offset, int dataVersion)

// recursively update all items in child containers
CompoundTag blockEntityTag = Helper.tagFromCompound(tag, "BlockEntityTag");
ListTag items = Helper.tagFromCompound(blockEntityTag, "Items");
if (items != null) {
items.forEach(i -> applyOffsetToItem((CompoundTag) i, offset, dataVersion));
Tag itemsTag = Helper.tagFromCompound(blockEntityTag, "Items");
if (itemsTag != null) {
if(itemsTag instanceof ListTag items){
items.forEach(i -> applyOffsetToItem((CompoundTag) i, offset, dataVersion));
}else{
LogManager.getLogger(Anvil120ChunkRelocator.class).warn("Skipping {}", ((StringTag) item.get("id")).getValue());
}
}
}
}
Expand Down