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

Indicate support for 1.12.12x, update Bedrock protocol library, bump Bedrock network dependency

Browse Source
This commit is contained in:
onebeastchris
2025-11-19 02:41:34 +01:00
parent 765128ce42
commit 80db983a4c
6 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/main/java/org/geysermc/geyser/entity/type/Entity.java
View File

@@ -72,7 +72,7 @@ import org.geysermc.mcprotocollib.protocol.data.game.entity.player.Hand;
import org.geysermc.mcprotocollib.protocol.data.game.entity.type.EntityType;
import java.util.Collections;
import java.util.EnumSet;
import java.util.EnumMap;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
@@ -142,7 +142,7 @@ public class Entity implements GeyserEntity {
* think they are set to false.
*/
@Getter(AccessLevel.NONE)
protected final EnumSet<EntityFlag> flags = EnumSet.noneOf(EntityFlag.class);
protected final EnumMap<EntityFlag, Boolean> flags = new EnumMap<>(EntityFlag.class);
/**
* Indicates if flags have been updated and need to be sent to the client.
*/
@@ -362,14 +362,19 @@ public class Entity implements GeyserEntity {
}
public final boolean getFlag(EntityFlag flag) {
return this.flags.contains(flag);
Boolean value = this.flags.get(flag);
return value != null && value;
}
/**
* Updates a flag value and determines if the flags would need synced with the Bedrock client.
*/
public final void setFlag(EntityFlag flag, boolean value) {
flagsDirty |= value ? this.flags.add(flag) : this.flags.remove(flag);
Boolean previous = this.flags.get(flag);
if (previous == null || value != previous) {
flagsDirty = true;
}
this.flags.put(flag, value);
}
/**

2
core/src/main/java/org/geysermc/geyser/entity/type/living/ArmorStandEntity.java
View File

@@ -353,7 +353,7 @@ public class ArmorStandEntity extends LivingEntity {
secondEntity.positionRequiresOffset = true; // Offset should always be applied
secondEntity.getDirtyMetadata().put(EntityDataTypes.NAME, nametag);
secondEntity.getDirtyMetadata().put(EntityDataTypes.NAMETAG_ALWAYS_SHOW, isNameTagVisible ? (byte) 1 : (byte) 0);
secondEntity.flags.addAll(this.flags);
secondEntity.flags.putAll(this.flags);
// Guarantee this copy is NOT invisible
secondEntity.setFlag(EntityFlag.INVISIBLE, false);
// Scale to 0 to show nametag

2
core/src/main/java/org/geysermc/geyser/entity/type/player/AvatarEntity.java
View File

@@ -334,7 +334,7 @@ public class AvatarEntity extends LivingEntity {
@Override
public void setPitch(float pitch) {
super.setPitch(getFlag(EntityFlag.CRAWLING) && !(this instanceof SessionPlayerEntity) ? 0 : pitch);
super.setPitch(getFlag(EntityFlag.CRAWLING) ? 0 : pitch);
}
@Override

5
core/src/main/java/org/geysermc/geyser/entity/type/player/SessionPlayerEntity.java
View File

@@ -276,6 +276,11 @@ public class SessionPlayerEntity extends PlayerEntity {
}
}
@Override
public void setPitch(float pitch) {
this.pitch = pitch;
}
public float getMaxHealth() {
return maxHealth;
}

2
core/src/main/java/org/geysermc/geyser/network/GameProtocol.java
View File

@@ -88,7 +88,7 @@ public final class GameProtocol {
register(Bedrock_v819.CODEC, "1.21.93", "1.21.94");
register(Bedrock_v827.CODEC, "1.21.100", "1.21.101");
register(Bedrock_v844.CODEC, "1.21.111", "1.21.112", "1.21.113", "1.21.114");
register(Bedrock_v859.CODEC, "1.21.120");
register(Bedrock_v859.CODEC, "1.21.120", "1.21.121", "1.21.122", "1.21.123");
MinecraftVersion latestBedrock = SUPPORTED_BEDROCK_VERSIONS.get(SUPPORTED_BEDROCK_VERSIONS.size() - 1);
DEFAULT_BEDROCK_VERSION = latestBedrock.versionString();