From 2c85fe3be55a987beebd260a5640b5cbb75b1888 Mon Sep 17 00:00:00 2001
From: Greg Taylor <snagglepants@gmail.com>
Date: Thu, 4 Jan 2007 01:55:01 +0000
Subject: [PATCH] New player registrations are once again working. Shored up
 some vulnerable spots too.

---
 evennia/trunk/apps/objects/models.py |   3 ++-
 evennia/trunk/evennia.sql            | Bin 62464 -> 65536 bytes
 evennia/trunk/functions_db.py        |   8 ++++++++
 evennia/trunk/session.py             |   7 +++++--
 evennia/trunk/session_mgr.py         |   2 +-
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/evennia/trunk/apps/objects/models.py b/evennia/trunk/apps/objects/models.py
index 08387754ac..573df86539 100755
--- a/evennia/trunk/apps/objects/models.py
+++ b/evennia/trunk/apps/objects/models.py
@@ -499,7 +499,8 @@ class Object(models.Model):
       quiet:  (bool)   If true, don't emit left/arrived messages.
       """
       if not quiet:
-         self.get_location().emit_to_contents("%s has left." % (self.get_ansiname(),), exclude=self)
+         if self.get_location():
+            self.get_location().emit_to_contents("%s has left." % (self.get_ansiname(),), exclude=self)
          
       self.location = target
       self.save()
diff --git a/evennia/trunk/evennia.sql b/evennia/trunk/evennia.sql
index 447a92386a6bc560810e0273646cc25e7d0b1b89..e660cc1513fedb85bdb7d05e3efcbd99a6f17d2e 100755
GIT binary patch
delta 2949
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
JCa%6p@E;I5k3IkZ

delta 818
zcmZWnT}V_x6rP#y?z(H<RcXzi)Lm0dWmoRK>#iaZiAoQJ78wN6kGd;X{uG+@i>?Uz
zu#_^9nv%r6*h{otqCk4FhaL(+s4y%F)bOXshjzh)=-!nyXwJ;QoOAfjH|Koa-9q;=
z2GT6TI{9aX^3)jfwK~o6vOR~@#h6T!WtD)n5nN>(tc@;*{ByJmmq{N<62<-PCbOxm
zti#vdp`SzgRoKwh(%w`j=XfPW^5nRSl@g!FRWB)Zu0}=j*4Ni7C5r58D0a(UuOiDu
z9;MNxcoa!0c1p5Sa@pmQQc2tH!XlSjmfZhGOn*cCd-#?};x#JTAEJzSYq*P_`PrWk
zt9gJ$f-t^e5%X$d$_xx<ouRsroRyv)N7e{t@emhLz}DD(*33lujGm>LWNpy@n#l$H
z$?xQ#;LeU?i0D1CU=tBF@xThyjoMv#D1g9YdQXP@6D%n78MfYm3@a|76E|@i{pdj+
z5)i8;#`b2bHv;)=aG*OV+%fF2B0z8tg9vC0f8hsKuz*jh{qAWD4kYow&~g5;FNKGP
z;$g)Yj~UM0sxCBxkBv6%vw~ABVMg;#;3b|z#bX2!!7w=1v5L>CW9(EEi;o{Q7(glG
zi{o~O6(ba1F`~n1iEEh0d#w*|@Cws-u?_S9UofF23QZ6+BYZ4au?3<o1=HhpYwa-7
zDMDB16x_IiQM?QJ8!5jYO5;^(u8laDNK#EEvzeGhTUP23UvuaA*7EAAs><@3$_n*E
zXqxhAwX{0lD3WAKC>5zFX4#_JW6a33se7EV;#7*FuD!KVi#}uvog~c8POu*Kh|RJH
z(ov2JS{vu+CY_^`A^$mgjBb*`BtrDs#Fmv&qs@G~@(!-<)?st3BGI#{NHhi+x<ZUQ
Mnu`kN?Ni6WKd%Yr)c^nh

diff --git a/evennia/trunk/functions_db.py b/evennia/trunk/functions_db.py
index bd1763fb4b..91ca3179d0 100644
--- a/evennia/trunk/functions_db.py
+++ b/evennia/trunk/functions_db.py
@@ -191,6 +191,14 @@ def create_user(cdat, uname, email, password):
    # the next free unique ID to use and make sure the two entries are
    # the same number.
    uid = get_nextfree_dbnum()
+   print 'UID', uid
+
+   # If this is an object, we know to recycle it since it's garbage. We'll
+   # pluck the user ID from it.
+   if not str(uid).isdigit():
+      uid = uid.id
+   print 'UID2', uid
+
    user = User.objects.create_user(uname, email, password)
    # It stinks to have to do this but it's the only trivial way now.
    user.save()
diff --git a/evennia/trunk/session.py b/evennia/trunk/session.py
index dd10b650d3..58c75fbbb3 100755
--- a/evennia/trunk/session.py
+++ b/evennia/trunk/session.py
@@ -70,8 +70,11 @@ class PlayerSession(async_chat):
       """
       Returns the object associated with a session.
       """
-      result = Object.objects.get(id=self.uid)
-      return result
+      try:
+         result = Object.objects.get(id=self.uid)
+         return result
+      except:
+         return False
       
    def game_connect_screen(self, session):
       """
diff --git a/evennia/trunk/session_mgr.py b/evennia/trunk/session_mgr.py
index ed2e19cee4..93b44736d1 100644
--- a/evennia/trunk/session_mgr.py
+++ b/evennia/trunk/session_mgr.py
@@ -33,7 +33,7 @@ def session_from_object(targobject):
    session_list: (list) The server's session_list attribute.
    targobject: (Object) The object to match.
    """
-   results = [prospect for prospect in session_list if prospect.get_pobject().id == targobject.id]
+   results = [prospect for prospect in session_list if prospect.get_pobject() == targobject]
    if results:
       return results[0]
    else: