minestat 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: affbc3d1ec0778e630ea341dbd8afcf5f79a907f2da08554703f4b52d6f7f553
-  data.tar.gz: c65a8af83bc4c81695892c3447480ccde9fc731bab00e28ac7700012b7203341
+  metadata.gz: 1aae005889c4dfd2940d4fe464195aceb82380a03437603bbfc984a036a79b91
+  data.tar.gz: bb333f2e25d3dd899b26e357bfeffffa8411055832f5c6b36eee850c6912314f
 SHA512:
-  metadata.gz: 62da41df1030d258d4f72ac64c9d4e8f882372e43c2a342712e48b75e016634076ac4537a928e5631ed61448df1e35210e697e0c9dd1023032079e9b6bfb0d54
-  data.tar.gz: f442d1bbe7a625d5ae7eb665da4caf6612465abbb83e031a1ea010e6aa3f7aa0b41c8b74da15f2e06a987702ac440091dd3495701864c2682d0a5b72cf492281
+  metadata.gz: 98d83d61c188baffac40427684cc7e93d1e77db3a4acf1e58c55e6f0cba39d2e48a57b7ae53562aa0041c47ca60fdd6abb360e0caae820e30b13e7164b1819ae
+  data.tar.gz: 8ccb0e3159c32175ec677b37dc15960532bedf2bb238ea185f7f01c4ee02e4a3245d166889abaa36bbf1f6e152f0ee477dbb4bd72022093b6b09c50847174a52

data/lib/minestat.rb

@@ -25,7 +25,7 @@ require 'timeout'
 # Provides a ruby interface for polling Minecraft server status.
 class MineStat
   # MineStat version
-  VERSION = "2.2.2"
+  VERSION = "2.2.3"
   # Number of values expected from server
   NUM_FIELDS = 6
   # Number of values expected from a 1.8b/1.3 server
@@ -135,12 +135,11 @@ class MineStat
           retval = json_request()
         end
         # Bedrock/Pocket Edition
-        unless retval == Retval::SUCCESS || retval == Retval::CONNFAIL
+        unless @online || retval == Retval::SUCCESS || retval == Retval::CONNFAIL
           retval = bedrock_request()
         end
     end
-    set_connection_status(retval)
-    @online = false unless retval == Retval::SUCCESS
+    set_connection_status(retval) unless @online
   end
 
   # Sets connection status
@@ -286,7 +285,6 @@ class MineStat
         retval = connect()
         return retval unless retval == Retval::SUCCESS
         # Perform handshake and acquire data
-        @request_type = "SLP 1.8b/1.3 (beta)"
         @server.write("\xFE")
         retval = parse_data("\u00A7", true) # section symbol
       end
@@ -296,6 +294,10 @@ class MineStat
       $stderr.puts exception
       return Retval::UNKNOWN
     end
+    if retval == Retval::SUCCESS
+      @request_type = "SLP 1.8b/1.3 (beta)"
+      set_connection_status(retval)
+    end
     return retval
   end
 
@@ -325,7 +327,6 @@ class MineStat
         retval = connect()
         return retval unless retval == Retval::SUCCESS
         # Perform handshake and acquire data
-        @request_type = "SLP 1.4/1.5 (legacy)"
         @server.write("\xFE\x01")
         retval = parse_data("\x00") # null
       end
@@ -335,6 +336,10 @@ class MineStat
       $stderr.puts exception
       return Retval::UNKNOWN
     end
+    if retval == Retval::SUCCESS
+      @request_type = "SLP 1.4/1.5 (legacy)"
+      set_connection_status(retval)
+    end
     return retval
   end
 
@@ -372,7 +377,6 @@ class MineStat
         retval = connect()
         return retval unless retval == Retval::SUCCESS
         # Perform handshake and acquire data
-        @request_type = "SLP 1.6 (extended legacy)"
         @server.write("\xFE\x01\xFA")
         @server.write("\x00\x0B") # 11 (length of "MC|PingHost")
         @server.write('MC|PingHost'.encode('UTF-16BE').force_encoding('ASCII-8BIT'))
@@ -389,6 +393,10 @@ class MineStat
       $stderr.puts exception
       return Retval::UNKNOWN
     end
+    if retval == Retval::SUCCESS
+      @request_type = "SLP 1.6 (extended legacy)"
+      set_connection_status(retval)
+    end
     return retval
   end
 
@@ -415,7 +423,6 @@ class MineStat
         retval = connect()
         return retval unless retval == Retval::SUCCESS
         # Perform handshake
-        @request_type = "SLP 1.7 (JSON)"
         payload = "\x00\x00"
         payload += [@address.length].pack('c') << @address
         payload += [@port].pack('n')
@@ -460,6 +467,10 @@ class MineStat
       $stderr.puts exception
       return Retval::UNKNOWN
     end
+    if retval == Retval::SUCCESS
+      @request_type = "SLP 1.7 (JSON)"
+      set_connection_status(retval)
+    end
     return retval
   end
 
@@ -526,7 +537,6 @@ class MineStat
     retval = nil
     begin
       Timeout::timeout(@timeout) do
-        @request_type = "Bedrock/Pocket Edition"
         retval = connect()
         return retval unless retval == Retval::SUCCESS
         # Perform handshake and acquire data
@@ -544,6 +554,10 @@ class MineStat
       $stderr.puts exception
       return Retval::UNKNOWN
     end
+    if retval == Retval::SUCCESS
+      @request_type = "Bedrock/Pocket Edition"
+      set_connection_status(retval)
+    end
     return retval
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minestat
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Lloyd Dilley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-12 00:00:00.000000000 Z
+date: 2022-11-30 00:00:00.000000000 Z
 dependencies: []
 description: MineStat polls Minecraft server data such as version, motd, current players,
   and max players.