Skip to content

fix: read lowercase entity "id" tag when loading disk clipboard #3726

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
intersecato wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −2
Open

fix: read lowercase entity "id" tag when loading disk clipboard #3726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions ...re/src/main/java/com/fastasyncworldedit/core/extent/clipboard/DiskOptimizedClipboard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,11 @@ private void loadNBTFromFileFooter(int nbtCount, int entitiesCount, long biomeLe
double y = pos.get(1).getValue();
double z = pos.get(2).getValue();
BaseEntity entity = new BaseEntity(tag);
if (entity.getType() == null) {
LOGGER.warn("Skipping entity with unknown type: {}", tag);
entitiesCount--;
continue;
}
BlockArrayClipboard.ClipboardEntity clipboardEntity = new BlockArrayClipboard.ClipboardEntity(
this,
x,
Expand Down
8 changes: 7 additions & 1 deletion worldedit-core/src/main/java/com/sk89q/worldedit/entity/BaseEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,13 @@ public EntityType getType() {

//FAWE start
public BaseEntity(CompoundTag tag) {
this(EntityTypes.parse(tag.getString("Id")), tag);
this(EntityTypes.parse(getEntityId(tag)), tag);
}

// FAWE uses "Id" internally, but entity NBT may also carry the vanilla "id" key
private static String getEntityId(CompoundTag tag) {
String id = tag.getString("Id");
return id.isEmpty() ? tag.getString("id") : id;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion worldedit-core/src/main/java/com/sk89q/worldedit/world/entity/EntityTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ private static String convertEntityId(String id) {
case "illusion_illager":
return "illusioner";
default: {
if (Character.isUpperCase(id.charAt(0))) {
if (!id.isEmpty() && Character.isUpperCase(id.charAt(0))) {

@SirYwell SirYwell Nov 12, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why can this be the case?

@intersecato intersecato Nov 12, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why can this be the case?

CompoundTag#getString returns "" for a missing key. That's what caused #2494: there was only id, so getString("Id") returned "" and charAt(0) threw. The id fallback covers that case, but a tag with neither key would still crash. Other callers of parse (e.g. MutableEntityChange) could hit it too. It's just a defensive check, so I can drop it if you prefer.

return convertEntityId(id.toLowerCase(Locale.ROOT));
}
return id;
Expand Down
Loading