From 55ca459515b2c4cc5c99543713698bd50324aa29 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Wed, 20 Oct 2021 14:41:54 -0700 Subject: [PATCH] rename method to getSpawnEgg --- patches/api/0341-Add-ItemFactory-getMonsterEgg-API.patch | 6 +++--- patches/server/0831-Add-ItemFactory-getMonsterEgg-API.patch | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/patches/api/0341-Add-ItemFactory-getMonsterEgg-API.patch b/patches/api/0341-Add-ItemFactory-getMonsterEgg-API.patch index 83b62e9db3..601e2fc956 100644 --- a/patches/api/0341-Add-ItemFactory-getMonsterEgg-API.patch +++ b/patches/api/0341-Add-ItemFactory-getMonsterEgg-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add ItemFactory#getMonsterEgg API diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java -index 0a4466c6ca519c3a5da76ff870fb2a4e3a06effd..d87ec9754f8327ad163c91f0941e195cc970c1ed 100644 +index 0a4466c6ca519c3a5da76ff870fb2a4e3a06effd..8677e273641a46aae7107361f23f6ded59a50dc0 100644 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java @@ -241,5 +241,14 @@ public interface ItemFactory { @@ -14,12 +14,12 @@ index 0a4466c6ca519c3a5da76ff870fb2a4e3a06effd..d87ec9754f8327ad163c91f0941e195c net.md_5.bungee.api.chat.hover.content.Content hoverContentOf(@NotNull org.bukkit.entity.Entity entity, @NotNull net.md_5.bungee.api.chat.BaseComponent[] customName); + + /** -+ * Get a monster egg ItemStack from an EntityType ++ * Get a spawn egg ItemStack from an EntityType + * + * @param type EntityType + * @return ItemStack spawner egg + */ + @Nullable -+ ItemStack getMonsterEgg(@Nullable org.bukkit.entity.EntityType type); ++ ItemStack getSpawnEgg(@Nullable org.bukkit.entity.EntityType type); // Paper end } diff --git a/patches/server/0831-Add-ItemFactory-getMonsterEgg-API.patch b/patches/server/0831-Add-ItemFactory-getMonsterEgg-API.patch index 03e3bed99c..ac53f4fe59 100644 --- a/patches/server/0831-Add-ItemFactory-getMonsterEgg-API.patch +++ b/patches/server/0831-Add-ItemFactory-getMonsterEgg-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add ItemFactory#getMonsterEgg API diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -index aa7fd5c80712fecca1110341a234f60e8607b809..1e80d3e6778850e859e2f9c0c2fecb0d6ff1a8bb 100644 +index aa7fd5c80712fecca1110341a234f60e8607b809..a30bb0a1dde5b5a7980331914a5f852e6bcd19dc 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java @@ -409,5 +409,17 @@ public final class CraftItemFactory implements ItemFactory { @@ -14,7 +14,7 @@ index aa7fd5c80712fecca1110341a234f60e8607b809..1e80d3e6778850e859e2f9c0c2fecb0d } + + @Override -+ public ItemStack getMonsterEgg(org.bukkit.entity.EntityType type) { ++ public ItemStack getSpawnEgg(org.bukkit.entity.EntityType type) { + if (type == null) { + return null; + }