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

patches/server/Fix-NPE-on-Boat-getStatus.patch

@@ -16,7 +16,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      @Override
      public Status getStatus() {
-+        // Paper start
++        // Paper start - Fix NPE on Boat getStatus
 +        final net.minecraft.world.entity.vehicle.Boat handle = this.getHandle();
 +        if (handle.status == null) {
 +            if (handle.valid && !handle.updatingSectionStatus) {
@@ -26,7 +26,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                return Status.NOT_IN_WORLD;
 +            }
 +        }
-+        // Paper end
++        // Paper end - Fix NPE on Boat getStatus
          return CraftBoat.boatStatusFromNms(this.getHandle().status);
      }