|
| 1 | +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 2 | +From: chickeneer <emcchickeneer@gmail.com> |
| 3 | +Date: Sat, 2 Oct 2021 10:14:04 -0500 |
| 4 | +Subject: [PATCH] Register spawn egg meta for 1.17 mobs |
| 5 | + |
| 6 | + |
| 7 | +diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java |
| 8 | +index 1a8ff7339c58a4fffb051a090a7b8c34cb346a61..aa7fd5c80712fecca1110341a234f60e8607b809 100644 |
| 9 | +--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java |
| 10 | ++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java |
| 11 | +@@ -122,6 +122,7 @@ public final class CraftItemFactory implements ItemFactory { |
| 12 | + case YELLOW_BANNER: |
| 13 | + case YELLOW_WALL_BANNER: |
| 14 | + return meta instanceof CraftMetaBanner ? meta : new CraftMetaBanner(meta); |
| 15 | ++ case AXOLOTL_SPAWN_EGG: // Paper |
| 16 | + case BAT_SPAWN_EGG: |
| 17 | + case BEE_SPAWN_EGG: |
| 18 | + case BLAZE_SPAWN_EGG: |
| 19 | +@@ -140,6 +141,8 @@ public final class CraftItemFactory implements ItemFactory { |
| 20 | + case EVOKER_SPAWN_EGG: |
| 21 | + case FOX_SPAWN_EGG: |
| 22 | + case GHAST_SPAWN_EGG: |
| 23 | ++ case GLOW_SQUID_SPAWN_EGG: // Paper |
| 24 | ++ case GOAT_SPAWN_EGG: // Paper |
| 25 | + case GUARDIAN_SPAWN_EGG: |
| 26 | + case HOGLIN_SPAWN_EGG: |
| 27 | + case HORSE_SPAWN_EGG: |
| 28 | +diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java |
| 29 | +index e9fa60755da0bc358020266ff4e450e1b31da595..f6a820e2456c66b8db4140984e0306bea3ee4e9b 100644 |
| 30 | +--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java |
| 31 | ++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java |
| 32 | +@@ -349,6 +349,7 @@ public final class CraftItemStack extends ItemStack { |
| 33 | + case YELLOW_BANNER: |
| 34 | + case YELLOW_WALL_BANNER: |
| 35 | + return new CraftMetaBanner(item.getTag()); |
| 36 | ++ case AXOLOTL_SPAWN_EGG: // Paper |
| 37 | + case BAT_SPAWN_EGG: |
| 38 | + case BEE_SPAWN_EGG: |
| 39 | + case BLAZE_SPAWN_EGG: |
| 40 | +@@ -367,6 +368,8 @@ public final class CraftItemStack extends ItemStack { |
| 41 | + case EVOKER_SPAWN_EGG: |
| 42 | + case FOX_SPAWN_EGG: |
| 43 | + case GHAST_SPAWN_EGG: |
| 44 | ++ case GLOW_SQUID_SPAWN_EGG: // Paper |
| 45 | ++ case GOAT_SPAWN_EGG: // Paper |
| 46 | + case GUARDIAN_SPAWN_EGG: |
| 47 | + case HOGLIN_SPAWN_EGG: |
| 48 | + case HORSE_SPAWN_EGG: |
| 49 | +diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java |
| 50 | +index 31d649ad03fb80374155a3a276066a4c668d02f4..c485f2cb13cdaae2afdd047c55ae0c7d3fab3d49 100644 |
| 51 | +--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java |
| 52 | ++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java |
| 53 | +@@ -112,6 +112,7 @@ public class CraftMetaSpawnEgg extends CraftMetaItem implements SpawnEggMeta { |
| 54 | + @Override |
| 55 | + boolean applicableTo(Material type) { |
| 56 | + switch (type) { |
| 57 | ++ case AXOLOTL_SPAWN_EGG: // Paper |
| 58 | + case BAT_SPAWN_EGG: |
| 59 | + case BEE_SPAWN_EGG: |
| 60 | + case BLAZE_SPAWN_EGG: |
| 61 | +@@ -130,6 +131,8 @@ public class CraftMetaSpawnEgg extends CraftMetaItem implements SpawnEggMeta { |
| 62 | + case EVOKER_SPAWN_EGG: |
| 63 | + case FOX_SPAWN_EGG: |
| 64 | + case GHAST_SPAWN_EGG: |
| 65 | ++ case GLOW_SQUID_SPAWN_EGG: // Paper |
| 66 | ++ case GOAT_SPAWN_EGG: // Paper |
| 67 | + case GUARDIAN_SPAWN_EGG: |
| 68 | + case HOGLIN_SPAWN_EGG: |
| 69 | + case HORSE_SPAWN_EGG: |
0 commit comments