From 18e2eca2c52c810e03e2c91cdc0552645c665003 Mon Sep 17 00:00:00 2001
From: Greg Taylor <snagglepants@gmail.com>
Date: Tue, 16 Dec 2008 03:17:45 +0000
Subject: [PATCH] Removed some retarded uses of 'server' reference variables.

---
 src/commands/comsys.py     | 2 --
 src/commands/objmanip.py   | 6 ------
 src/commands/paging.py     | 1 -
 src/commands/privileged.py | 3 +--
 src/commands/unloggedin.py | 1 -
 5 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/commands/comsys.py b/src/commands/comsys.py
index 4c091ccc9a..da6dbe5654 100644
--- a/src/commands/comsys.py
+++ b/src/commands/comsys.py
@@ -20,7 +20,6 @@ def cmd_addcom(command):
     """
     session = command.session
     pobject = session.get_pobject()
-    server = command.server
     eq_args = command.command_argument.split('=', 1)
     
     if not command.command_argument:
@@ -192,7 +191,6 @@ def cmd_cemit(command):
     """
     session = command.session
     pobject = session.get_pobject()
-    server = command.server
 
     if command.command_argument == 0:
         session.msg("Channel emit what?")
diff --git a/src/commands/objmanip.py b/src/commands/objmanip.py
index beb4e81044..bfc028b0b8 100644
--- a/src/commands/objmanip.py
+++ b/src/commands/objmanip.py
@@ -13,7 +13,6 @@ def cmd_teleport(command):
     """
     session = command.session
     pobject = session.get_pobject()
-    server = command.server
 
     if not command.command_argument:
         session.msg("Teleport where/what?")
@@ -181,7 +180,6 @@ def cmd_set(command):
     """
     session = command.session
     pobject = session.get_pobject()
-    server = command.server
 
     if not command.command_argument:
         session.msg("Set what?")
@@ -253,7 +251,6 @@ def cmd_find(command):
     Searches for an object of a particular name.
     """
     session = command.session
-    server = command.server
     pobject = session.get_pobject()
     can_find = pobject.user_has_perm("genperms.builder")
 
@@ -277,7 +274,6 @@ def cmd_create(command):
     Creates a new object of type 'THING'.
     """
     session = command.session
-    server = session.server
     pobject = session.get_pobject()
     
     if not command.command_argument:
@@ -313,7 +309,6 @@ def cmd_open(command):
     """
     session = command.session
     pobject = session.get_pobject()
-    server = command.server
     
     if not command.command_argument:
         session.msg("Open an exit to where?")
@@ -383,7 +378,6 @@ def cmd_link(command):
     """
     session = command.session
     pobject = session.get_pobject()
-    server = command.server
 
     if not command.command_argument:
         session.msg("Link what?")
diff --git a/src/commands/paging.py b/src/commands/paging.py
index 084d51adcd..d4652f5679 100644
--- a/src/commands/paging.py
+++ b/src/commands/paging.py
@@ -34,7 +34,6 @@ def cmd_page(command):
     """
     session = command.session
     pobject = session.get_pobject()
-    server = command.server
     args = command.command_argument.split()
     targets = []
 
diff --git a/src/commands/privileged.py b/src/commands/privileged.py
index 105db73d5a..734da35ec9 100644
--- a/src/commands/privileged.py
+++ b/src/commands/privileged.py
@@ -12,8 +12,7 @@ def cmd_reload(command):
     """
     Reloads all modules.
     """
-    session = command.session
-    server = session.server.reload(session)
+    session = command.session.server.reload(session)
 
 def cmd_boot(command):
     """
diff --git a/src/commands/unloggedin.py b/src/commands/unloggedin.py
index 15d132ddb9..d60bb27494 100644
--- a/src/commands/unloggedin.py
+++ b/src/commands/unloggedin.py
@@ -51,7 +51,6 @@ def cmd_create(command):
     if not functions_general.cmd_check_num_args(session, arg_list, 2):
         return
     
-    server = session.server
     quote_split = command.command_argument.split("\"")
     
     if len(quote_split) < 2: