mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-05 03:04:51 +02:00
efd47e3a68
* Updated Upstream (Bukkit/CraftBukkit/Spigot) 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: 2fcba9b2 SPIGOT-7347: Add missing documentation and details to ShapedRecipe c278419d PR-854: Move getHighestBlockYAt methods from World to RegionAccessor 201399fb PR-853: Add API for directly setting Display transformation matrices ecfa559a PR-849: Add InventoryView#setTitle 653d7edb SPIGOT-519: Add TNTPrimeEvent 22fccc09 PR-846: Add method to get chunk load level a070a52c PR-844: Add methods to convert Vector to and from JOML vectors cc7111fe PR-276: Add accessors to Wither's invulnerability ticks 777d24e9 SPIGOT-7209: Accessors and events for player's exp cooldown ccb2d01b SPIGOT-6308: Deprecate the location name property of map items cd04a31b PR-780: Add PlayerSpawnChangeEvent 7d1f5b64 SPIGOT-6780: Improve documentation for World#spawnFallingBlock 5696668a SPIGOT-6885: Add test and easier to debug code for reference in yaml configuration comments 2e13cff7 PR-589: Expand the FishHook API 2c7d3da5 PR-279: Minor edits to various Javadocs CraftBukkit Changes: 01b2e1af4 SPIGOT-7346: Disallow players from executing commands after disconnecting 7fe5ee022 PR-1186: Move getHighestBlockYAt methods from World to RegionAccessor bcc85ef67 PR-1185: Add API for directly setting Display transformation matrices a7cfc778f PR-1176: Add InventoryView#setTitle 563d42226 SPIGOT-519: Add TNTPrimeEvent ccbc6abca Add test for Chunk.LoadLevel mirroring 2926e0513 PR-1171: Add method to get chunk load level 63cad7f84 PR-375: Add accessors to Wither's invulnerability ticks bfd8b1ac8 SPIGOT-7209: Accessors and events for player's exp cooldown f92a41c39 PR-1181: Consolidate Location conversion code 10f866759 SPIGOT-6308: Deprecate the location name property of map items 82f7b658a PR-1095: Add PlayerSpawnChangeEvent b421af7e4 PR-808: Expand the FishHook API 598ad7b3f Increase outdated build delay Spigot Changes: d1bd3bd2 Rebuild patches e4265cc8 SPIGOT-7297: Entity Tracking Range option for Display entities * Work around javac bug * Call PlayerSpawnChangeEvent * Updated Upstream (Bukkit/CraftBukkit/Spigot) 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: 2fcba9b2 SPIGOT-7347: Add missing documentation and details to ShapedRecipe c278419d PR-854: Move getHighestBlockYAt methods from World to RegionAccessor 201399fb PR-853: Add API for directly setting Display transformation matrices CraftBukkit Changes: 01b2e1af4 SPIGOT-7346: Disallow players from executing commands after disconnecting 7fe5ee022 PR-1186: Move getHighestBlockYAt methods from World to RegionAccessor bcc85ef67 PR-1185: Add API for directly setting Display transformation matrices Spigot Changes: 7da74dae Rebuild patches
72 lines
2.6 KiB
Diff
72 lines
2.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Alvinn8 <42838560+Alvinn8@users.noreply.github.com>
|
|
Date: Fri, 8 Jan 2021 20:29:58 +0100
|
|
Subject: [PATCH] Add Adventure message to PlayerAdvancementDoneEvent
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/player/PlayerAdvancementDoneEvent.java b/src/main/java/org/bukkit/event/player/PlayerAdvancementDoneEvent.java
|
|
index 21ff095afb434d15babcdbe85fa0b94cbb7e75a7..6f618bb140a901c5c1cd08210978a6a651677ba4 100644
|
|
--- a/src/main/java/org/bukkit/event/player/PlayerAdvancementDoneEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/player/PlayerAdvancementDoneEvent.java
|
|
@@ -4,6 +4,10 @@ import org.bukkit.advancement.Advancement;
|
|
import org.bukkit.entity.Player;
|
|
import org.bukkit.event.HandlerList;
|
|
import org.jetbrains.annotations.NotNull;
|
|
+// Paper start
|
|
+import org.jetbrains.annotations.Nullable;
|
|
+import net.kyori.adventure.text.Component;
|
|
+// Paper end
|
|
|
|
/**
|
|
* Called when a player has completed all criteria in an advancement.
|
|
@@ -13,10 +17,17 @@ public class PlayerAdvancementDoneEvent extends PlayerEvent {
|
|
private static final HandlerList handlers = new HandlerList();
|
|
//
|
|
private final Advancement advancement;
|
|
+ private Component message; // Paper - Add Adventure message
|
|
|
|
public PlayerAdvancementDoneEvent(@NotNull Player who, @NotNull Advancement advancement) {
|
|
+ // Paper start - Add Adventure message
|
|
+ this(who, advancement, null);
|
|
+ }
|
|
+ public PlayerAdvancementDoneEvent(@NotNull Player who, @NotNull Advancement advancement, @Nullable Component message) {
|
|
+ // Paper end
|
|
super(who);
|
|
this.advancement = advancement;
|
|
+ this.message = message; // Paper - Add Adventure message
|
|
}
|
|
|
|
/**
|
|
@@ -29,6 +40,31 @@ public class PlayerAdvancementDoneEvent extends PlayerEvent {
|
|
return advancement;
|
|
}
|
|
|
|
+ // Paper start - Add Adventure message
|
|
+ /**
|
|
+ * Gets the message to send to all online players.
|
|
+ * <p>
|
|
+ * Will be null if the advancement does not announce to chat, for example if
|
|
+ * it is a recipe unlock or a root advancement.
|
|
+ *
|
|
+ * @return The announcement message, or null
|
|
+ */
|
|
+ @Nullable
|
|
+ public Component message() {
|
|
+ return this.message;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets the message to send to all online players.
|
|
+ * <p>
|
|
+ * If set to null the message will not be sent.
|
|
+ *
|
|
+ * @param message The new message
|
|
+ */
|
|
+ public void message(@Nullable Component message) {
|
|
+ this.message = message;
|
|
+ }
|
|
+ // Paper end
|
|
@NotNull
|
|
@Override
|
|
public HandlerList getHandlers() {
|