Merge remote-tracking branch 'refs/remotes/upstream/master' into feature/custom-entities-api

# Conflicts:
#	core/src/main/java/org/geysermc/geyser/level/physics/CollisionManager.java

Author: onebeastchris

core/src/main/java/org/geysermc/geyser/entity/VanillaEntities.java

@@ -683,7 +683,8 @@ public final class VanillaEntities {
 
         EntityTypeBase<AvatarEntity> avatarEntityBase = EntityTypeBase.baseInherited(AvatarEntity.class, livingEntityBase)
             .height(1.8f).width(0.6f)
-            .offset(1.62f)
+            // This is the offset sent by Bedrock in its player position. Verified on Bedrock 26.23.
+            .offset(1.62001f)
             .addTranslator(null) // Player main hand
             .addTranslator(MetadataTypes.BYTE, AvatarEntity::setSkinVisibility)
             .build();

core/src/main/java/org/geysermc/geyser/level/physics/CollisionManager.java

@@ -61,6 +61,7 @@ public class CollisionManager {
     public static final BlockCollision FLUID_COLLISION = new OtherCollision(new BoundingBox[]{new BoundingBox(0.5, 0.25, 0.5, 1, 0.5, 1)});
     // If you read this, feel free to suggest a more proper way to detect the Bedrock player's own onGround status instead of using a margin
     private static final double POSITION_ADJUSTMENT_MARGIN = 0.05;
+    private static final double PLAYER_OFFSET = Double.parseDouble(Float.toString(EntityDefinitions.PLAYER.offset()));
 
     private final GeyserSession session;
 
@@ -176,7 +177,7 @@ public BoundingBox getActiveBoundingBox() {
         }
         // We need to parse the float as a string since casting a float to a double causes us to
         // lose precision and thus, causes players to get stuck when walking near walls
-        double javaY = Double.parseDouble(Float.toString(bedrockPosition.getY())) - VanillaEntities.PLAYER_ENTITY_OFFSET;
+        double javaY = Double.parseDouble(Float.toString(bedrockPosition.getY())) - PLAYER_OFFSET;
 
         Vector3d position = Vector3d.from(Double.parseDouble(Float.toString(bedrockPosition.getX())), javaY, Double.parseDouble(Float.toString(bedrockPosition.getZ())));
 

core/src/main/java/org/geysermc/geyser/network/netty/GeyserServer.java

@@ -153,9 +153,9 @@ private void modifyHandlers(ChannelFuture future) {
             }
 
             Channel channel = f.channel();
-            // Add our ping handler
+            // Add our handlers
             channel.pipeline()
-                .addFirst(RakConnectionRequestHandler.NAME, new RakConnectionRequestHandler(this))
+                .addBefore(RakServerOfflineHandler.NAME, RakConnectionRequestHandler.NAME, new RakConnectionRequestHandler(this))
                 .addAfter(RakServerOfflineHandler.NAME, RakPingHandler.NAME, new RakPingHandler(this));
         });
     }

core/src/main/java/org/geysermc/geyser/scoreboard/Objective.java

@@ -83,7 +83,7 @@ public void removeScore(String id) {
     }
 
     public void updateProperties(Component displayNameComponent, ScoreType type, NumberFormat format) {
-        String displayName = MessageTranslator.convertMessageRaw(displayNameComponent, scoreboard.session().locale());
+        String displayName = MessageTranslator.convertMessageRaw(displayNameComponent, scoreboard.session().locale()).replace("%", "%%");
         boolean changed = !Objects.equals(this.displayName, displayName) || this.type != type;
 
         this.displayName = displayName;

core/src/main/java/org/geysermc/geyser/session/cache/BossBar.java

@@ -59,7 +59,7 @@ public void updateBossBar() {
         BossEventPacket bossEventPacket = new BossEventPacket();
         bossEventPacket.setBossUniqueEntityId(entityId);
         bossEventPacket.setAction(BossEventPacket.Action.CREATE);
-        bossEventPacket.setTitle(MessageTranslator.convertMessage(title, session.locale()));
+        bossEventPacket.setTitle(MessageTranslator.convertMessage(title, session.locale()).replace("%", "%%%%"));
         bossEventPacket.setHealthPercentage(health);
         bossEventPacket.setColor(color);
         bossEventPacket.setOverlay(overlay);
@@ -73,7 +73,7 @@ public void updateTitle(Component title) {
         BossEventPacket bossEventPacket = new BossEventPacket();
         bossEventPacket.setBossUniqueEntityId(entityId);
         bossEventPacket.setAction(BossEventPacket.Action.UPDATE_NAME);
-        bossEventPacket.setTitle(MessageTranslator.convertMessage(title, session.locale()));
+        bossEventPacket.setTitle(MessageTranslator.convertMessage(title, session.locale()).replace("%", "%%%%"));
 
         session.sendUpstreamPacket(bossEventPacket);
     }

core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/player/JavaPlayerCombatKillTranslator.java

@@ -42,7 +42,7 @@ public void translate(GeyserSession session, ClientboundPlayerCombatKillPacket p
             Component deathMessage = packet.getMessage();
             // TODO - could inject score in, but as of 1.19.10 newlines don't center and start at the left of the first text
             DeathInfoPacket deathInfoPacket = new DeathInfoPacket();
-            deathInfoPacket.setCauseAttackName(MessageTranslator.convertMessage(deathMessage, session.locale()));
+            deathInfoPacket.setCauseAttackName(MessageTranslator.convertMessage(deathMessage, session.locale()).replace("%", "%%"));
             session.sendUpstreamPacket(deathInfoPacket);
         }
     }