Update to Minecraft 1.14-pre5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-04-23 12:00:00 +10:00
parent 0e98365784
commit a0f2b74c8d
560 changed files with 10642 additions and 10867 deletions

View File

@@ -9,10 +9,10 @@
public class ItemDye extends Item {
private static final Map<EnumColor, ItemDye> a = Maps.newEnumMap(EnumColor.class);
@@ -19,7 +21,17 @@
@@ -20,7 +22,17 @@
EntitySheep entitysheep = (EntitySheep) entityliving;
if (!entitysheep.isSheared() && entitysheep.getColor() != this.b) {
if (entitysheep.isAlive() && !entitysheep.isSheared() && entitysheep.getColor() != this.b) {
- entitysheep.setColor(this.b);
+ // CraftBukkit start
+ byte bColor = (byte) this.b.getColorIndex();