SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.16.1

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2020-06-25 10:00:00 +10:00
parent 3862d2811e
commit 50503fd516
424 changed files with 5960 additions and 5636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
paper-server/nms-patches/ItemDye.patch
View File

@@ -9,22 +9,22 @@
public class ItemDye extends Item {
private static final Map<EnumColor, ItemDye> a = Maps.newEnumMap(EnumColor.class);
@@ -20,7 +22,17 @@
EntitySheep entitysheep = (EntitySheep) entityliving;
@@ -21,7 +23,17 @@
if (entitysheep.isAlive() && !entitysheep.isSheared() && entitysheep.getColor() != this.b) {
- entitysheep.setColor(this.b);
+ // CraftBukkit start
+ byte bColor = (byte) this.b.getColorIndex();
+ SheepDyeWoolEvent event = new SheepDyeWoolEvent((org.bukkit.entity.Sheep) entitysheep.getBukkitEntity(), org.bukkit.DyeColor.getByWoolData(bColor));
+ entitysheep.world.getServer().getPluginManager().callEvent(event);
if (!entityhuman.world.isClientSide) {
- entitysheep.setColor(this.b);
+ // CraftBukkit start
+ byte bColor = (byte) this.b.getColorIndex();
+ SheepDyeWoolEvent event = new SheepDyeWoolEvent((org.bukkit.entity.Sheep) entitysheep.getBukkitEntity(), org.bukkit.DyeColor.getByWoolData(bColor));
+ entitysheep.world.getServer().getPluginManager().callEvent(event);
+
+ if (event.isCancelled()) {
+ return false;
+ }
+ if (event.isCancelled()) {
+ return EnumInteractionResult.PASS;
+ }
+
+ entitysheep.setColor(EnumColor.fromColorIndex((byte) event.getColor().getWoolData()));
+ // CraftBukkit end
itemstack.subtract(1);
}
+ entitysheep.setColor(EnumColor.fromColorIndex((byte) event.getColor().getWoolData()));
+ // CraftBukkit end
itemstack.subtract(1);
}