mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 04:56:50 +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
36 lines
1.5 KiB
Diff
36 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Kieran Wallbanks <kieran.wallbanks@gmail.com>
|
|
Date: Mon, 21 Jun 2021 12:33:45 +0100
|
|
Subject: [PATCH] Fix NotePlayEvent
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/block/NotePlayEvent.java b/src/main/java/org/bukkit/event/block/NotePlayEvent.java
|
|
index a3887067d1b65fb100ac1407a43c455f5d215510..ea7cb75ba3ecbe40e0390fd5568db77de56c4f16 100644
|
|
--- a/src/main/java/org/bukkit/event/block/NotePlayEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/block/NotePlayEvent.java
|
|
@@ -56,11 +56,13 @@ public class NotePlayEvent extends BlockEvent implements Cancellable {
|
|
|
|
/**
|
|
* Overrides the {@link Instrument} to be used.
|
|
+ * <p>
|
|
+ * Only works when the note block isn't under a player head.
|
|
+ * For this specific case the 'note_block_sound' property of the
|
|
+ * player head state takes the priority.
|
|
*
|
|
* @param instrument the Instrument. Has no effect if null.
|
|
- * @deprecated no effect on newer Minecraft versions
|
|
*/
|
|
- @Deprecated
|
|
public void setInstrument(@NotNull Instrument instrument) {
|
|
if (instrument != null) {
|
|
this.instrument = instrument;
|
|
@@ -71,9 +73,7 @@ public class NotePlayEvent extends BlockEvent implements Cancellable {
|
|
* Overrides the {@link Note} to be played.
|
|
*
|
|
* @param note the Note. Has no effect if null.
|
|
- * @deprecated no effect on newer Minecraft versions
|
|
*/
|
|
- @Deprecated
|
|
public void setNote(@NotNull Note note) {
|
|
if (note != null) {
|
|
this.note = note;
|