From: Jeremy Stanley <fungi@yuggoth.org>
Date: Wed, 15 Mar 2006 19:37:25 +0000 (+0000)
Subject: Imported from archive.
X-Git-Tag: 0.0.1~321
X-Git-Url: https://mudpy.org/gitweb?a=commitdiff_plain;h=03997fe4497ea4ebaaf35d29e331615d438b56de;p=mudpy.git

Imported from archive.

* command (command:move): Minor cosmetic fix for the move command
help text.

* mudpy.py (User.replace_old_connections): Fixed a crash in
connection replacement detection where stale sockets without an
associated account would trigger an exception.
---

diff --git a/command b/command
index 3e7a42a..409cbcf 100644
--- a/command
+++ b/command
@@ -38,7 +38,7 @@ help = With the look command, you can see where you are.
 [command:move]
 action = command_move(actor, parameters)
 description = Move in a specific direction.
-help = You move in a direction by entering:$(eol)   move north
+help = You move in a direction by entering:$(eol)$(eol)   move north
 
 [command:quit]
 action = command_quit(actor)
diff --git a/mudpy.py b/mudpy.py
index c989f0f..9f5cd1d 100644
--- a/mudpy.py
+++ b/mudpy.py
@@ -559,7 +559,7 @@ class User:
 		for old_user in universe.userlist:
 
 			# the name is the same but it's not us
-			if old_user.account.get("name") == self.account.get("name") and old_user is not self:
+			if hasattr(old_user, "account") and old_user.account.get("name") == self.account.get("name") and old_user is not self:
 
 				# make a note of it
 				log("User " + self.account.get("name") + " reconnected--closing old connection to " + old_user.address + ".", 2)