--- deliantra/server/lib/cf.pm	2007/09/07 18:10:52	1.358
+++ deliantra/server/lib/cf.pm	2007/09/08 18:15:55	1.359
@@ -2075,9 +2075,11 @@
    return if $self->in_memory != cf::MAP_IN_MEMORY;
    return if $self->{deny_save};
 
+   $self->in_memory (cf::MAP_SWAPPED);
+
    $self->deactivate;
+   $_->clear_links_to ($self) for values %cf::MAP;
    $self->clear;
-   $self->in_memory (cf::MAP_SWAPPED);
 }
 
 sub reset_at {
@@ -2120,9 +2122,8 @@
    delete $cf::MAP{$self->path};
 
    $self->deactivate;
-   $self->clear;
-
    $_->clear_links_to ($self) for values %cf::MAP;
+   $self->clear;
 
    $self->unlink_save;
    $self->destroy;