diff --git a/MudEngine/Commands/CommandLogin.cs b/MudEngine/Commands/CommandLogin.cs index d4232bb..aac1716 100644 --- a/MudEngine/Commands/CommandLogin.cs +++ b/MudEngine/Commands/CommandLogin.cs @@ -129,7 +129,7 @@ namespace MudEngine.Commands //if any player exists on the server already with this name. BaseCharacter p = new BaseCharacter(player.ActiveGame); p.Load(savedFile); - + //Varify their password. If their password is matching the one on file, and the //current Active Game is a multiplayer game, then scan for other other currently //logged in with this account. @@ -150,25 +150,24 @@ namespace MudEngine.Commands //Now that we have no duplicate connections, load the real player. //no need to re-varify password as we have already done this above. player.Load(savedFile); - } - } - else - { - player.Load(savedFile); - if (player.VarifyPassword(playerPwrd)) - { player.Send("Welcome back " + player.Name + "!"); } else { - passwordLegal = false; - player.Send("Invalid password."); - //Don't keep a reference to the already loaded character. The player will need to - //re-enter their credentials. - player = new BaseCharacter(player.ActiveGame); + if (!p.VarifyPassword(playerPwrd)) + { + player.Send("Invalid password!"); + passwordLegal = false; + } } } + else + { + player.Create(playerName, playerPwrd); + player.Send("Welcome " + playerName + "!"); + } } + } //Look to see if there are players in the Room, if there are then we need to let diff --git a/MudGame/bin/Debug/..svnbridge/.svnbridge b/MudGame/bin/Debug/..svnbridge/.svnbridge deleted file mode 100644 index 2fe5fb0..0000000 --- a/MudGame/bin/Debug/..svnbridge/.svnbridge +++ /dev/null @@ -1,46 +0,0 @@ -svn:ignoreLog.txt -MudEngine.dll -MudEngine.pdb -MudGame.exe -MudGame.pdb -MudGame.vshost.exe -MudGame.vshost.exe.manifest -Player -temp -svn:ignoreLog.txt -MudEngine.dll -MudEngine.pdb -MudGame.exe -MudGame.pdb -MudGame.vshost.exe -MudGame.vshost.exe.manifest -Player -temp -Realms -svn:ignoreLog.txt -MudEngine.dll -MudEngine.pdb -MudGame.exe -MudGame.pdb -MudGame.vshost.exe -MudGame.vshost.exe.manifest -Player -temp -Realms -Mud Designer Example Game.ini -World -svn:ignoreLog.txt -MudEngine.dll -MudEngine.pdb -MudGame.exe -MudGame.pdb -MudGame.vshost.exe -MudGame.vshost.exe.manifest -Player -temp -Realms -Mud Designer Example Game.ini -World -Planet Earth MUD.ini -Saved - \ No newline at end of file diff --git a/MudGame/bin/Debug/Scripts/..svnbridge/.svnbridge b/MudGame/bin/Debug/Scripts/..svnbridge/.svnbridge deleted file mode 100644 index 725a650..0000000 --- a/MudGame/bin/Debug/Scripts/..svnbridge/.svnbridge +++ /dev/null @@ -1,21 +0,0 @@ -svn:ignoreCommandClear.cs -CommandCreate.cs -CommandSay.cs -EarthGame.cs -svn:ignoreCommandClear.cs -CommandCreate.cs -CommandSay.cs -EarthGame.cs -CommandHelp.cs -svn:ignoreCommandClear.cs -CommandCreate.cs -CommandSay.cs -EarthGame.cs -CommandHelp.cs -CommandExit.cs -CommandGetTime.cs -CommandLinkRoom.cs -CommandLook.cs -CommandSave.cs -CommandWalk.cs - \ No newline at end of file diff --git a/MudGame/bin/Debug/Settings.ini b/MudGame/bin/Debug/Settings.ini deleted file mode 100644 index c6a9d69..0000000 --- a/MudGame/bin/Debug/Settings.ini +++ /dev/null @@ -1,2 +0,0 @@ -ScriptPath=Scripts -ScriptExtension=.cs \ No newline at end of file diff --git a/MudGame/bin/Release/..svnbridge/.svnbridge b/MudGame/bin/Release/..svnbridge/.svnbridge deleted file mode 100644 index 87c2dd4..0000000 --- a/MudGame/bin/Release/..svnbridge/.svnbridge +++ /dev/null @@ -1,17 +0,0 @@ -svn:ignoreMudEngine.dll -MudEngine.pdb -MudGame.exe -MudGame.pdb -svn:ignoreMudEngine.dll -MudEngine.pdb -MudGame.exe -MudGame.pdb -Scripts -svn:ignoreMudEngine.dll -MudEngine.pdb -MudGame.exe -MudGame.pdb -Scripts -Commands -Settings.ini - \ No newline at end of file