Google/Geyser
1
0
Fork 0
forked from GeyserMC/Geyser
Code Issues Pull requests Projects Releases Wiki Activity

Fix requested change; modify comments

Browse source
This commit is contained in:
DoctorMacc 2020-04-07 20:06:20 -04:00
parent 20700998b1
commit d4f23379ef
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
connector/src/main/java/org/geysermc/connector/entity/living/animal/horse/LlamaEntity.java
View file

@ -54,13 +54,13 @@ public class LlamaEntity extends ChestedHorseEntity {
// -1 means no armor // -1 means no armor
if ((int) entityMetadata.getValue() != -1) { if ((int) entityMetadata.getValue() != -1) {
// The damage value is the dye color that Java sends us // The damage value is the dye color that Java sends us
// Always going to be a carpet so we can hardcode 171 // Always going to be a carpet so we can hardcode 171 in BlockTranslator
// The int then short conversion is required or we get a ClassCastException // The int then short conversion is required or we get a ClassCastException
equipmentPacket.setChestplate(ItemData.of(BlockTranslator.LLAMA_ARMOR_ID, (short)((int) entityMetadata.getValue()), 1)); equipmentPacket.setChestplate(ItemData.of(BlockTranslator.CARPET, (short)((int) entityMetadata.getValue()), 1));
} else { } else {
equipmentPacket.setChestplate(ItemData.AIR); equipmentPacket.setChestplate(ItemData.AIR);
} }
// Required to fill out the rest of the equipment or Bedrock ignores it // Required to fill out the rest of the equipment or Bedrock ignores it, including above else statement if removing armor
equipmentPacket.setBoots(ItemData.AIR); equipmentPacket.setBoots(ItemData.AIR);
equipmentPacket.setHelmet(ItemData.AIR); equipmentPacket.setHelmet(ItemData.AIR);
equipmentPacket.setLeggings(ItemData.AIR); equipmentPacket.setLeggings(ItemData.AIR);

4
connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java
View file

@ -55,8 +55,8 @@ public class BlockTranslator {
private static final Int2ObjectMap<BlockState> BEDROCK_TO_JAVA_BLOCK_MAP = new Int2ObjectOpenHashMap<>(); private static final Int2ObjectMap<BlockState> BEDROCK_TO_JAVA_BLOCK_MAP = new Int2ObjectOpenHashMap<>();
private static final IntSet WATERLOGGED = new IntOpenHashSet(); private static final IntSet WATERLOGGED = new IntOpenHashSet();
// Carpet ID, used in LlamaEntity.java // Bedrock carpet ID, used in LlamaEntity.java for decoration
public static final int LLAMA_ARMOR_ID = 171; public static final int CARPET = 171;
private static final int BLOCK_STATE_VERSION = 17760256; private static final int BLOCK_STATE_VERSION = 17760256;