--- deliantra/server/plugins/cfperl/cfperl.xs	2006/03/31 22:47:25	1.46
+++ deliantra/server/plugins/cfperl/cfperl.xs	2006/04/02 15:57:54	1.47
@@ -248,7 +248,7 @@
           if (!obj)
             sv = &PL_sv_undef;
           else
-            switch (*(int *)cf_object_get_property (obj, CFAPI_OBJECT_PROP_TYPE))
+            switch (obj->type)
               {
                 case MAP:
                   sv = newSVptr_cached (obj, "cf::object::map");
@@ -1577,7 +1577,7 @@
 
 player *player (object *op)
 	CODE:
-        RETVAL = cf_player_find (cf_query_name (op));
+        RETVAL = op->contr;
 	OUTPUT: RETVAL
 
 void cf_player_message (object *obj, char *txt, int flags = NDI_ORANGE | NDI_UNIQUE)