Use challenge straight away if available

This reverts commit 7231921b0b.

Examples/View.php

@@ -17,6 +17,7 @@
 	$Info    = Array( );
 	$Rules   = Array( );
 	$Players = Array( );
+	$Exception = null;
 	
 	try
 	{
@@ -87,13 +88,11 @@
 	</div>
 		
 	<div class="container">
-<?php if( isset( $Exception ) ): ?>
+<?php if( $Exception !== null ): ?>
-		<div class="panel panel-primary">
+		<div class="panel panel-error">
-			<div class="panel-heading"><?php echo Get_Class( $Exception ); ?> at line <?php echo $Exception->getLine( ); ?></div>
+			<pre class="panel-body"><?php echo htmlspecialchars( $Exception->__toString( ) ); ?></pre>
-			<p><b><?php echo htmlspecialchars( $Exception->getMessage( ) ); ?></b></p>
-			<p><?php echo nl2br( $e->getTraceAsString(), false ); ?></p>
 		</div>
-<?php else: ?>
+<?php endif; ?>
 		<div class="row">
 			<div class="col-sm-6">
 				<table class="table table-bordered table-striped">
@@ -193,7 +192,6 @@
 				</table>
 			</div>
 		</div>
-<?php endif; ?>
 	</div>
 </body>
 </html>

README.md

@@ -1,7 +1,5 @@
 # PHP Source Query
 
-[![Build Status](https://img.shields.io/travis/com/xPaw/PHP-Source-Query.svg)](https://travis-ci.com/xPaw/PHP-Source-Query)
-[![Test Coverage](https://img.shields.io/coveralls/github/xPaw/PHP-Source-Query/master.svg)](https://coveralls.io/github/xPaw/PHP-Source-Query)
 [![Packagist Downloads](https://img.shields.io/packagist/dt/xpaw/php-source-query-class.svg)](https://packagist.org/packages/xpaw/php-source-query-class)
 [![Packagist Version](https://img.shields.io/packagist/v/xpaw/php-source-query-class.svg)](https://packagist.org/packages/xpaw/php-source-query-class)
 

SourceQuery/SourceQuery.php

@@ -200,12 +200,28 @@
 				throw new SocketException( 'Not connected.', SocketException::NOT_CONNECTED );
 			}
 			
-			$this->Socket->Write( self::A2S_INFO, "Source Engine Query\0" );
+			if( $this->Challenge )
-			$Buffer = $this->Socket->Read( );
+			{
+				$this->Socket->Write( self::A2S_INFO, "Source Engine Query\0" . $this->Challenge );
+			}
+			else
+			{
+				$this->Socket->Write( self::A2S_INFO, "Source Engine Query\0" );
+			}
 
+			$Buffer = $this->Socket->Read( );
 			$Type = $Buffer->GetByte( );
 			$Server = [];
 			
+			if( $Type === self::S2A_CHALLENGE )
+			{
+				$this->Challenge = $Buffer->Get( 4 );
+
+				$this->Socket->Write( self::A2S_INFO, "Source Engine Query\0" . $this->Challenge );
+				$Buffer = $this->Socket->Read( );
+				$Type = $Buffer->GetByte( );
+			}
+
 			// Old GoldSource protocol, HLTV still uses it
 			if( $Type === self::S2A_INFO_OLD && $this->Socket->Engine === self::GOLDSOURCE )
 			{

composer.json

@@ -23,8 +23,7 @@
 	"require-dev":
 	{
 		"phpunit/phpunit": "9.2",
-		"vimeo/psalm": "^3.12",
+		"vimeo/psalm": "^3.12"
-		"php-coveralls/php-coveralls": "^2.2"
 	},
 	"autoload":
 	{