Changed _address and _port to private fields

Author: Aquerr

MCQuery/Connection.cs

@@ -7,8 +7,8 @@ namespace MCQuery
 {
 	public abstract class Connection : IDisposable
 	{
-		protected internal string _address = "";
-		protected internal int _port = 0;
+		private string _address = "";
+		private int _port = 0;
 
 	    private UdpClient _udpClient;
 		private TcpClient _tcpClient;

MCQuery/Query.cs

@@ -2,12 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using System.Timers;
 
 namespace MCQuery
 {
-	public class Query : Connection
+    public class Query : Connection
 	{
 		//Byte[] - Magic Number
 		private readonly byte[] _magic = { 0xFE, 0xFD };
@@ -98,7 +97,7 @@ private byte[] GetFullStat(string address, int port)
 
 		public Server GetBasicServerInfo()
 		{
-			byte[] responseData = GetBasicStat(_address, _port);
+			byte[] responseData = GetBasicStat(base.Address, base.Port);
 
 			if (responseData.Length != 0)
 			{
@@ -139,7 +138,7 @@ public Server GetBasicServerInfo()
 
 		public Server GetFullServerInfo()
 		{
-			byte[] responseData = GetFullStat(_address, _port);
+			byte[] responseData = GetFullStat(base.Address, base.Port);
 
 			if (responseData.Length != 0)
 			{
@@ -223,7 +222,7 @@ private byte[] GetChallengeToken(byte[] message)
 		private void RegenerateChallengeToken(Object sender, ElapsedEventArgs e)
 		{
 			//Run handshake again to obtain new challenge token.
-			Handshake(_address, _port);
+			Handshake(base.Address, base.Port);
 		}
 
 	    public override bool IsConnected => _challengeToken != null || _challengeToken.Length > 0;

MCQuery/Rcon.cs

@@ -40,7 +40,7 @@ public bool Login()
             message.AddRange(Encoding.UTF8.GetBytes(_password));
             message.AddRange(_twoBytePad);
 
-            byte[] response = SendByTcp(_address, _port, message.ToArray());
+            byte[] response = SendByTcp(base.Address, base.Port, message.ToArray());
 
             foreach (byte item in response)
             {
@@ -66,7 +66,7 @@ public bool SendCommand(string command)
             message.AddRange(Encoding.UTF8.GetBytes(command));
             message.AddRange(_twoBytePad);
 
-            byte[] response = SendByTcp(_address, _port, message.ToArray());
+            byte[] response = SendByTcp(base.Address, base.Port, message.ToArray());
             bool didSucceeed = false;
 
             foreach (byte item in response)