Merge remote-tracking branch 'upstream/master' into feature/blocky

This commit is contained in:
Joshua Castle 2023-05-13 14:59:40 -07:00
commit 4e88a7fb9a
No known key found for this signature in database
GPG key ID: F674F38216C35D5D

View file

@ -1756,7 +1756,12 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {
abilities.add(Ability.NO_CLIP); abilities.add(Ability.NO_CLIP);
} }
abilityLayer.setLayerType(AbilityLayer.Type.BASE); // https://github.com/GeyserMC/Geyser/issues/3769 Setting Spectator mode ability layer
if (spectator) {
abilityLayer.setLayerType(AbilityLayer.Type.SPECTATOR);
} else {
abilityLayer.setLayerType(AbilityLayer.Type.BASE);
}
abilityLayer.setFlySpeed(flySpeed); abilityLayer.setFlySpeed(flySpeed);
// https://github.com/GeyserMC/Geyser/issues/3139 as of 1.19.10 // https://github.com/GeyserMC/Geyser/issues/3139 as of 1.19.10
abilityLayer.setWalkSpeed(walkSpeed == 0f ? 0.01f : walkSpeed); abilityLayer.setWalkSpeed(walkSpeed == 0f ? 0.01f : walkSpeed);