Merge branch 'master' into 1.14

This commit is contained in:
Paul Heidenreich 2019-04-30 08:59:25 +02:00
commit 8bd54b3469
2 changed files with 3 additions and 1 deletions

View file

@ -760,6 +760,7 @@ public class MagicValues {
register(PistonValueType.PUSHING, 0);
register(PistonValueType.PULLING, 1);
register(PistonValueType.CANCELLED_MID_PUSH, 2);
register(MobSpawnerValueType.RESET_DELAY, 1);

View file

@ -2,5 +2,6 @@ package com.github.steveice10.mc.protocol.data.game.world.block.value;
public enum PistonValueType implements BlockValueType {
PUSHING,
PULLING;
PULLING,
CANCELLED_MID_PUSH;
}