mirror/WorldEdit
2
0
Fork 0
mirror of https://github.com/EngineHub/WorldEdit.git synced 2025-04-06 14:30:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix paintings not getting rotated correctly

Browse Source 
Co-authored-by: Octavia Togami <octavia.togami@gmail.com>
This commit is contained in:
aurora 2024-05-09 20:56:48 +02:00 committed by aurora
parent 6686552ecf
commit a695bb81fe
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
worldedit-core/src/main/java/com/sk89q/worldedit/function/entity/ExtentEntityCopy.java
View File

@ -186,7 +186,7 @@ public class ExtentEntityCopy implements EntityFunction {
.putInt("TileY", newTilePosition.y())
.putInt("TileZ", newTilePosition.z());
if (tag.value().get("Facing") instanceof LinNumberTag<?> tagFacing) {
if (tryGetFacingData(tag) instanceof FacingTagData(String facingKey, LinNumberTag<?> tagFacing)) {
boolean isPainting = state.getType() == EntityTypes.PAINTING; // Paintings have different facing values
Direction direction = isPainting
? MCDirections.fromHorizontalHanging(tagFacing.value().intValue())
@ -202,7 +202,7 @@ public class ExtentEntityCopy implements EntityFunction {
? MCDirections.toHorizontalHanging(newDirection)
: MCDirections.toHanging(newDirection)
);
builder.putByte("Facing", facingValue);
builder.putByte(facingKey, facingValue);
}
}
}
@ -213,4 +213,17 @@ public class ExtentEntityCopy implements EntityFunction {
return state;
}
private record FacingTagData(String facingKey, LinNumberTag<?> tagFacing) {
}
private static FacingTagData tryGetFacingData(LinCompoundTag tag) {
if (tag.value().get("Facing") instanceof LinNumberTag<?> tagFacingCapital) {
return new FacingTagData("Facing", tagFacingCapital);
} else if (tag.value().get("facing") instanceof LinNumberTag<?> tagFacingLower) {
return new FacingTagData("facing", tagFacingLower);
} else {
return null;
}
}
}