From 4228a56c0dcb17c9c1333619d2faa21f6c02bfc1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 27 Aug 2018 21:01:46 +1000 Subject: [PATCH] SPIGOT-4318: More missing spawn eggs --- .../bukkit/craftbukkit/inventory/CraftItemFactory.java | 6 ++++++ .../org/bukkit/craftbukkit/inventory/CraftItemStack.java | 6 ++++++ .../bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java | 8 +++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java index 6998fddc5a..5fc0283b22 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java @@ -141,8 +141,11 @@ public final class CraftItemFactory implements ItemFactory { case BLAZE_SPAWN_EGG: case CAVE_SPIDER_SPAWN_EGG: case CHICKEN_SPAWN_EGG: + case COD_SPAWN_EGG: case COW_SPAWN_EGG: case CREEPER_SPAWN_EGG: + case DOLPHIN_SPAWN_EGG: + case DROWNED_SPAWN_EGG: case DONKEY_SPAWN_EGG: case ELDER_GUARDIAN_SPAWN_EGG: case ENDERMAN_SPAWN_EGG: @@ -161,7 +164,9 @@ public final class CraftItemFactory implements ItemFactory { case PHANTOM_SPAWN_EGG: case PIG_SPAWN_EGG: case POLAR_BEAR_SPAWN_EGG: + case PUFFERFISH_SPAWN_EGG: case RABBIT_SPAWN_EGG: + case SALMON_SPAWN_EGG: case SHEEP_SPAWN_EGG: case SHULKER_SPAWN_EGG: case SILVERFISH_SPAWN_EGG: @@ -171,6 +176,7 @@ public final class CraftItemFactory implements ItemFactory { case SPIDER_SPAWN_EGG: case SQUID_SPAWN_EGG: case STRAY_SPAWN_EGG: + case TROPICAL_FISH_SPAWN_EGG: case TURTLE_SPAWN_EGG: case VEX_SPAWN_EGG: case VILLAGER_SPAWN_EGG: diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java index ef4c49f1ff..1d0580ff7f 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -403,8 +403,11 @@ public final class CraftItemStack extends ItemStack { case BLAZE_SPAWN_EGG: case CAVE_SPIDER_SPAWN_EGG: case CHICKEN_SPAWN_EGG: + case COD_SPAWN_EGG: case COW_SPAWN_EGG: case CREEPER_SPAWN_EGG: + case DOLPHIN_SPAWN_EGG: + case DROWNED_SPAWN_EGG: case DONKEY_SPAWN_EGG: case ELDER_GUARDIAN_SPAWN_EGG: case ENDERMAN_SPAWN_EGG: @@ -423,7 +426,9 @@ public final class CraftItemStack extends ItemStack { case PHANTOM_SPAWN_EGG: case PIG_SPAWN_EGG: case POLAR_BEAR_SPAWN_EGG: + case PUFFERFISH_SPAWN_EGG: case RABBIT_SPAWN_EGG: + case SALMON_SPAWN_EGG: case SHEEP_SPAWN_EGG: case SHULKER_SPAWN_EGG: case SILVERFISH_SPAWN_EGG: @@ -433,6 +438,7 @@ public final class CraftItemStack extends ItemStack { case SPIDER_SPAWN_EGG: case SQUID_SPAWN_EGG: case STRAY_SPAWN_EGG: + case TROPICAL_FISH_SPAWN_EGG: case TURTLE_SPAWN_EGG: case VEX_SPAWN_EGG: case VILLAGER_SPAWN_EGG: diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java index 7a9f29aa8a..81f9bb629a 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java @@ -119,8 +119,11 @@ public class CraftMetaSpawnEgg extends CraftMetaItem implements SpawnEggMeta { case BLAZE_SPAWN_EGG: case CAVE_SPIDER_SPAWN_EGG: case CHICKEN_SPAWN_EGG: + case COD_SPAWN_EGG: case COW_SPAWN_EGG: case CREEPER_SPAWN_EGG: + case DOLPHIN_SPAWN_EGG: + case DROWNED_SPAWN_EGG: case DONKEY_SPAWN_EGG: case ELDER_GUARDIAN_SPAWN_EGG: case ENDERMAN_SPAWN_EGG: @@ -139,7 +142,9 @@ public class CraftMetaSpawnEgg extends CraftMetaItem implements SpawnEggMeta { case PHANTOM_SPAWN_EGG: case PIG_SPAWN_EGG: case POLAR_BEAR_SPAWN_EGG: + case PUFFERFISH_SPAWN_EGG: case RABBIT_SPAWN_EGG: + case SALMON_SPAWN_EGG: case SHEEP_SPAWN_EGG: case SHULKER_SPAWN_EGG: case SILVERFISH_SPAWN_EGG: @@ -149,6 +154,7 @@ public class CraftMetaSpawnEgg extends CraftMetaItem implements SpawnEggMeta { case SPIDER_SPAWN_EGG: case SQUID_SPAWN_EGG: case STRAY_SPAWN_EGG: + case TROPICAL_FISH_SPAWN_EGG: case TURTLE_SPAWN_EGG: case VEX_SPAWN_EGG: case VILLAGER_SPAWN_EGG: @@ -159,7 +165,7 @@ public class CraftMetaSpawnEgg extends CraftMetaItem implements SpawnEggMeta { case ZOMBIE_HORSE_SPAWN_EGG: case ZOMBIE_PIGMAN_SPAWN_EGG: case ZOMBIE_SPAWN_EGG: - case ZOMBIE_VILLAGER_SPAWN_EGG: + case ZOMBIE_VILLAGER_SPAWN_EGG: return true; default: return false;