Update to Minecraft 1.18-pre5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-11-22 09:00:00 +11:00
parent a852b81a69
commit 43702a9e10
700 changed files with 10286 additions and 10098 deletions

View File

@@ -15,7 +15,7 @@
if (!entityhuman.level.isClientSide) {
- entitysheep.setColor(this.dyeColor);
+ // CraftBukkit start
+ byte bColor = (byte) this.dyeColor.getColorIndex();
+ byte bColor = (byte) this.dyeColor.getId();
+ SheepDyeWoolEvent event = new SheepDyeWoolEvent((org.bukkit.entity.Sheep) entitysheep.getBukkitEntity(), org.bukkit.DyeColor.getByWoolData(bColor), (org.bukkit.entity.Player) entityhuman.getBukkitEntity());
+ entitysheep.level.getCraftServer().getPluginManager().callEvent(event);
+
@@ -23,8 +23,8 @@
+ return EnumInteractionResult.PASS;
+ }
+
+ entitysheep.setColor(EnumColor.fromColorIndex((byte) event.getColor().getWoolData()));
+ entitysheep.setColor(EnumColor.byId((byte) event.getColor().getWoolData()));
+ // CraftBukkit end
itemstack.subtract(1);
itemstack.shrink(1);
}