Move player finders
to a proper place & optimize them
#2161
+148
−47
player finders
to a proper place & optimize them
#2161