Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-06-26 06:34:53 +02:00
Code Issues Projects Releases Wiki Activity

Handle new Zombie metatag & change reset color to 21 (as documented on wiki.vg)

Browse Source
This commit is contained in:
Matsv 2018-03-20 15:55:27 +01:00
parent b7ca30efe8
commit 0ada2496de
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/us/myles/ViaVersion/api/entities/Entity1_13Types.java
View File

@ -132,7 +132,7 @@ public class Entity1_13Types {
SPIDER(68, ABSTRACT_MONSTER), // akc
CAVE_SPIDER(6, SPIDER), // aje
// Zombies
// Zombies - META CHECKED
ZOMBIE(86, ABSTRACT_MONSTER), // aki
DROWNED(13, ZOMBIE), // ajg
HUSK(29, ZOMBIE), // ajp

8
common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/MetadataRewriter.java
View File

@ -35,8 +35,7 @@ public class MetadataRewriter {
if (metadata.getMetaType() == MetaType1_13.Slot) {
metadata.setMetaType(MetaType1_13.Slot);
InventoryPackets.toClient((Item) metadata.getValue());
}
if (metadata.getMetaType() == MetaType1_13.BlockID) {
} else if (metadata.getMetaType() == MetaType1_13.BlockID) {
// Convert to new block id
metadata.setValue(WorldPackets.toNewId((int) metadata.getValue()));
}
@ -50,6 +49,11 @@ public class MetadataRewriter {
metadata.setValue(15 - (int) metadata.getValue());
}
// Handle new zombie meta (INDEX 15 - Boolean - Zombie is shaking while enabled)
if (type.isOrHasParent(Entity1_13Types.EntityType.ZOMBIE)) {
if (metadata.getId() > 14)
metadata.setId(metadata.getId() + 1);
}
// Handle other changes
if (type.is(Entity1_13Types.EntityType.AREA_EFFECT_CLOUD)) {

4
common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/ProtocolSnapshotTo1_12_2.java
View File

@ -308,8 +308,8 @@ public class ProtocolSnapshotTo1_12_2 extends Protocol {
// Handle new colors
byte color = wrapper.read(Type.BYTE);
if (color == -1) // -1 is no longer active, use white instead
wrapper.write(Type.VAR_INT, 15);
if (color == -1) // -1 changed to 21
wrapper.write(Type.VAR_INT, 21); // RESET
else
wrapper.write(Type.VAR_INT, (int) color);