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

Update to Minecraft 1.13-pre7

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2018-07-15 10:00:00 +10:00
parent d1e91a8adb
commit 7e0a66fdd5
608 changed files with 17788 additions and 9378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,19 +1,21 @@
--- a/net/minecraft/server/ItemDye.java
+++ b/net/minecraft/server/ItemDye.java
@@ -1,5 +1,7 @@
package net.minecraft.server;
@@ -3,6 +3,8 @@
import com.google.common.collect.Maps;
import java.util.Map;
+import org.bukkit.event.entity.SheepDyeWoolEvent; // CraftBukkit
+
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};
@@ -89,6 +91,17 @@
EnumColor enumcolor = EnumColor.fromInvColorIndex(itemstack.getData());
private static final Map<EnumColor, ItemDye> a = Maps.newEnumMap(EnumColor.class);
@@ -19,7 +21,17 @@
EntitySheep entitysheep = (EntitySheep) entityliving;
if (!entitysheep.isSheared() && entitysheep.getColor() != enumcolor) {
if (!entitysheep.isSheared() && entitysheep.getColor() != this.b) {
- entitysheep.setColor(this.b);
+ // CraftBukkit start
+ byte bColor = (byte) enumcolor.getColorIndex();
+ 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);
+
@@ -21,8 +23,8 @@
+ return false;
+ }
+
+ enumcolor = EnumColor.fromColorIndex((byte) event.getColor().getWoolData());
+ entitysheep.setColor(EnumColor.fromColorIndex((byte) event.getColor().getWoolData()));
+ // CraftBukkit end
entitysheep.setColor(enumcolor);
itemstack.subtract(1);
}