GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Fix up boat types after 1.19.4

Browse source 
Fixes #3649
This commit is contained in:
Camotoy 2023-04-01 15:25:37 -04:00
parent a004fe9a31
commit 5871ca3f22
No known key found for this signature in database
GPG key ID: 7EEFB66FE798081F
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/src/main/java/org/geysermc/geyser/entity/type/BoatEntity.java
View file

@ -124,7 +124,11 @@ public class BoatEntity extends Entity {
public void setVariant(IntEntityMetadata entityMetadata) { public void setVariant(IntEntityMetadata entityMetadata) {
variant = entityMetadata.getPrimitiveValue(); variant = entityMetadata.getPrimitiveValue();
dirtyMetadata.put(EntityData.VARIANT, variant); dirtyMetadata.put(EntityData.VARIANT, switch (variant) {
case 6, 7 -> variant - 1; // Dark oak and mangrove
case 5, 8 -> 0; // TODO temp until 1.20. Cherry and bamboo
default -> variant;
});
} }
public void setPaddlingLeft(BooleanEntityMetadata entityMetadata) { public void setPaddlingLeft(BooleanEntityMetadata entityMetadata) {

6
core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockEntityPickRequestTranslator.java
View file

@ -62,8 +62,10 @@ public class BedrockEntityPickRequestTranslator extends PacketTranslator<EntityP
case 2 -> "birch"; case 2 -> "birch";
case 3 -> "jungle"; case 3 -> "jungle";
case 4 -> "acacia"; case 4 -> "acacia";
case 5 -> "dark_oak"; //case 5 -> "cherry"; TODO
case 6 -> "mangrove"; case 6 -> "dark_oak";
case 7 -> "mangrove";
//case 8 -> "bamboo";
default -> "oak"; default -> "oak";
}; };
itemName = typeOfBoat + "_" + entity.getDefinition().entityType().name().toLowerCase(Locale.ROOT); itemName = typeOfBoat + "_" + entity.getDefinition().entityType().name().toLowerCase(Locale.ROOT);