GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-19 14:59:27 +00:00
Code Issues Releases Activity

Some work on mannequins

Browse Source
This commit is contained in:
onebeastchris
2025-10-11 16:49:22 +02:00
parent d7d9e48927
commit 28b31f4980
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/geysermc/geyser/entity/type/Entity.java
View File

@@ -125,7 +125,7 @@ public class Entity implements GeyserEntity {
@Setter(AccessLevel.NONE)
private float boundingBoxWidth;
@Setter(AccessLevel.NONE)
private String displayName;
protected String displayName;
@Setter(AccessLevel.NONE)
protected boolean silent = false;
/* Metadata end */

8
core/src/main/java/org/geysermc/geyser/entity/type/player/AvatarEntity.java
View File

@@ -269,13 +269,17 @@ public class AvatarEntity extends LivingEntity {
@Override
public void setDisplayName(EntityMetadata<Optional<Component>, ?> entityMetadata) {
// Doesn't do anything for players
// TODO test mannequins
if (!(this instanceof PlayerEntity)) {
super.setDisplayName(entityMetadata);
}
}
@Override
public void setDisplayNameVisible(BooleanEntityMetadata entityMetadata) {
// Doesn't do anything for players
// TODO test mannequins
if (!(this instanceof PlayerEntity)) {
super.setDisplayNameVisible(entityMetadata);
}
}
public void setBelowNameText(String text) {

9
core/src/main/java/org/geysermc/geyser/entity/type/player/MannequinEntity.java
View File

@@ -38,14 +38,19 @@ import java.util.UUID;
public class MannequinEntity extends AvatarEntity {
public MannequinEntity(GeyserSession session, int entityId, long geyserId, UUID uuid, EntityDefinition<?> definition, Vector3f position, Vector3f motion, float yaw, float pitch, float headYaw) {
super(session, entityId, geyserId, uuid, definition, position, motion, yaw, pitch, headYaw, "Mannequin"); // TODO from translation
super(session, entityId, geyserId, uuid, definition, position, motion, yaw, pitch, headYaw, "");
}
public void setProfile(EntityMetadata<ResolvableProfile, ?> entityMetadata) {
setSkin(entityMetadata.getValue(), true, () -> {});
}
public void setDescription(EntityMetadata<Optional<Component>, ?> entityMetadata) {
@Override
public String getDisplayName() {
return displayName;
}
public void setDescription(EntityMetadata<Optional<Component>, ?> entityMetadata) {
// TODO
}
}