OpenSource/GeyserMC
OpenSource/GeyserMC
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-12-22 14:34:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix for plugins that use display entities as nametag (#5157)

Browse source 
* Fix for display entity nametags

* Added check

* Moved lines count to TextDisplayEntity class
Removed useless offset

* Reset lines when text is null

* Conversation changes

* Changed y offset formula
Removed space

* Played around with the yOffset a bit

---------

Co-authored-by: Tim203 <mctim203@gmail.com>
This commit is contained in:
AlexDev_ 2024-12-15 16:15:55 +01:00 committed by GitHub
parent c8dadd8342
commit 54bdb639cb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/src/main/java/org/geysermc/geyser/entity/type/TextDisplayEntity.java
View file

@ -25,18 +25,25 @@
package org.geysermc.geyser.entity.type;
import lombok.Getter;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
import org.cloudburstmc.math.vector.Vector3f;
import org.cloudburstmc.protocol.bedrock.data.entity.EntityDataTypes;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.translator.text.MessageTranslator;
import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.EntityMetadata;
import org.jetbrains.annotations.Nullable;
import java.util.UUID;
// Note: 1.19.4 requires that the billboard is set to something in order to show, on Java Edition
@Getter
public class TextDisplayEntity extends DisplayBaseEntity {
private int lineCount;
public TextDisplayEntity(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.add(0, definition.offset(), 0), motion, yaw, pitch, headYaw);
}
@ -61,5 +68,14 @@ public class TextDisplayEntity extends DisplayBaseEntity {
public void setText(EntityMetadata<Component, ?> entityMetadata) {
this.dirtyMetadata.put(EntityDataTypes.NAME, MessageTranslator.convertMessage(entityMetadata.getValue()));
calculateLineCount(entityMetadata.getValue());
}
private void calculateLineCount(@Nullable Component text) {
if (text == null) {
lineCount = 0;
return;
}
lineCount = PlainTextComponentSerializer.plainText().serialize(text).split("\n").length;
}
}

12
core/src/main/java/org/geysermc/geyser/util/EntityUtils.java
View file

@ -209,6 +209,18 @@ public final class EntityUtils {
zOffset = displayTranslation.getZ();
}
}
case PLAYER -> {
if (passenger instanceof TextDisplayEntity textDisplay) {
Vector3f displayTranslation = textDisplay.getTranslation();
int lines = textDisplay.getLineCount();
if (displayTranslation != null && lines != 0) {
float multiplier = .1414f;
xOffset = displayTranslation.getX();
yOffset += displayTranslation.getY() + multiplier * lines;
zOffset = displayTranslation.getZ();
}
}
}
}
if (mount instanceof ChestBoatEntity) {
xOffset = 0.15F;