Mirror von
https://github.com/IntellectualSites/FastAsyncWorldEdit.git
synchronisiert 2024-12-25 10:30:04 +01:00
Don't touch the Direction tag, as possibly only Facing changed.
Dieser Commit ist enthalten in:
Ursprung
efc4ebe309
Commit
56ef786415
@ -2,24 +2,40 @@ package com.sk89q.worldedit.extent.clipboard.io.legacycompat;
|
||||
|
||||
import com.sk89q.jnbt.ByteTag;
|
||||
import com.sk89q.jnbt.CompoundTag;
|
||||
import com.sk89q.jnbt.CompoundTagBuilder;
|
||||
import com.sk89q.worldedit.internal.helper.MCDirections;
|
||||
import com.sk89q.worldedit.util.Direction;
|
||||
import com.sk89q.worldedit.world.entity.EntityType;
|
||||
|
||||
public class Pre13HangingCompatibilityHandler implements EntityNBTCompatibilityHandler {
|
||||
|
||||
@Override
|
||||
public boolean isAffectedEntity(EntityType type, CompoundTag entityTag) {
|
||||
return entityTag.getValue().get("Facing") instanceof ByteTag;
|
||||
public boolean isAffectedEntity(EntityType type, CompoundTag tag) {
|
||||
boolean hasLegacyDirection = tag.containsKey("Dir");
|
||||
boolean hasFacing = tag.containsKey("Facing");
|
||||
return hasLegacyDirection || hasFacing;
|
||||
}
|
||||
|
||||
@Override
|
||||
public CompoundTag updateNBT(EntityType type, CompoundTag entityTag) {
|
||||
int newFacing = MCDirections.toHanging(
|
||||
MCDirections.fromPre13Hanging(entityTag.getByte("Facing"))
|
||||
);
|
||||
return entityTag.createBuilder()
|
||||
.putByte("Facing", (byte) newFacing)
|
||||
.build();
|
||||
public CompoundTag updateNBT(EntityType type, CompoundTag tag) {
|
||||
boolean hasLegacyDirection = tag.containsKey("Dir");
|
||||
boolean hasFacing = tag.containsKey("Facing");
|
||||
int d;
|
||||
if (hasLegacyDirection) {
|
||||
d = MCDirections.fromLegacyHanging((byte) tag.asInt("Dir"));
|
||||
} else {
|
||||
d = tag.asInt("Facing");
|
||||
}
|
||||
|
||||
Direction newDirection = MCDirections.fromPre13Hanging(d);
|
||||
|
||||
byte hangingByte = (byte) MCDirections.toHanging(newDirection);
|
||||
|
||||
CompoundTagBuilder builder = tag.createBuilder();
|
||||
builder.putByte("Direction", hangingByte);
|
||||
builder.putByte("Facing", hangingByte);
|
||||
builder.putByte("Dir", MCDirections.toLegacyHanging(MCDirections.toHanging(newDirection)));
|
||||
return builder.build();
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -144,25 +144,24 @@ public class ExtentEntityCopy implements EntityFunction {
|
||||
.putInt("TileZ", newTilePosition.getBlockZ());
|
||||
|
||||
if (hasDirection || hasLegacyDirection || hasFacing) {
|
||||
int d;
|
||||
Direction direction;
|
||||
if (hasDirection) {
|
||||
d = tag.asInt("Direction");
|
||||
direction = MCDirections.fromPre13Hanging(tag.asInt("Direction"));
|
||||
} else if (hasLegacyDirection) {
|
||||
d = MCDirections.fromLegacyHanging((byte) tag.asInt("Dir"));
|
||||
direction = MCDirections.fromPre13Hanging(
|
||||
MCDirections.fromLegacyHanging((byte) tag.asInt("Dir"))
|
||||
);
|
||||
} else {
|
||||
d = tag.asInt("Facing");
|
||||
direction = MCDirections.fromHanging(tag.asInt("Facing"));
|
||||
}
|
||||
|
||||
Direction direction = MCDirections.fromHanging(d);
|
||||
|
||||
if (direction != null) {
|
||||
Vector3 vector = transform.apply(direction.toVector()).subtract(transform.apply(Vector3.ZERO)).normalize();
|
||||
Direction newDirection = Direction.findClosest(vector, Flag.CARDINAL);
|
||||
|
||||
if (newDirection != null) {
|
||||
byte hangingByte = (byte) MCDirections.toHanging(newDirection);
|
||||
builder.putByte("Direction", hangingByte);
|
||||
builder.putByte("Facing", hangingByte);
|
||||
builder.putByte("Direction", (byte) MCDirections.toPre13Hanging(newDirection));
|
||||
builder.putByte("Facing", (byte) MCDirections.toHanging(newDirection));
|
||||
builder.putByte("Dir", MCDirections.toLegacyHanging(MCDirections.toHanging(newDirection)));
|
||||
}
|
||||
}
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren