From 95e645246e5ca5437e6dac3e5173cb0efde55a25 Mon Sep 17 00:00:00 2001
From: Greg Taylor <snagglepants@gmail.com>
Date: Thu, 4 Jan 2007 01:36:22 +0000
Subject: [PATCH] Fixed some issues with @dest'ing player objects that don't
 have a matching account (should never really happen but just in case.)

---
 evennia/trunk/apps/objects/models.py |  14 +++++++++-----
 evennia/trunk/evennia.sql            | Bin 57344 -> 62464 bytes
 evennia/trunk/functions_general.py   |   7 +++++++
 evennia/trunk/prepenv.sh             |   3 ++-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/evennia/trunk/apps/objects/models.py b/evennia/trunk/apps/objects/models.py
index 3ede270ae4..08387754ac 100755
--- a/evennia/trunk/apps/objects/models.py
+++ b/evennia/trunk/apps/objects/models.py
@@ -270,7 +270,7 @@ class Object(models.Model):
       """
       Clears all of an object's attributes.
       """
-      self.get_all_attributes()
+      attribs = self.get_all_attributes()
       for attrib in attribs:
          self.delete()
    
@@ -289,10 +289,13 @@ class Object(models.Model):
       # If the object is a player, set the player account object to inactive.
       # It can still be recovered at this point.      
       if self.is_player():
-         uobj = User.objects.get(id=self.id)
-         uobj.is_active = False
-         uobj.save()
-         
+         try:
+            uobj = User.objects.get(id=self.id)
+            uobj.is_active = False
+            uobj.save()
+         except:
+            functions_general.print_errmsg('Destroying object %s but no matching player.' % (self,))
+            
       # Set the object type to GOING
       self.type = 5
       self.save()
@@ -600,4 +603,5 @@ class Object(models.Model):
       return global_defines.OBJECT_TYPES[otype][1][0]
 
 import functions_db
+import functions_general
 import session_mgr
diff --git a/evennia/trunk/evennia.sql b/evennia/trunk/evennia.sql
index 63a84031cc560356f7b1ea24cf1b7de42db91011..447a92386a6bc560810e0273646cc25e7d0b1b89 100755
GIT binary patch
delta 4015
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
VDumgztYxq%smYE?HI|j?{{~R&`T_s|

delta 1328
zcmajeOKclO7y#g%`E9S)@j7v~X<kmUb{yyJ>?`YyFElEmJ+xARLO~TsuI+6Clr(jD
z3Dm@GR6wert3f3Q)DkKrDx@N71OjmZ^~51axkNz(38Vsn6x34=M5wIu(_T0*+JC;;
z`8A_??9Ok%{8w<XQ{FFNaePQ^;3ps}JRbfK*e7CVW`fL8OplQ#=;5id`dp=aN=;1_
zj;GWY3Kg|DRe1I|zb(eYGRz7<X9Sq1ztfpo^>G?LFDSCyUkS6B=9lNHf##^tvhyy5
zCnpb=E2mHUv8P^Ti!&!GQw2Tk=yusoyRJQ+E0{UgD%yI<)it|R)HP$mDdluG=ajWl
zc|2!YuAyo6sBVlJmTH)J!^&$;R<kE8Q~PfweK+NAr%`B^WwRnl(&XeB8ol>svh&KL
z5na`tyyj0f!TwN^Jl?hn{AR0~hz04U04uNrPs0%1tX03GeA8|Tin2eYMGH*4HO)_L
z{7Sq-5nlN73K1js5(hfJpi6XxenY>eHF}M{Lp}OBt<q`w5}oBIH-4)RniB(r5NcVd
zZlb1v8ak?J=-3#V&7z~DX#WU0GK>xnp_xH+XaF7TM+Y)!-&`Ly(rL7}7fq$mWD-?X
zw5JE{?nb-1&_n|5>_j^{(Drt;tqpB$MR)H;=UQ5@v1=EqC}?vt8jqt*O=x2y8jGQ_
zj7FnqLjxL#ppt}!!>A~tq0o*g8Vq7bAb<j(l!gLCB9we^e>7IVZXl8XKtn|Gs@u%{
z;ZBAI51xZb*KtZ#&Ml1>OUG=@H45XJmUCTg+&<<yrdeR#`i*AYR5dg2KZcgI978iL
zHog9Ltp2qCcmjCvJ$%OFfpfsTBZGbaHz!TQLBeL&RetA4a0GfG%fy9!wd#+QXJ1_n
zWc&^Ro`lEXAvgdJz#hoMUr+)IvTzcfhgaYYcn!|7$U-kadf^)NE;>B>=4v3U)Yoze
zJRW=N40wk`=Dl431(uk&n1*fG@>f^^w)AeXLxDvCKf||v??-S0J_ioh;VNvwB3Iw5
z?2KK!@=Qp9%LIPm(f2Pv*x%}HAw+>+zM6=U6a34XMoEy};%(hBSre#AAEsyhA7zDZ
zK?3%|Q~s%}k!`Y8tA0#cb;Uoc5x<h8q#_GD4M7t4%})~<%TL`c^{c8!zz^`F$B(2R
rwjYiEM%1^VR(+AeeGd+^m1Gwq%Ux{m^#!Ol^)q!jPjc+&@+1EMy3zki

diff --git a/evennia/trunk/functions_general.py b/evennia/trunk/functions_general.py
index 7094b1b938..25d7a2cdaa 100644
--- a/evennia/trunk/functions_general.py
+++ b/evennia/trunk/functions_general.py
@@ -5,6 +5,13 @@ import commands_unloggedin
 """
 General commonly used functions.
 """
+def print_errmsg(errormsg):
+   """
+   Prints/logs an error message. Pipe any errors to be logged through here.
+   For now we're just printing to standard out.
+   """
+   print 'ERROR: %s' % (errormsg,)
+
 def command_list():
    """
    Return a list of all commands.
diff --git a/evennia/trunk/prepenv.sh b/evennia/trunk/prepenv.sh
index b4030fa174..a5a0fecacf 100755
--- a/evennia/trunk/prepenv.sh
+++ b/evennia/trunk/prepenv.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
 export DJANGO_SETTINGS_MODULE="settings"
-python2.5 -m cProfile -o profiler.log -s time server.py
+#python2.5 -m cProfile -o profiler.log -s time server.py
+python2.5 server.py