mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-26 17:17:13 +01: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
81 lines
2.3 KiB
Diff
81 lines
2.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
|
|
Date: Fri, 19 Mar 2021 23:25:38 -0400
|
|
Subject: [PATCH] Add TameableDeathMessageEvent
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/event/entity/TameableDeathMessageEvent.java b/src/main/java/io/papermc/paper/event/entity/TameableDeathMessageEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..70cd37aefbd5d64c798ab2fc3b6d502134690348
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/entity/TameableDeathMessageEvent.java
|
|
@@ -0,0 +1,69 @@
|
|
+package io.papermc.paper.event.entity;
|
|
+
|
|
+import net.kyori.adventure.text.Component;
|
|
+import org.bukkit.entity.Tameable;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.entity.EntityEvent;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+/**
|
|
+ * Called when a {@link Tameable} dies and sends a death message.
|
|
+ */
|
|
+public class TameableDeathMessageEvent extends EntityEvent implements Cancellable {
|
|
+
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+ private boolean cancelled;
|
|
+ private Component deathMessage;
|
|
+
|
|
+ public TameableDeathMessageEvent(@NotNull Tameable what, @NotNull Component deathMessage) {
|
|
+ super(what);
|
|
+ this.deathMessage = deathMessage;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Set the death message that appears to the owner of the tameable.
|
|
+ *
|
|
+ * @param deathMessage Death message to appear
|
|
+ */
|
|
+ public void deathMessage(@NotNull Component deathMessage) {
|
|
+ this.deathMessage = deathMessage;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Get the death message that appears to the owner of the tameable.
|
|
+ *
|
|
+ * @return Death message to appear
|
|
+ */
|
|
+ @NotNull
|
|
+ public Component deathMessage() {
|
|
+ return deathMessage;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return cancelled;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ this.cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public Tameable getEntity() {
|
|
+ return (Tameable) super.getEntity();
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+}
|