mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-11 06:04:57 +02:00
928bcc8d3a
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
56 lines
2.2 KiB
Diff
56 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Sun, 3 Jan 2021 20:03:40 -0800
|
|
Subject: [PATCH] Added Vanilla Entity Tags
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
|
|
index 60e98f0eb8028fc9dfb73320b2939a33435174c1..92bb9bbfb9181e9aa9edfe39ddbbfa54dab14df0 100644
|
|
--- a/src/main/java/org/bukkit/Tag.java
|
|
+++ b/src/main/java/org/bukkit/Tag.java
|
|
@@ -811,6 +811,44 @@ public interface Tag<T extends Keyed> extends Keyed {
|
|
* Vanilla tag representing entities which can be eaten by frogs.
|
|
*/
|
|
Tag<EntityType> ENTITY_TYPES_FROG_FOOD = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("frog_food"), EntityType.class);
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Key for the built-in entity registry
|
|
+ * @deprecated use {@link #REGISTRY_ENTITY_TYPES}
|
|
+ */
|
|
+ @Deprecated(forRemoval = true)
|
|
+ String REGISTRY_ENTITIES = REGISTRY_ENTITY_TYPES;
|
|
+ /**
|
|
+ * Vanilla entity tag representing arrow entities.
|
|
+ * @deprecated use {@link #ENTITY_TYPES_ARROWS}
|
|
+ */
|
|
+ @Deprecated(forRemoval = true)
|
|
+ Tag<EntityType> ARROWS = ENTITY_TYPES_ARROWS;
|
|
+ /**
|
|
+ * Vanilla entity tag representing entities that live in beehives
|
|
+ * @deprecated use {@link #ENTITY_TYPES_BEEHIVE_INHABITORS}
|
|
+ */
|
|
+ @Deprecated(forRemoval = true)
|
|
+ Tag<EntityType> BEEHIVE_INHABITORS = ENTITY_TYPES_BEEHIVE_INHABITORS;
|
|
+ /**
|
|
+ * Vanilla entity tag representing projectiles that impact
|
|
+ * @deprecated use {@link #ENTITY_TYPES_IMPACT_PROJECTILES}
|
|
+ */
|
|
+ @Deprecated(forRemoval = true)
|
|
+ Tag<EntityType> IMPACT_PROJECTILES = ENTITY_TYPES_IMPACT_PROJECTILES;
|
|
+ /**
|
|
+ * Vanilla entity tag for village raiders
|
|
+ * @deprecated use {@link #ENTITY_TYPES_RAIDERS}
|
|
+ */
|
|
+ @Deprecated(forRemoval = true)
|
|
+ Tag<EntityType> RAIDERS = ENTITY_TYPES_RAIDERS;
|
|
+ /**
|
|
+ * Vanilla entity tag for skeleton types
|
|
+ * @deprecated use {@link #ENTITY_TYPES_SKELETONS}
|
|
+ */
|
|
+ @Deprecated(forRemoval = true)
|
|
+ Tag<EntityType> SKELETONS = ENTITY_TYPES_SKELETONS;
|
|
+ // Paper end
|
|
|
|
/**
|
|
* Returns whether or not this tag has an entry for the specified item.
|