From 5fda1d018b130ef11830da91c56ca80e35f690e0 Mon Sep 17 00:00:00 2001
From: Ali Moghnieh <supaham@supaham.com>
Date: Fri, 2 Dec 2016 17:02:04 +0000
Subject: [PATCH] Add support for spawn_egg durability value in Minecraft 1.11.

---
 .../src/net/ess3/nms/refl/ReflUtil.java          |  1 +
 .../src/net/ess3/nms/refl/SpawnEggRefl.java      | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/nms/ReflectionProvider/src/net/ess3/nms/refl/ReflUtil.java b/nms/ReflectionProvider/src/net/ess3/nms/refl/ReflUtil.java
index 8ce4b5e6b..e52e39762 100644
--- a/nms/ReflectionProvider/src/net/ess3/nms/refl/ReflUtil.java
+++ b/nms/ReflectionProvider/src/net/ess3/nms/refl/ReflUtil.java
@@ -21,6 +21,7 @@ public class ReflUtil {
     public static final NMSVersion V1_8_R3 = NMSVersion.fromString("v1_8_R3");
     public static final NMSVersion V1_9_R1 = NMSVersion.fromString("v1_9_R1");
     public static final NMSVersion V1_10_R1 = NMSVersion.fromString("v1_10_R1");
+    public static final NMSVersion V1_11_R1 = NMSVersion.fromString("v1_11_R1");
     private static NMSVersion nmsVersionObject;
     private static String nmsVersion;
 
diff --git a/nms/ReflectionProvider/src/net/ess3/nms/refl/SpawnEggRefl.java b/nms/ReflectionProvider/src/net/ess3/nms/refl/SpawnEggRefl.java
index a10ab49af..6f7f8617b 100644
--- a/nms/ReflectionProvider/src/net/ess3/nms/refl/SpawnEggRefl.java
+++ b/nms/ReflectionProvider/src/net/ess3/nms/refl/SpawnEggRefl.java
@@ -16,6 +16,8 @@
  *******************************************************************************/
 package net.ess3.nms.refl;
 
+import net.ess3.nms.refl.ReflUtil.NMSVersion;
+
 import org.bukkit.Material;
 import org.bukkit.entity.EntityType;
 import org.bukkit.inventory.ItemStack;
@@ -93,7 +95,13 @@ public class SpawnEggRefl {
         }
         Object id = NBTTagCompoundConstructor.newInstance();
         Method tagSetString = ReflUtil.getMethodCached(NBTTagCompoundClass, "setString", String.class, String.class);
-        tagSetString.invoke(id, "id", type.getName());
+        
+        String idString = type.getName();
+        if (ReflUtil.getNmsVersionObject().isHigherThanOrEqualTo(ReflUtil.V1_11_R1)) {
+            // 1.11 requires domain prefix of minecraft.
+            idString = "minecraft:" + idString;
+        }
+        tagSetString.invoke(id, "id", idString);
 
         Method tagSetTag = ReflUtil.getMethodCached(NBTTagCompoundClass, "set", String.class, NBTTagCompoundClass.getSuperclass());
         tagSetTag.invoke(tagCompound, "EntityTag", id);
@@ -128,8 +136,12 @@ public class SpawnEggRefl {
             Object entityTag = tagGetCompound.invoke(tagCompound, "EntityTag");
 
             Method tagGetString = ReflUtil.getMethodCached(entityTag.getClass(), "getString", String.class);
+            String idString = (String) tagGetString.invoke(entityTag, "id");
+            if (ReflUtil.getNmsVersionObject().isHigherThanOrEqualTo(ReflUtil.V1_11_R1)) {
+                idString = idString.split("minecraft:")[1];
+            }
             @SuppressWarnings("deprecation")
-            EntityType type = EntityType.fromName((String) tagGetString.invoke(entityTag, "id"));
+            EntityType type = EntityType.fromName(idString);
             if (type != null) {
                 return new SpawnEggRefl(type);
             } else {