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

Update to Minecraft 1.11

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-11-17 12:41:03 +11:00
parent 49bc1c57f9
commit 4e412ab4e3
279 changed files with 3722 additions and 2992 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,13 +8,13 @@
public class ItemDye extends Item {
public static final int[] a = new int[] { 1973019, 11743532, 3887386, 5320730, 2437522, 8073150, 2651799, 11250603, 4408131, 14188952, 4312372, 14602026, 6719955, 12801229, 15435844, 15790320};
@@ -87,6 +89,17 @@
@@ -89,6 +91,17 @@
EnumColor enumcolor = EnumColor.fromInvColorIndex(itemstack.getData());
if (!entitysheep.isSheared() && entitysheep.getColor() != enumcolor) {
+ // CraftBukkit start
+ byte bColor = (byte) enumcolor.getColorIndex();
+ SheepDyeWoolEvent event = new SheepDyeWoolEvent((org.bukkit.entity.Sheep) entitysheep.getBukkitEntity(), org.bukkit.DyeColor.getByData(bColor));
+ SheepDyeWoolEvent event = new SheepDyeWoolEvent((org.bukkit.entity.Sheep) entitysheep.getBukkitEntity(), org.bukkit.DyeColor.getByWoolData(bColor));
+ entitysheep.world.getServer().getPluginManager().callEvent(event);
+
+ if (event.isCancelled()) {
@@ -24,5 +24,5 @@
+ enumcolor = EnumColor.fromColorIndex((byte) event.getColor().getWoolData());
+ // CraftBukkit end
entitysheep.setColor(enumcolor);
--itemstack.count;
itemstack.subtract(1);
}