Merge branch 'master' into 1.16

# Conflicts:
#	src/main/java/carpet/utils/PerimeterDiagnostics.java
#	src/main/java/carpet/utils/SpawnReporter.java

src/main/java/carpet/utils/PerimeterDiagnostics.java

@@ -177,7 +177,7 @@ public class PerimeterDiagnostics
         if (SpawnHelper.canSpawn(spt, worldServer, pos, sle.type))
         {
             el.refreshPositionAndAngles((float)pos.getX() + 0.5F, (float)pos.getY(), (float)pos.getZ()+0.5F, 0.0F, 0.0F);
-            return el.canSpawn(worldServer) &&
+            return el.canSpawn(worldServer) && el.canSpawn(worldServer, SpawnType.NATURAL) &&
                     SpawnRestriction.canSpawn(el.getType(),el.getEntityWorld(), SpawnType.NATURAL, el.getSenseCenterPos(), el.getEntityWorld().random) &&
                     worldServer.doesNotCollide(el); // check collision rules once they stop fiddling with them after 1.14.1
         }