[ci skip] Add more identifying patch comments, merge related patches

patches/server/Fix-a-bunch-of-vanilla-bugs.patch

@@ -167,7 +167,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -0,0 +0,0 @@ public class ServerPlayerGameMode {
-                 return event; // Paper
+                 return event; // Paper - Expand PlayerGameModeChangeEvent
              }
              // CraftBukkit end
 -            this.setGameModeForPlayer(gameMode, this.previousGameModeForPlayer);
@@ -483,7 +483,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
          org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(level, worldPosition);
          new io.papermc.paper.event.block.BeaconDeactivatedEvent(block).callEvent();
-         // Paper end
+         // Paper end - beacon activation/deactivation events
 +        // Paper start - fix MC-153086
 +        if (this.levels > 0 && !this.beamSections.isEmpty()) {
          BeaconBlockEntity.playSound(this.level, this.worldPosition, SoundEvents.BEACON_DEACTIVATE);