spigot-mirror/bukkit
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/bukkit.git synced 2025-04-13 09:41:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SPIGOT-7731: Spawn eggs cannot have damage

Browse source
This commit is contained in:
Doc 2024-06-10 14:06:27 +10:00 • committed by md_5
parent e585297ede
commit 19b7caaabe
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
2 changed files with 0 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/org/bukkit/inventory/ItemFactory.java
View file

@ -10,7 +10,6 @@ import org.bukkit.entity.EntityType;
import org.bukkit.inventory.meta.BookMeta; import org.bukkit.inventory.meta.BookMeta;
import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.inventory.meta.SkullMeta; import org.bukkit.inventory.meta.SkullMeta;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@ -150,20 +149,6 @@ public interface ItemFactory {
@NotNull @NotNull
ItemStack createItemStack(@NotNull String input) throws IllegalArgumentException; ItemStack createItemStack(@NotNull String input) throws IllegalArgumentException;
/**
* Apply a material change for an item meta. Do not use under any
* circumstances.
*
* @param meta meta
* @param material material
* @return updated material
* @throws IllegalArgumentException if bad material or data
* @apiNote for internal use only
*/
@ApiStatus.Internal
@NotNull
Material updateMaterial(@NotNull final ItemMeta meta, @NotNull final Material material) throws IllegalArgumentException;
/** /**
* Gets a {@link Material} representing the spawn egg for the provided * Gets a {@link Material} representing the spawn egg for the provided
* {@link EntityType}. <br> * {@link EntityType}. <br>

5
src/main/java/org/bukkit/inventory/ItemStack.java
View file

@ -614,11 +614,6 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
} }
this.meta = Bukkit.getItemFactory().asMetaFor(itemMeta, material); this.meta = Bukkit.getItemFactory().asMetaFor(itemMeta, material);
Material newType = Bukkit.getItemFactory().updateMaterial(meta, material);
if (this.type != newType) {
this.type = newType;
}
if (this.meta == itemMeta) { if (this.meta == itemMeta) {
this.meta = itemMeta.clone(); this.meta = itemMeta.clone();
} }