Skip to content

Add spawned entity to ArmorStandMeta #13858

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
56738 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add spawned entity to ArmorStandMeta #13858

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
28 changes: 28 additions & 0 deletions paper-api/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package com.destroystokyo.paper.inventory.meta;

import org.bukkit.entity.EntitySnapshot;
import org.bukkit.inventory.meta.ItemMeta;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;

@NullMarked
public interface ArmorStandMeta extends ItemMeta {

/**
Expand Down Expand Up @@ -75,4 +79,28 @@ public interface ArmorStandMeta extends ItemMeta {
* @param marker true if a marker
*/
void setMarker(boolean marker);

/**
* Gets the {@link EntitySnapshot} that will be spawned by this item or null if no entity
* has been set.
* <p>
* All applicable data from the item will be copied, such as pose, custom name,
* health, and velocity.
*
* @return the entity snapshot or null if no entity has been set
*/
@Nullable
EntitySnapshot getSpawnedEntity();

/**
* Sets the {@link EntitySnapshot} that will be spawned by this item.
* <p>
* Must represent an armor stand.
* <p>
* All applicable data from the entity will be copied, such as pose, custom name,
* health, and velocity.
*
* @param snapshot the snapshot
*/
void setSpawnedEntity(EntitySnapshot snapshot);
}
18 changes: 18 additions & 0 deletions paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.bukkit.craftbukkit.inventory;

import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap.Builder;
import java.util.Map;
import java.util.Objects;
Expand All @@ -10,6 +11,9 @@
import net.minecraft.world.item.component.TypedEntityData;
import org.bukkit.Material;
import org.bukkit.configuration.serialization.DelegateDeserialization;
import org.bukkit.craftbukkit.entity.CraftEntitySnapshot;
import org.bukkit.entity.EntitySnapshot;
import org.jspecify.annotations.Nullable;

@DelegateDeserialization(SerializableMeta.class)
public class CraftMetaArmorStand extends CraftMetaItem implements com.destroystokyo.paper.inventory.meta.ArmorStandMeta {
Expand Down Expand Up @@ -233,4 +237,18 @@ public void setMarker(boolean marker) {
populateTagIfNull();
this.entityTag.putBoolean(MARKER.NBT, marker);
}

@Override
public @Nullable EntitySnapshot getSpawnedEntity() {
if (this.entityTag == null) {
return null;
}
return CraftEntitySnapshot.create(this.entityTag.copy());
}

@Override
public void setSpawnedEntity(final EntitySnapshot snapshot) {
Preconditions.checkArgument(snapshot.getEntityType() == org.bukkit.entity.EntityType.ARMOR_STAND, "Entity is not an armor stand");
this.entityTag = ((CraftEntitySnapshot) snapshot).getData().copy();
}
}