mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (Bukkit/CraftBukkit/Spigot) (#8092)

Browse source 
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:
d41796de SPIGOT-7071: Add Player#stopSound(SoundCategory category)
61dae5b2 SPIGOT-7011, SPIGOT-7065: Overhaul of structures

CraftBukkit Changes:
991aeda12 SPIGOT-1729, SPIGOT-7090: Keep precision in teleportation between worlds
5c9a5f628 SPIGOT-7071: Add Player#stopSound(SoundCategory category)
68f888ded SPIGOT-7011, SPIGOT-7065: Overhaul of structures
0231a3746 Remove outdated build delay.

Spigot Changes:
475f6008 Rebuild patches
8ce1761f Rebuild patches
This commit is contained in:
Nassim Jahnke 2022-07-04 16:38:06 +02:00 • committed by GitHub
parent 1e5d1db2b7
commit 385f313a8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
271 changed files with 640 additions and 748 deletions
Download patch file Download diff file Expand all files Collapse all files

81
patches/api/0375-Add-TameableDeathMessageEvent.patch Normal file
View file

@ -0,0 +1,81 @@
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;
+ }
+}