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

patches/server/Avoid-Lazy-Initialization-for-Enum-Fields.patch

@@ -14,7 +14,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          this.permutation = axisTransformation;
          this.transformation = (new Matrix3f()).scaling(flipX ? -1.0F : 1.0F, flipY ? -1.0F : 1.0F, flipZ ? -1.0F : 1.0F);
          this.transformation.mul(axisTransformation.transformation());
-+        this.initializeRotationDirections(); // Paper
++        this.initializeRotationDirections(); // Paper - Avoid Lazy Initialization for Enum Fields
      }
  
      private BooleanList packInversions() {
@@ -23,7 +23,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
 -    public Direction rotate(Direction direction) {
-+    public void initializeRotationDirections() { // Paper
++    public void initializeRotationDirections() { // Paper - Avoid Lazy Initialization for Enum Fields
          if (this.rotatedDirections == null) {
              this.rotatedDirections = Maps.newEnumMap(Direction.class);
              Direction.Axis[] axiss = Direction.Axis.values();
@@ -31,10 +31,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              }
          }
  
-+    // Paper start - Move lazy initialization to constructor
++    // Paper start - Avoid Lazy Initialization for Enum Fields
 +    }
 +    public Direction rotate(Direction direction) {
-+    // Paper end
++    // Paper end - Avoid Lazy Initialization for Enum Fields
          return this.rotatedDirections.get(direction);
      }