mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-18 01:41:13 +02:00
2f92d4e00e
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: 01bb6ba7 PR-936: Add new PersistentDataContainer methods and clean up docs bc145b90 PR-940: Create registry for banner pattern and cat type CraftBukkit Changes: cb2ea54de SPIGOT-7440, PR-1292: Fire EntityTeleportEvent for end gateways 4fea66e44 PR-1299: Add new PersistentDataContainer methods and clean up docs b483a20db PR-1303: Create registry for banner pattern and cat type 4642dd526 SPIGOT-7535: Fix maps not having an ID and also call MapInitializeEvent in more places
45 lines
2.0 KiB
Diff
45 lines
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Sat, 18 Dec 2021 10:34:21 -0800
|
|
Subject: [PATCH] Add GameEvent tags
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
|
|
index 31bdecf8cbea40129a568c1761f27fa1ae0f535a..35d52539f264202d50d70e6aaab4678571dc8ad2 100644
|
|
--- a/src/main/java/org/bukkit/Tag.java
|
|
+++ b/src/main/java/org/bukkit/Tag.java
|
|
@@ -968,6 +968,7 @@ public interface Tag<T extends Keyed> extends Keyed {
|
|
* Vanilla tag representing entities which are dismounted when underwater.
|
|
*/
|
|
Tag<EntityType> ENTITY_TYPES_DISMOUNTS_UNDERWATER = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("dismounts_underwater"), EntityType.class);
|
|
+
|
|
/**
|
|
* Vanilla tag representing entities which are not controlled by their mount.
|
|
*/
|
|
@@ -985,6 +986,25 @@ public interface Tag<T extends Keyed> extends Keyed {
|
|
*/
|
|
Tag<EntityType> ENTITY_TYPES_CAN_TURN_IN_BOATS = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("can_turn_in_boats"), EntityType.class);
|
|
|
|
+ // Paper start
|
|
+ String REGISTRY_GAME_EVENTS = "game_events";
|
|
+
|
|
+ /**
|
|
+ * Tag for game events that trigger sculk sensors
|
|
+ */
|
|
+ Tag<GameEvent> GAME_EVENT_VIBRATIONS = Bukkit.getTag(REGISTRY_GAME_EVENTS, NamespacedKey.minecraft("vibrations"), GameEvent.class);
|
|
+
|
|
+ /**
|
|
+ * Tag for game events that are ignored if the entity is sneaking
|
|
+ */
|
|
+ Tag<GameEvent> GAME_EVENT_IGNORE_VIBRATIONS_SNEAKING = Bukkit.getTag(REGISTRY_GAME_EVENTS, NamespacedKey.minecraft("ignore_vibrations_sneaking"), GameEvent.class);
|
|
+
|
|
+ /**
|
|
+ * Tag for game events that an allay can listen to
|
|
+ */
|
|
+ Tag<GameEvent> GAME_EVENT_ALLAY_CAN_LISTEN = Bukkit.getTag(REGISTRY_GAME_EVENTS, NamespacedKey.minecraft("allay_can_listen"), GameEvent.class);
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Returns whether or not this tag has an entry for the specified item.
|
|
*
|