diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php index 2e5e77e..587cda7 100644 --- a/src/Controller/MainController.php +++ b/src/Controller/MainController.php @@ -102,7 +102,9 @@ class MainController extends AbstractController 'online' => $server->getOnline(), 'info' => $info, 'status' => $status, - 'sort' => empty($info['Players']) ? 0 : (int) $info['Players'] + 'connections' => is_null($info['Players']) || $info['Players'] < 0 || is_null($info['Bots']) || $info['Bots'] < 0 + ? 0 + : (int) $info['Players'] - (int) $info['Bots'] ]; } @@ -110,7 +112,7 @@ class MainController extends AbstractController array_multisort( array_column( $servers, - 'sort' + 'connections' ), SORT_DESC, $servers diff --git a/src/Controller/ServerController.php b/src/Controller/ServerController.php index 53882b6..7e20623 100644 --- a/src/Controller/ServerController.php +++ b/src/Controller/ServerController.php @@ -175,7 +175,10 @@ class ServerController extends AbstractController 'session' => $session, 'online' => $online, 'players' => $players, - 'status' => $status + 'status' => $status, + 'connections' => is_null($info['Players']) || $info['Players'] < 0 || is_null($info['Bots']) || $info['Bots'] < 0 + ? 0 + : (int) $info['Players'] - (int) $info['Bots'] ] ] ); diff --git a/templates/default/main/index.html.twig b/templates/default/main/index.html.twig index 5ccb8bf..dbb8f29 100644 --- a/templates/default/main/index.html.twig +++ b/templates/default/main/index.html.twig @@ -35,7 +35,7 @@ {{ server.info.Map }} {{ server.added | format_date }} {{ server.online | format_date }} - {{ server.info.Players }} + {{ server.connections }}{#{{ server.info.Players }}#} {{ server.info.MaxPlayers }} {{ server.info.Bots }} diff --git a/templates/default/server/index.html.twig b/templates/default/server/index.html.twig index 2c74749..7f24b1f 100644 --- a/templates/default/server/index.html.twig +++ b/templates/default/server/index.html.twig @@ -70,8 +70,17 @@ {% for key, value in server.info %} - - + + {% endfor %}
{{ key }}{{ value }} + {{ key }} + + {# let's show real connections for players {{ value }} #} + {% if key == 'Players' %} + {{ server.connections }} + {% else %} + {{ value }} + {% endif %} +