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

Apply some suggestions

Browse Source
This commit is contained in:
onebeastchris
2025-11-27 22:18:12 +01:00
parent 9e6b1333b3
commit 75d5f07170
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/org/geysermc/geyser/entity/BedrockEntityDefinition.java
View File

@@ -28,6 +28,7 @@ package org.geysermc.geyser.entity;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
@@ -41,6 +42,7 @@ import java.util.Objects;
@Getter
@Accessors(fluent = true)
@ToString
public class BedrockEntityDefinition implements GeyserEntityDefinition {
private final @NonNull Identifier identifier;
private final @NonNull GeyserEntityProperties registeredProperties;
@@ -101,5 +103,4 @@ public class BedrockEntityDefinition implements GeyserEntityDefinition {
return new BedrockEntityDefinition(identifier, propertiesBuilder != null ? propertiesBuilder.build() : new GeyserEntityProperties());
}
}
}

4
core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/input/BedrockMovePlayer.java
View File

@@ -60,7 +60,7 @@ final class BedrockMovePlayer {
// Ignore movement packets until Bedrock's position matches the teleported position
if (session.getUnconfirmedTeleport() != null) {
session.confirmTeleport(packet.getPosition().sub(0, VanillaEntities.PLAYER_ENTITY_OFFSET, 0));
session.confirmTeleport(packet.getPosition().down(VanillaEntities.PLAYER_ENTITY_OFFSET));
return;
}
@@ -125,7 +125,7 @@ final class BedrockMovePlayer {
// Therefore, we're fixing this by allowing player to no clip to clip through the floor, not only this fixed the issue but
// player y velocity should match java perfectly, much better than teleport player right down :)
// Shouldn't mess with anything because beyond this point there is nothing to collide and not even entities since they're prob dead.
if (packet.getPosition().getY() - VanillaEntities.PLAYER_ENTITY_OFFSET< session.getBedrockDimension().minY() - 5) {
if (packet.getPosition().getY() - VanillaEntities.PLAYER_ENTITY_OFFSET < session.getBedrockDimension().minY() - 5) {
// Ensuring that we still can collide with collidable entity that are also in the void (eg: boat, shulker)
boolean possibleOnGround = false;

2
core/src/main/java/org/geysermc/geyser/util/EntityUtils.java
View File

@@ -271,7 +271,7 @@ public final class EntityUtils {
}
}
} else if (mountDefinition.is(BuiltinEntityType.HAPPY_GHAST)) {
int seatingIndex = Math.min(index, 4);
int seatingIndex = Math.min(index, 3);
xOffset = HappyGhastEntity.X_OFFSETS[seatingIndex];
yOffset = 3.4f;
zOffset = HappyGhastEntity.Z_OFFSETS[seatingIndex];