geforkt von Mirrors/Paper
71c84c8132
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: 9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent 258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD CraftBukkit Changes: 98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent 5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class 76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor Spigot Changes: e9ec5485 Rebuild patches f1b62e0c Rebuild patches
37 Zeilen
1.5 KiB
Diff
37 Zeilen
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;
|