--- deliantra/server/lib/cf.pm	2006/08/12 11:51:37	1.30
+++ deliantra/server/lib/cf.pm	2006/08/14 04:22:04	1.31
@@ -183,10 +183,6 @@
 
    warn "removing extension $pkg\n";
 
-   if (my $cb = $pkg->can ("on_unload")) {
-      $cb->($pkg);
-   }
-
    # remove hooks
    for my $idx (0 .. $#EVENT) {
       delete $hook[$idx]{$pkg};
@@ -210,6 +206,13 @@
       delete $extcmd{$name};
    }
 
+   if (my $cb = $pkg->can ("on_unload")) {
+      eval {
+         $cb->($pkg);
+         1
+      } or warn "$pkg unloaded, but with errors: $@";
+   }
+
    Symbol::delete_package $pkg;
 }