Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Shaun Bennett 2016-02-16 16:55:11 -06:00
commit c20e32d2c0

View File

@ -36,7 +36,7 @@ public class MountBabyReindeer extends HorseMount
Material.GOLDEN_CARROT, (byte) 0, -3, Color.CREAMY, Style.WHITEFIELD, Variant.HORSE, 0, null); Material.GOLDEN_CARROT, (byte) 0, -3, Color.CREAMY, Style.WHITEFIELD, Variant.HORSE, 0, null);
} }
@EventHandler @Override
public void EnableCustom(Player player) { public void EnableCustom(Player player) {
super.EnableCustom(player); super.EnableCustom(player);
Horse horse = GetActive().get(player).getEntity(); Horse horse = GetActive().get(player).getEntity();