-
-
Notifications
You must be signed in to change notification settings - Fork 663
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix: Text display passenger offsets (#4676)
- Loading branch information
1 parent
a807fa6
commit e0af0a5
Showing
4 changed files
with
97 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
77 changes: 77 additions & 0 deletions
77
core/src/main/java/org/geysermc/geyser/entity/type/DisplayBaseEntity.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| /* | ||
| * Copyright (c) 2024 GeyserMC. http://geysermc.org | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| * | ||
| * @author GeyserMC | ||
| * @link https://github.com/GeyserMC/Geyser | ||
| */ | ||
|
|
||
| package org.geysermc.geyser.entity.type; | ||
|
|
||
| import net.kyori.adventure.text.Component; | ||
| import org.checkerframework.checker.nullness.qual.Nullable; | ||
| import org.cloudburstmc.math.vector.Vector3f; | ||
| import org.geysermc.geyser.entity.EntityDefinition; | ||
| import org.geysermc.geyser.session.GeyserSession; | ||
| import org.geysermc.geyser.util.EntityUtils; | ||
| import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.EntityMetadata; | ||
| import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.BooleanEntityMetadata; | ||
|
|
||
| import java.util.Optional; | ||
| import java.util.UUID; | ||
|
|
||
| public class DisplayBaseEntity extends Entity { | ||
|
|
||
| private @Nullable Vector3f baseTranslation; | ||
|
|
||
| public DisplayBaseEntity(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); | ||
| } | ||
|
|
||
| @Override | ||
| public void setDisplayNameVisible(BooleanEntityMetadata entityMetadata) { | ||
| // Don't allow the display name to be hidden - messes with our armor stand. | ||
| // On JE: Hiding the display name still shows the display entity text. | ||
| } | ||
|
|
||
| @Override | ||
| public void setDisplayName(EntityMetadata<Optional<Component>, ?> entityMetadata) { | ||
| // This would usually set EntityDataTypes.NAME, but we are instead using NAME for the text display. | ||
| // On JE: custom name does not override text display. | ||
| } | ||
|
|
||
| public void setTranslation(EntityMetadata<Vector3f, ?> translationMeta){ | ||
| this.baseTranslation = translationMeta.getValue(); | ||
| if (this.baseTranslation == null) { | ||
| return; | ||
| } | ||
| if (this.vehicle == null) { | ||
| this.setRiderSeatPosition(this.baseTranslation); | ||
| this.moveRelative(this.baseTranslation.getX(), this.baseTranslation.getY(), this.baseTranslation.getZ(), yaw, pitch, headYaw, false); | ||
| } else { | ||
| EntityUtils.updateMountOffset(this, this.vehicle, true, true, false); | ||
| this.updateBedrockMetadata(); | ||
| } | ||
| } | ||
|
|
||
| public Vector3f getTranslation() { | ||
| return baseTranslation; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters