Fix #163 (ServerBlockValuePacket)

This commit is contained in:
Final Child 2016-05-25 16:25:56 +09:00
parent b460ac6534
commit 61dbf354ff

View file

@ -68,32 +68,25 @@ public class ServerBlockValuePacket implements Packet {
public void read(NetInput in) throws IOException {
this.position = NetUtil.readPosition(in);
int type = in.readUnsignedByte();
int value = in.readUnsignedByte();
this.blockId = in.readVarInt() & 0xFFF;
if(this.blockId == NOTE_BLOCK) {
this.type = MagicValues.key(NoteBlockValueType.class, type);
} else if(this.blockId == STICKY_PISTON || this.blockId == PISTON) {
this.type = MagicValues.key(PistonValueType.class, type);
} else if(this.blockId == MOB_SPAWNER) {
this.type = MagicValues.key(MobSpawnerValueType.class, type);
} else if(this.blockId == CHEST || this.blockId == ENDER_CHEST || this.blockId == TRAPPED_CHEST) {
this.type = MagicValues.key(ChestValueType.class, type);
} else {
this.type = MagicValues.key(GenericBlockValueType.class, type);
}
int value = in.readUnsignedByte();
if(this.blockId == NOTE_BLOCK) {
this.value = new NoteBlockValue(value);
} else if(this.blockId == STICKY_PISTON || this.blockId == PISTON) {
this.type = MagicValues.key(PistonValueType.class, type);
this.value = MagicValues.key(PistonValue.class, value);
} else if(this.blockId == MOB_SPAWNER) {
this.type = MagicValues.key(MobSpawnerValueType.class, type);
this.value = new MobSpawnerValue();
} else if(this.blockId == CHEST || this.blockId == ENDER_CHEST || this.blockId == TRAPPED_CHEST) {
this.type = MagicValues.key(ChestValueType.class, type);
this.value = new ChestValue(value);
} else {
this.type = MagicValues.key(GenericBlockValueType.class, type);
this.value = new GenericBlockValue(value);
}
this.blockId = in.readVarInt() & 4095;
}
@Override