Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@dcca6cb Make tag presets unmodifiable (#7378)
PaperMC/Paper@60e46ab Fix NotePlayEvent (#5180)

gradle.properties

@@ -4,7 +4,7 @@ version = 1.18.1-R0.1-SNAPSHOT
 mcVersion = 1.18.1
 packageVersion = 1_18_R1
 
-paperCommit = feb72b8ae122e0b7088a1ee8c6127069ca038269
+paperCommit = 60e46abb0062690289e8a65535322746c922a866
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/server/0133-Config-to-allow-Note-Block-sounds-when-blocked.patch

@@ -9,7 +9,7 @@ Normally, the sounds will only play when the block directly above is air.
 With this patch enabled, players can place any block above the Note Block and it will still work.
 
 diff --git a/src/main/java/net/minecraft/world/level/block/NoteBlock.java b/src/main/java/net/minecraft/world/level/block/NoteBlock.java
-index 7dd423f6b92b7f27dd43e5ef3f4029a100a8cfa6..8d0a1da17c38118293d1f05849cdc99970ed8795 100644
+index e5f2c3fefe22bc348eb50f0e9b2fed2f24bdede0..ce6701d46e28a24aecd348a4019aad5aa08f0b05 100644
 --- a/src/main/java/net/minecraft/world/level/block/NoteBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/NoteBlock.java
 @@ -61,7 +61,7 @@ public class NoteBlock extends Block {
@@ -19,10 +19,10 @@ index 7dd423f6b92b7f27dd43e5ef3f4029a100a8cfa6..8d0a1da17c38118293d1f05849cdc999
 -        if (world.getBlockState(blockposition.above()).isAir()) {
 +        if (world.purpurConfig.noteBlockIgnoreAbove || world.getBlockState(blockposition.above()).isAir()) { // Purpur
              // CraftBukkit start
-             org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, blockposition, data.getValue(NoteBlock.INSTRUMENT), data.getValue(NoteBlock.NOTE));
-             if (!event.isCancelled()) {
+             // Paper start - move NotePlayEvent call to fix instrument/note changes
+                 world.blockEvent(blockposition, this, 0, 0);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 53ae26c6713af64b1a04d2bd0ee5c0c10796fff4..a5957179e59175081e8338dd3d0894b412a625e1 100644
+index 0a44f20e99bc3ba2ed3e2e78e476a33b595c8bea..5135ce3a370d9d613a79eecda007fa3459fabf9d 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -112,6 +112,7 @@ public class PurpurWorldConfig {