From 10302a3ceb01f8feb4c2e4f8f773e15d8b3b0e99 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Mon, 3 Oct 2022 10:22:04 -0400
Subject: [PATCH] Some misc fixes

---
 Source/BNetServer/Networking/Services/Authentication.cs | 2 +-
 Source/BNetServer/Networking/Session.cs                 | 4 ----
 Source/Game/Handlers/CharacterHandler.cs                | 4 +++-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Source/BNetServer/Networking/Services/Authentication.cs b/Source/BNetServer/Networking/Services/Authentication.cs
index b907e034d..f2cb23c3b 100644
--- a/Source/BNetServer/Networking/Services/Authentication.cs
+++ b/Source/BNetServer/Networking/Services/Authentication.cs
@@ -67,7 +67,7 @@ namespace BNetServer.Networking
             if (accountInfo.LoginTicketExpiry < Time.UnixTime)
                 return BattlenetRpcErrorCode.TimedOut;
 
-            stmt = DB.Login.GetPreparedStatement(LoginStatements.SelBnetCharacterCountsByAccountId);
+            stmt = DB.Login.GetPreparedStatement(LoginStatements.SEL_BNET_CHARACTER_COUNTS_BY_BNET_ID);
             stmt.AddValue(0, accountInfo.Id);
 
             SQLResult characterCountsResult = DB.Login.Query(stmt);
diff --git a/Source/BNetServer/Networking/Session.cs b/Source/BNetServer/Networking/Session.cs
index d1bb540c6..3b848629f 100644
--- a/Source/BNetServer/Networking/Session.cs
+++ b/Source/BNetServer/Networking/Session.cs
@@ -215,8 +215,6 @@ namespace BNetServer.Networking
         public uint LoginTicketExpiry;
         public bool IsBanned;
         public bool IsPermanenetlyBanned;
-        public string PasswordVerifier;
-        public string Salt;
 
         public Dictionary<uint, GameAccountInfo> GameAccounts;
 
@@ -230,8 +228,6 @@ namespace BNetServer.Networking
             LoginTicketExpiry = result.Read<uint>(5);
             IsBanned = result.Read<ulong>(6) != 0;
             IsPermanenetlyBanned = result.Read<ulong>(7) != 0;
-            PasswordVerifier = result.Read<string>(9);
-            Salt = result.Read<string>(10);
 
             GameAccounts = new Dictionary<uint, GameAccountInfo>();
             const int GameAccountFieldsOffset = 8;
diff --git a/Source/Game/Handlers/CharacterHandler.cs b/Source/Game/Handlers/CharacterHandler.cs
index e4564279a..8055ef404 100644
--- a/Source/Game/Handlers/CharacterHandler.cs
+++ b/Source/Game/Handlers/CharacterHandler.cs
@@ -530,7 +530,7 @@ namespace Game
                     {
                         // Player not create (race/class/etc problem?)
                         newChar.CleanupsBeforeDelete();
-
+                        newChar.Dispose();
                         SendCharCreate(ResponseCodes.CharCreateError);
                         return;
                     }
@@ -567,6 +567,8 @@ namespace Game
                         }
                         else
                             SendCharCreate(ResponseCodes.CharCreateError);
+
+                        newChar.Dispose();
                     });
                 }