Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-22 17:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix entity rotation (#642)

Browse Source 
* fix entity rotation
fixes #577 
Co-authored-by: wea_ondara <wea_ondara@alpenblock.net>
This commit is contained in:
Aurora 2020-09-20 16:33:07 +02:00 committed by GitHub
parent 2b45d922f2
commit 806916d6e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,6 +39,9 @@ import com.sk89q.worldedit.world.entity.EntityTypes;
import java.util.UUID;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.jnbt.FloatTag;
import com.sk89q.jnbt.ListTag;
import java.util.Arrays;
/**
* Copies entities provided to the function to the provided destination
@ -201,6 +204,7 @@ public class ExtentEntityCopy implements EntityFunction {
// Handle hanging entities (paintings, item frames, etc.)
boolean hasTilePosition = tag.containsKey("TileX") && tag.containsKey("TileY") && tag.containsKey("TileZ");
boolean hasFacing = tag.containsKey("Facing");
boolean hasRotation = tag.containsKey("Rotation");
if (hasTilePosition) {
Vector3 tilePosition = Vector3.at(tag.asInt("TileX"), tag.asInt("TileY"), tag.asInt("TileZ"));
@ -225,6 +229,22 @@ public class ExtentEntityCopy implements EntityFunction {
}
}
if (hasRotation) {
ListTag orgrot = state.getNbtData().getListTag("Rotation");
Vector3 orgDirection = new Location(source, 0, 0, 0, orgrot.getFloat(0), orgrot.getFloat(1)).getDirection();
Vector3 newDirection = transform.apply(orgDirection).subtract(transform.apply(Vector3.ZERO)).normalize();
builder.put("Rotation", new ListTag(FloatTag.class, Arrays.asList(new FloatTag((float) newDirection.toYaw()), new FloatTag((float) newDirection.toPitch()))));
}
return new BaseEntity(state.getType(), builder.build());
} else if (hasRotation) { //armor stands do not have a tile pos
CompoundTagBuilder builder = tag.createBuilder();
ListTag orgrot = state.getNbtData().getListTag("Rotation");
Vector3 orgDirection = new Location(source, 0, 0, 0, orgrot.getFloat(0), orgrot.getFloat(1)).getDirection();
Vector3 newDirection = transform.apply(orgDirection).subtract(transform.apply(Vector3.ZERO)).normalize();
builder.put("Rotation", new ListTag(FloatTag.class, Arrays.asList(new FloatTag((float) newDirection.toYaw()), new FloatTag((float) newDirection.toPitch()))));
return new BaseEntity(state.getType(), builder.build());
}
}