<NME> menu1.cmvp
<BEF> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<META HTTP-EQUIV="Pragma" CONTENT="no-cache">
@if?!Authenticate@ @AddFile?/grinder/failedlogin.cmvp@ @else@
@if?!CheckAuthCode?ANYMODAREAS=true@ @AddFile?/grinder/nopriv.cmvp@ @else@

<html>
	<META CHARSET="utf-8"/>
<head>
	<!-- tell spiders to sod off -->
	<meta name="ROBOTS" content="NOINDEX, NOFOLLOW">
	<link rel="STYLESHEET" TYPE="TEXT/CSS" HREF="/grinder/grinder.css">
 	<link rel="grinder icon" href="/images/grinder.ico" >
	<title>CoffeeMud MUDGrinder</title>
	<script language=JavaScript>
	<!--
		function Clicked(action)
		{
			document.AREAEDIT.action=action;
			document.AREAEDIT.submit();
		}
		function Clicked(action)
		{
			document.AREAEDIT.action=action;
			document.AREAEDIT.submit();
		}
	//-->
	</script>
</head>
<BODY>
<FORM  ACCEPT-CHARSET="UTF-8" NAME=AREAEDIT TARGET=_top METHOD=POST ACTION="/grinder/quickfind.cmvp">
<INPUT TYPE=HIDDEN NAME=AUTH VALUE="@Authenticate?AUTH@">
<INPUT TYPE=HIDDEN NAME=AREA VALUE="@AreaID@">
<INPUT TYPE=HIDDEN NAME=MAPSTYLE VALUE="@RequestParameter?MAPSTYLE@">
<INPUT TYPE=HIDDEN NAME=MAPLEVEL VALUE="@RequestParameter?MAPLEVEL@">

<TABLE WIDTH=100% CELLSPACING=0 CELLPADDING=0 BORDER=0>
<TR>
	<TD WIDTH=10% VALIGN=TOP><IMG SRC="/grinder/images/grinder.gif" WIDTH=80 HEIGHT=80  ALT="" BORDER="0"></TD>
	<TD WIDTH=50% ALIGN=LEFT VALIGN=TOP>
	&nbsp;&nbsp;&nbsp;&nbsp;
	<INPUT TYPE=TEXT NAME=QUICKFIND VALUE="">
	<INPUT TYPE=SUBMIT NAME=FINDIT VALUE="Quick Find" ONCLICK="Clicked('/grinder/quickfind.cmvp');">
	</TD>
	<TD WIDTH=40% ALIGN=RIGHT style="position:absolute; top: 0; bottom: 0;">
		<TABLE WIDTH=200 BORDER=0 HEIGHT=100%>
		@if?!AreaData?AREAISBOARDABLE@
			<TR><TD ALIGN=RIGHT>
			@if?AreaData?ISGRID@
				<INPUT TYPE=BUTTON NAMEMOVEAREA VALUE="Move" ONCLICK="Clicked('/grinder/maparea.cmvp');">
		@if?CheckAuthCode?AUTH_EXPORT=true@
		<INPUT TYPE=BUTTON NAME=EXPORT VALUE="Export Data" ONCLICK="Clicked('/AreaXML');">
		@endif@
		<INPUT TYPE=BUTTON NAME=LOGOUT VALUE="Main Menu" ONCLICK="Clicked('/grinder/loggedin.cmvp');">
	</TD>
</TR>
			@endif@
			</TD></TR>
			<TR><TD ALIGN=RIGHT>
			<INPUT TYPE=BUTTON NAME=SCRIPTS VALUE="Scripts" ONCLICK="Clicked('/grinder/editareascripts.cmvp');">
			<INPUT TYPE=BUTTON NAME=EXPORT VALUE="MOBs" ONCLICK="Clicked('/grinder/editareamobs.cmvp');">
			<INPUT TYPE=BUTTON NAME=EXPORT VALUE="Items" ONCLICK="Clicked('/grinder/editareaitems.cmvp');">
			</TD></TR>
			<TR VALIGN=BOTTOM><TD ALIGN=RIGHT HEIGHT=40%>
			<INPUT TYPE=BUTTON NAME=LOGOUT VALUE="Main Menu" ONCLICK="Clicked('/grinder/loggedin.cmvp');">
			</TD></TR>
			</TABLE>
		@else@
			<P>
			<INPUT TYPE=BUTTON NAME=CLOSE VALUE="Save" ONCLICK="Clicked('/grinder/saveboardablearea.cmvp');">
			<P>
			<INPUT TYPE=BUTTON NAME=CANCELCLOSE VALUE="Cancel" ONCLICK="window.close(); top.closeThisWindow(); parent.closeThisWindow();">
		@endif@
		</TABLE>
	</TD>
</TR>
</TABLE>
</FORM>
</BODY>
</HTML>
@endif@
@endif@

<MSG> 

git-svn-id: svn://192.168.1.10/public/CoffeeMud@8474 0d6f1817-ed0e-0410-87c9-987e46238f29

<DFF> @@ -50,6 +50,8 @@
 		@if?CheckAuthCode?AUTH_EXPORT=true@
 		<INPUT TYPE=BUTTON NAME=EXPORT VALUE="Export Data" ONCLICK="Clicked('/AreaXML');">
 		@endif@
+		<INPUT TYPE=BUTTON NAME=SCRIPTS VALUE="Scripts" ONCLICK="Clicked('/grinder/editareascripts.cmvp');">
+		<P>
 		<INPUT TYPE=BUTTON NAME=LOGOUT VALUE="Main Menu" ONCLICK="Clicked('/grinder/loggedin.cmvp');">
 	</TD>
 </TR>

{'commit': 'diff --git a/com/planet_ink/coffee_mud/Areas/interfaces/Area.java b/com/planet_ink/coffee_mud/Areas/interfaces/Area.java\nindex 3c64a220ba..00912e166c 100644\n--- a/com/planet_ink/coffee_mud/Areas/interfaces/Area.java\n+++ b/com/planet_ink/coffee_mud/Areas/interfaces/Area.java\n@@ -772,6 +772,8 @@ public interface Area extends Environmental, Economics\n     \t\tRoom room=roomEnumerators.nextElement();\r\n     \t\tif(room instanceof GridLocale)\r\n     \t\t\troomEnumerators.addEnumeration(new IteratorEnumeration<Room>(((GridLocale) room).getAllRooms().iterator()));\r\n+    \t\tif((room == null) && (hasMoreElements()))\r\n+    \t\t\treturn nextElement();\r\n     \t\treturn room;\r\n     \t}\r\n     }\r\ndiff --git a/com/planet_ink/coffee_mud/application/MUD.java b/com/planet_ink/coffee_mud/application/MUD.java\nindex 2b17194e82..2f101018c1 100644\n--- a/com/planet_ink/coffee_mud/application/MUD.java\n+++ b/com/planet_ink/coffee_mud/application/MUD.java\n@@ -55,7 +55,7 @@ public class MUD extends Thread implements MudHost\n \r\n     protected static boolean bringDown=false;\r\n     private static String execExternalCommand=null;\r\n-    private static Server imserver=null;\r\n+    private static I3Server imserver=null;\r\n     private static IMC2Driver imc2server=null;\r\n     private static Vector webServers=new Vector();\r\n     private static SMTPserver smtpServerThread=null;\r\n@@ -731,7 +731,7 @@ public class MUD extends Thread implements MudHost\n \t\tif(imserver!=null)\r\n \t\t{\r\n \t\t\tCMProps.setUpAllLowVar(CMProps.SYSTEM_MUDSTATUS,"Shutting down...I3Server");\r\n-\t\t\tServer.shutdown();\r\n+\t\t\tI3Server.shutdown();\r\n \t\t\timserver=null;\r\n \t\t\tif(S!=null)S.println("I3Server stopped");\r\n \t\t\tLog.sysOut(Thread.currentThread().getName(),"I3Server stopped");\r\n@@ -872,7 +872,7 @@ public class MUD extends Thread implements MudHost\n \t\t{\r\n \t\t\tif(page.getBoolean("RUNI3SERVER")&&(tCode==MAIN_HOST))\r\n \t\t\t{\r\n-\t\t\t\tif(imserver!=null) Server.shutdown();\r\n+\t\t\t\tif(imserver!=null) I3Server.shutdown();\r\n \t\t\t\timserver=null;\r\n \t\t\t\tString playstate=page.getStr("MUDSTATE");\r\n \t\t\t\tif((playstate==null)||(playstate.length()==0))\r\n@@ -893,15 +893,15 @@ public class MUD extends Thread implements MudHost\n \t\t                                             CMLib.mud(0).getPort(),\r\n \t\t\t\t\t\t\t\t\t\t\t\t\t playstate,\r\n \t\t\t\t\t\t\t\t\t\t\t\t\t CMLib.channels().iChannelsArray());\r\n-\t\t\t\timserver=new Server();\r\n+\t\t\t\timserver=new I3Server();\r\n \t\t\t\tint i3port=page.getInt("I3PORT");\r\n \t\t\t\tif(i3port==0) i3port=27766;\r\n-\t\t\t\tServer.start(CMProps.getVar(CMProps.SYSTEM_MUDNAME),i3port,imud);\r\n+\t\t\t\tI3Server.start(CMProps.getVar(CMProps.SYSTEM_MUDNAME),i3port,imud);\r\n \t\t\t}\r\n \t\t}\r\n \t\tcatch(Exception e)\r\n \t\t{\r\n-\t\t\tif(imserver!=null) Server.shutdown();\r\n+\t\t\tif(imserver!=null) I3Server.shutdown();\r\n \t\t\timserver=null;\r\n \t\t}\r\n \t}\r\ndiff --git a/com/planet_ink/coffee_mud/core/database/DBConnections.java b/com/planet_ink/coffee_mud/core/database/DBConnections.java\nindex 401e5ce91f..f67b9a19a6 100644\n--- a/com/planet_ink/coffee_mud/core/database/DBConnections.java\n+++ b/com/planet_ink/coffee_mud/core/database/DBConnections.java\n@@ -254,6 +254,9 @@ public class DBConnections\n \t\t\t\t\tif(consecutiveFailures==180)\r\n \t\t\t\t\t{\r\n \t\t\t\t\t\tLog.errOut("DBConnections","Serious failure obtaining DBConnection ("+inuse+"/"+connections.size()+" in use).");\r\n+\t\t\t\t\t\tfor(DBConnection conn : connections)\r\n+\t\t\t\t\t\t\tif(conn.inUse())\r\n+\t\t\t\t\t\t\t\tLog.errOut("DBConnections","Last SQL was: "+conn.lastSQL);\r\n \t\t\t\t\t\tif(inuse==0)\r\n \t\t\t\t\t\t\tresetConnections();\r\n \t\t\t\t\t}\r\ndiff --git a/com/planet_ink/coffee_mud/core/intermud/cm1/Server.java b/com/planet_ink/coffee_mud/core/intermud/cm1/CM1Server.java\nsimilarity index 94%\nrename from com/planet_ink/coffee_mud/core/intermud/cm1/Server.java\nrename to com/planet_ink/coffee_mud/core/intermud/cm1/CM1Server.java\nindex 7f080190d7..7394694a2d 100644\n--- a/com/planet_ink/coffee_mud/core/intermud/cm1/Server.java\n+++ b/com/planet_ink/coffee_mud/core/intermud/cm1/CM1Server.java\n@@ -34,7 +34,7 @@ import java.nio.channels.*;\n    See the License for the specific language governing permissions and\r\n    limitations under the License.\r\n */\r\n-public class Server extends Thread\r\n+public class CM1Server extends Thread\r\n {\r\n \tprivate int \t\tport = 27755;\r\n \tprivate boolean \tshutdownRequested = false;\r\n@@ -43,7 +43,7 @@ public class Server extends Thread\n \tprivate ServerSocketChannel\tservChan = null;\r\n \tprivate SLinkedList<RequestHandler> handlers = new SLinkedList<RequestHandler>();\r\n \t\r\n-\tpublic Server(String serverName, int serverPort)\r\n+\tpublic CM1Server(String serverName, int serverPort)\r\n \t{\r\n \t\tsuper("CM1:"+serverName+":"+serverPort);\r\n \t\tthis.port=serverPort;\r\ndiff --git a/com/planet_ink/coffee_mud/core/intermud/i3/net/Interactive.java b/com/planet_ink/coffee_mud/core/intermud/i3/net/Interactive.java\nindex 87a4cc36a9..d6abba9646 100644\n--- a/com/planet_ink/coffee_mud/core/intermud/i3/net/Interactive.java\n+++ b/com/planet_ink/coffee_mud/core/intermud/i3/net/Interactive.java\n@@ -19,7 +19,7 @@\n \r\n package com.planet_ink.coffee_mud.core.intermud.i3.net;\r\n \r\n-import com.planet_ink.coffee_mud.core.intermud.i3.server.Server;\r\n+import com.planet_ink.coffee_mud.core.intermud.i3.server.I3Server;\r\n import com.planet_ink.coffee_mud.core.intermud.i3.server.ServerUser;\r\n import com.planet_ink.coffee_mud.core.*;\r\n import com.planet_ink.coffee_mud.core.collections.*;\r\n@@ -84,7 +84,7 @@ public abstract class Interactive implements ServerUser {\n      * @return the Interactive object for the specified name or null if no such user exists\r\n      */\r\n     static public Interactive findUser(String nom) {\r\n-        ServerUser[] users = Server.getInteractives();\r\n+        ServerUser[] users = I3Server.getInteractives();\r\n         int i;\r\n \r\n         try {\r\ndiff --git a/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelAdd.java b/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelAdd.java\nindex 9bac73fe56..60f83652c6 100644\n--- a/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelAdd.java\n+++ b/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelAdd.java\n@@ -71,7 +71,7 @@ public class ChannelAdd extends Packet  {\n     public String toString() {\r\n         NameServer n = Intermud.getNameServer();\r\n \t\tString str=\r\n-\t\t\t "({\\"channel-add\\",5,\\"" + Server.getMudName() + "\\",\\"" +\r\n+\t\t\t "({\\"channel-add\\",5,\\"" + I3Server.getMudName() + "\\",\\"" +\r\n                sender_name + "\\",\\""+n.name+"\\",0,\\"" + channel + "\\",0,})";\r\n \t\treturn str;\r\n     }\r\ndiff --git a/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelDelete.java b/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelDelete.java\nindex 0f958e659d..a6b93c012f 100644\n--- a/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelDelete.java\n+++ b/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelDelete.java\n@@ -73,7 +73,7 @@ public class ChannelDelete extends Packet  {\n     public String toString() {\r\n         NameServer n = Intermud.getNameServer();\r\n \t\tString str=\r\n-\t\t\t "({\\"channel-remove\\",5,\\"" + Server.getMudName() + "\\",\\"" +\r\n+\t\t\t "({\\"channel-remove\\",5,\\"" + I3Server.getMudName() + "\\",\\"" +\r\n                sender_name + "\\",\\""+n.name+"\\",0,\\"" + channel + "\\",})";\r\n \t\treturn str;\r\n     }\r\ndiff --git a/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelListen.java b/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelListen.java\nindex 9989e54eeb..33e3c5dfc4 100644\n--- a/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelListen.java\n+++ b/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelListen.java\n@@ -73,7 +73,7 @@ public class ChannelListen extends Packet  {\n     public String toString() {\r\n         NameServer n = Intermud.getNameServer();\r\n \t\tString str=\r\n-\t\t\t "({\\"channel-listen\\",5,\\"" + Server.getMudName() + "\\",0,\\""+n.name+"\\",0,\\"" + channel + "\\"," +\r\n+\t\t\t "({\\"channel-listen\\",5,\\"" + I3Server.getMudName() + "\\",0,\\""+n.name+"\\",0,\\"" + channel + "\\"," +\r\n                onoff + ",})";\r\n \t\treturn str;\r\n     }\r\ndiff --git a/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelPacket.java b/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelPacket.java\nindex 1e2cd5d3ac..172d77123e 100644\n--- a/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelPacket.java\n+++ b/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelPacket.java\n@@ -104,18 +104,18 @@ public class ChannelPacket extends Packet  {\n     public String toString() {\r\n \t\tString str=null;\r\n         if(type==CHAN_TARGET)\r\n-\t\t\t str="({\\"channel-t\\",5,\\"" + Server.getMudName() + "\\",\\"" +\r\n+\t\t\t str="({\\"channel-t\\",5,\\"" + I3Server.getMudName() + "\\",\\"" +\r\n              sender_name + "\\",0,0,\\"" + channel + "\\",\\"" +\r\n              target_mud + "\\",\\"" + target_name + "\\",\\"" +\r\n              message + "\\",\\"" + message_target + "\\",\\"" +\r\n              sender_visible_name + "\\",\\"" + target_visible_name + "\\",})";\r\n         else\r\n         if(type==CHAN_EMOTE)\r\n-\t\t\t str="({\\"channel-e\\",5,\\"" + Server.getMudName() + "\\",\\"" +\r\n+\t\t\t str="({\\"channel-e\\",5,\\"" + I3Server.getMudName() + "\\",\\"" +\r\n              sender_name + "\\",0,0,\\"" + channel + "\\",\\"" +\r\n              sender_visible_name + "\\",\\"" + message + "\\",})";\r\n         else\r\n-\t\t\t str="({\\"channel-m\\",5,\\"" + Server.getMudName() + "\\",\\"" +\r\n+\t\t\t str="({\\"channel-m\\",5,\\"" + I3Server.getMudName() + "\\",\\"" +\r\n                sender_name + "\\",0,0,\\"" + channel + "\\",\\"" +\r\n                sender_visible_name + "\\",\\"" + message + "\\",})";\r\n \t\treturn str;\r\ndiff --git a/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelUserReply.java b/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelUserReply.java\nindex fc5b0c07ef..52045de216 100644\n--- a/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelUserReply.java\n+++ b/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelUserReply.java\n@@ -78,7 +78,7 @@ public class ChannelUserReply extends Packet {\n     \tcase \'F\': genderCode=1; break;\r\n     \tcase \'N\': genderCode=2; break;\r\n     \t}\r\n-\t\tString str="({\\"chan-user-req\\",5,\\"" + Server.getMudName() +\r\n+\t\tString str="({\\"chan-user-req\\",5,\\"" + I3Server.getMudName() +\r\n         "\\",0,\\"" + target_mud + "\\",0,\\"" + userRequested \r\n         + "\\",\\"" + userVisibleName \r\n         + "\\"," + genderCode + ",})";\r\ndiff --git a/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelUserRequest.java b/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelUserRequest.java\nindex 62f31bb290..4c354d3858 100644\n--- a/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelUserRequest.java\n+++ b/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelUserRequest.java\n@@ -60,7 +60,7 @@ public class ChannelUserRequest extends Packet {\n     }\r\n \r\n     public String toString() {\r\n-\t\tString str="({\\"chan-user-req\\",5,\\"" + Server.getMudName() +\r\n+\t\tString str="({\\"chan-user-req\\",5,\\"" + I3Server.getMudName() +\r\n                "\\",0,\\"" + target_mud + "\\",0,\\"" + userToRequest + "\\",})";\r\n \t\treturn str;\r\n     }\r\ndiff --git a/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelWhoReply.java b/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelWhoReply.java\nindex 1472804d66..a2cd0f723c 100644\n--- a/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelWhoReply.java\n+++ b/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelWhoReply.java\n@@ -67,7 +67,7 @@ public class ChannelWhoReply extends Packet {\n     }\r\n \r\n     public String toString() {\r\n-\t\tString str = "({\\"chan-who-reply\\",5,\\"" + Server.getMudName() +\r\n+\t\tString str = "({\\"chan-who-reply\\",5,\\"" + I3Server.getMudName() +\r\n \t\t         "\\",0,\\"" + target_mud + "\\",\\"" + target_name + "\\",\\"" + channel + "\\",({";\r\n \t\tint i;\r\n \r\ndiff --git a/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelWhoRequest.java b/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelWhoRequest.java\nindex f737fdcfe2..879abd2a6a 100644\n--- a/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelWhoRequest.java\n+++ b/com/planet_ink/coffee_mud/core/intermud/i3/packets/ChannelWhoRequest.java\n@@ -62,7 +62,7 @@ public class ChannelWhoRequest extends Packet {\n     }\r\n \r\n     public String toString() {\r\n-\t\tString str="({\\"chan-who-req\\",5,\\"" + Server.getMudName() +\r\n+\t\tString str="({\\"chan-who-req\\",5,\\"" + I3Server.getMudName() +\r\n                "\\",\\"" + sender_name + "\\",\\"" + target_mud + "\\",0,\\"" + channel + "\\",})";\r\n \t\treturn str;\r\n     }\r\ndiff --git a/com/planet_ink/coffee_mud/core/intermud/i3/packets/LocateQueryPacket.java b/com/planet_ink/coffee_mud/core/intermud/i3/packets/LocateQueryPacket.java\nindex 824553b297..dbde1c6446 100644\n--- a/com/planet_ink/coffee_mud/core/intermud/i3/packets/LocateQueryPacket.java\n+++ b/com/planet_ink/coffee_mud/core/intermud/i3/packets/LocateQueryPacket.java\n@@ -67,7 +67,7 @@ public class LocateQueryPacket extends Packet {\n     }\r\n \r\n     public String toString() {\r\n-\t\tString str="({\\"locate-req\\",5,\\"" + Server.getMudName() +\r\n+\t\tString str="({\\"locate-req\\",5,\\"" + I3Server.getMudName() +\r\n                "\\",\\"" + sender_name + "\\",0,0,\\"" +\r\n                user_name + "\\",})";\r\n \t\treturn str;\r\ndiff --git a/com/planet_ink/coffee_mud/core/intermud/i3/packets/LocateReplyPacket.java b/com/planet_ink/coffee_mud/core/intermud/i3/packets/LocateReplyPacket.java\nindex 1e90319873..61c3ba9891 100644\n--- a/com/planet_ink/coffee_mud/core/intermud/i3/packets/LocateReplyPacket.java\n+++ b/com/planet_ink/coffee_mud/core/intermud/i3/packets/LocateReplyPacket.java\n@@ -68,7 +68,7 @@ public class LocateReplyPacket extends Packet {\n         type = Packet.LOCATE_REPLY;\r\n         target_mud = mud;\r\n         target_name = to_whom;\r\n-        located_mud_name = Server.getMudName();\r\n+        located_mud_name = I3Server.getMudName();\r\n         located_visible_name = who;\r\n         idle_time = idl;\r\n         status = stat;\r\n@@ -83,7 +83,7 @@ public class LocateReplyPacket extends Packet {\n     }\r\n \r\n     public String toString() {\r\n-        return "({\\"locate-reply\\",5,\\"" + Server.getMudName() +\r\n+        return "({\\"locate-reply\\",5,\\"" + I3Server.getMudName() +\r\n                "\\",0,\\"" + target_mud + "\\",\\"" + target_name +\r\n                "\\",\\"" + located_mud_name + "\\",\\"" +\r\n                located_visible_name + "\\"," + idle_time + ",\\"" +\r\ndiff --git a/com/planet_ink/coffee_mud/core/intermud/i3/packets/Packet.java b/com/planet_ink/coffee_mud/core/intermud/i3/packets/Packet.java\nindex ec6b32fd75..d36f8e7beb 100644\n--- a/com/planet_ink/coffee_mud/core/intermud/i3/packets/Packet.java\n+++ b/com/planet_ink/coffee_mud/core/intermud/i3/packets/Packet.java\n@@ -67,7 +67,7 @@ public class Packet {\n \r\n     public Packet() {\r\n         super();\r\n-        sender_mud = Server.getMudName();\r\n+        sender_mud = I3Server.getMudName();\r\n     }\r\n \r\n     public Packet(Vector v) {\r\ndiff --git a/com/planet_ink/coffee_mud/core/intermud/i3/packets/TellPacket.java b/com/planet_ink/coffee_mud/core/intermud/i3/packets/TellPacket.java\nindex 6f57934ba4..aafd649ccb 100644\n--- a/com/planet_ink/coffee_mud/core/intermud/i3/packets/TellPacket.java\n+++ b/com/planet_ink/coffee_mud/core/intermud/i3/packets/TellPacket.java\n@@ -120,7 +120,7 @@ public class TellPacket extends Packet {\n      * @return the mud mode string for this packet\r\n      */\r\n     public String toString() {\r\n-        return "({\\"tell\\",5,\\"" + Server.getMudName() +\r\n+        return "({\\"tell\\",5,\\"" + I3Server.getMudName() +\r\n                "\\",\\"" + sender_name + "\\",\\"" + target_mud +\r\n                "\\",\\"" + target_name + "\\",\\"" +\r\n                sender_visible_name + "\\",\\"" + message + "\\",})";\r\ndiff --git a/com/planet_ink/coffee_mud/core/intermud/i3/packets/WhoPacket.java b/com/planet_ink/coffee_mud/core/intermud/i3/packets/WhoPacket.java\nindex f08571ca8c..2386e9a6fd 100644\n--- a/com/planet_ink/coffee_mud/core/intermud/i3/packets/WhoPacket.java\n+++ b/com/planet_ink/coffee_mud/core/intermud/i3/packets/WhoPacket.java\n@@ -1,5 +1,5 @@\n package com.planet_ink.coffee_mud.core.intermud.i3.packets;\r\n-import com.planet_ink.coffee_mud.core.intermud.i3.server.Server;\r\n+import com.planet_ink.coffee_mud.core.intermud.i3.server.I3Server;\r\n import com.planet_ink.coffee_mud.core.interfaces.*;\r\n import com.planet_ink.coffee_mud.core.*;\r\n import com.planet_ink.coffee_mud.core.collections.*;\r\n@@ -64,11 +64,11 @@ public class WhoPacket extends Packet {\n     public String toString() {\r\n \t\tif(type==Packet.WHO_REQUEST)\r\n \t\t{\r\n-\t\t\treturn "({\\"who-req\\",5,\\"" + Server.getMudName() +\r\n+\t\t\treturn "({\\"who-req\\",5,\\"" + I3Server.getMudName() +\r\n \t\t\t       "\\",\\"" + sender_name + "\\",\\"" + target_mud +\r\n \t\t\t       "\\",0,})";\r\n \t\t}\r\n-\t\tString str = "({\\"who-reply\\",5,\\"" + Server.getMudName() +\r\n+\t\tString str = "({\\"who-reply\\",5,\\"" + I3Server.getMudName() +\r\n \t             "\\",0,\\"" + target_mud + "\\",\\"" + target_name + "\\",({";\r\n \t\tint i;\r\n \r\ndiff --git a/com/planet_ink/coffee_mud/core/intermud/i3/server/Server.java b/com/planet_ink/coffee_mud/core/intermud/i3/server/I3Server.java\nsimilarity index 96%\nrename from com/planet_ink/coffee_mud/core/intermud/i3/server/Server.java\nrename to com/planet_ink/coffee_mud/core/intermud/i3/server/I3Server.java\nindex 73e315fee8..568fdb4cd3 100644\n--- a/com/planet_ink/coffee_mud/core/intermud/i3/server/Server.java\n+++ b/com/planet_ink/coffee_mud/core/intermud/i3/server/I3Server.java\n@@ -42,7 +42,7 @@ import com.planet_ink.coffee_mud.Races.interfaces.*;\n  * @author George Reese\r\n  * @version 1.0\r\n  */\r\n-public class Server {\r\n+public class I3Server {\r\n     static private ServerThread thread = null;\r\n     static private boolean started = false;\r\n \r\ndiff --git a/com/planet_ink/coffee_mud/core/intermud/i3/server/ServerThread.java b/com/planet_ink/coffee_mud/core/intermud/i3/server/ServerThread.java\nindex 3bd6c17eac..a83fdcf742 100644\n--- a/com/planet_ink/coffee_mud/core/intermud/i3/server/ServerThread.java\n+++ b/com/planet_ink/coffee_mud/core/intermud/i3/server/ServerThread.java\n@@ -50,7 +50,7 @@ import java.util.Hashtable;\n  * executed in the thread\'s run() method.\r\n  * @author George Reese (borg@imaginary.com)\r\n  * @version 1.0\r\n- * @see com.planet_ink.coffee_mud.core.intermud.i3.server.Server\r\n+ * @see com.planet_ink.coffee_mud.core.intermud.i3.server.I3Server\r\n  */\r\n @SuppressWarnings("unchecked")\r\n public class ServerThread extends Thread {\r\ndiff --git a/com/planet_ink/coffee_mud/core/threads/ServiceEngine.java b/com/planet_ink/coffee_mud/core/threads/ServiceEngine.java\nindex 5385049590..569dc0af97 100644\n--- a/com/planet_ink/coffee_mud/core/threads/ServiceEngine.java\n+++ b/com/planet_ink/coffee_mud/core/threads/ServiceEngine.java\n@@ -877,7 +877,18 @@ public class ServiceEngine implements ThreadEngine\n                 for(Iterator e=almostTock.tickers();e.hasNext();)\r\n                     objs.addElement(e.next());\r\n             }catch(NoSuchElementException e){}\r\n-            almostTock.shutdown();\r\n+            try\r\n+            {\r\n+\t            almostTock.shutdown();\r\n+            }\r\n+            catch(java.lang.ThreadDeath d)\r\n+            {\r\n+            \tLog.errOut("ThreadDeath killing Tick#"+almostTock.getId());\r\n+            }\r\n+            catch(Throwable t)\r\n+            {\r\n+            \tLog.errOut("Error "+t.getMessage()+" killing Tick#"+almostTock.getId());\r\n+            }\r\n             if(CMLib.threads() instanceof ServiceEngine)\r\n                 ((ServiceEngine)CMLib.threads()).delTickGroup(almostTock);\r\n             for(int i=0;i<objs.size();i++)\r\ndiff --git a/web/admin/grinder/menu1.cmvp b/web/admin/grinder/menu1.cmvp\nindex e94c93c3f6..cb5b0a61bf 100644\n--- a/web/admin/grinder/menu1.cmvp\n+++ b/web/admin/grinder/menu1.cmvp\n@@ -50,6 +50,8 @@\n \t\t@if?CheckAuthCode?AUTH_EXPORT=true@\r\n \t\t<INPUT TYPE=BUTTON NAME=EXPORT VALUE="Export Data" ONCLICK="Clicked(\'/AreaXML\');">\r\n \t\t@endif@\r\n+\t\t<INPUT TYPE=BUTTON NAME=SCRIPTS VALUE="Scripts" ONCLICK="Clicked(\'/grinder/editareascripts.cmvp\');">\r\n+\t\t<P>\r\n \t\t<INPUT TYPE=BUTTON NAME=LOGOUT VALUE="Main Menu" ONCLICK="Clicked(\'/grinder/loggedin.cmvp\');">\r\n \t</TD>\r\n </TR>\r\n', 'commit_subject': '', 'repo_name': 'bozimmerman/CoffeeMud', 'committer': {'name': 'bozimmerman', 'email': 'dc45fe023482b3b890b5e574e53c1d051f45b1ef@zimmers.net', 'time_sec': '1272580421', 'tz_offset': '0', 'date': {'seconds': '1272580421'}}, 'commit_tree': '463bc548ef484c3afe08e1bf16227b15f9808395', 'commit_message': '\n\ngit-svn-id: svn://192.168.1.10/public/CoffeeMud@8474 0d6f1817-ed0e-0410-87c9-987e46238f29\n', 'language_name': 'Shell', 'license': 'apache-2.0', 'hunks': '@@ -50,6 +50,8 @@\n \t\t@if?CheckAuthCode?AUTH_EXPORT=true@\r\n \t\t<INPUT TYPE=BUTTON NAME=EXPORT VALUE="Export Data" ONCLICK="Clicked(\'/AreaXML\');">\r\n \t\t@endif@\r\n+\t\t<INPUT TYPE=BUTTON NAME=SCRIPTS VALUE="Scripts" ONCLICK="Clicked(\'/grinder/editareascripts.cmvp\');">\r\n+\t\t<P>\r\n \t\t<INPUT TYPE=BUTTON NAME=LOGOUT VALUE="Main Menu" ONCLICK="Clicked(\'/grinder/loggedin.cmvp\');">\r\n \t</TD>\r\n </TR>\r\n', 'addition_count': 2, 'deletion_count': 0, 'src_file': 'a/web/admin/grinder/menu1.cmvp', 'tgt_file': 'b/web/admin/grinder/menu1.cmvp', 'file_extension': '.cmvp', 'before_file': '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">\n<META HTTP-EQUIV="Pragma" CONTENT="no-cache">\n@if?!Authenticate@ @AddFile?/grinder/failedlogin.cmvp@ @else@\n@if?!CheckAuthCode?ANYMODAREAS=true@ @AddFile?/grinder/nopriv.cmvp@ @else@\n\n<html>\n\t<META CHARSET="utf-8"/>\n<head>\n\t<!-- tell spiders to sod off -->\n\t<meta name="ROBOTS" content="NOINDEX, NOFOLLOW">\n\t<link rel="STYLESHEET" TYPE="TEXT/CSS" HREF="/grinder/grinder.css">\n \t<link rel="grinder icon" href="/images/grinder.ico" >\n\t<title>CoffeeMud MUDGrinder</title>\n\t<script language=JavaScript>\n\t<!--\n\t\tfunction Clicked(action)\n\t\t{\n\t\t\tdocument.AREAEDIT.action=action;\n\t\t\tdocument.AREAEDIT.submit();\n\t\t}\n\t\tfunction Clicked(action)\n\t\t{\n\t\t\tdocument.AREAEDIT.action=action;\n\t\t\tdocument.AREAEDIT.submit();\n\t\t}\n\t//-->\n\t</script>\n</head>\n<BODY>\n<FORM  ACCEPT-CHARSET="UTF-8" NAME=AREAEDIT TARGET=_top METHOD=POST ACTION="/grinder/quickfind.cmvp">\n<INPUT TYPE=HIDDEN NAME=AUTH VALUE="@Authenticate?AUTH@">\n<INPUT TYPE=HIDDEN NAME=AREA VALUE="@AreaID@">\n<INPUT TYPE=HIDDEN NAME=MAPSTYLE VALUE="@RequestParameter?MAPSTYLE@">\n<INPUT TYPE=HIDDEN NAME=MAPLEVEL VALUE="@RequestParameter?MAPLEVEL@">\n\n<TABLE WIDTH=100% CELLSPACING=0 CELLPADDING=0 BORDER=0>\n<TR>\n\t<TD WIDTH=10% VALIGN=TOP><IMG SRC="/grinder/images/grinder.gif" WIDTH=80 HEIGHT=80  ALT="" BORDER="0"></TD>\n\t<TD WIDTH=50% ALIGN=LEFT VALIGN=TOP>\n\t&nbsp;&nbsp;&nbsp;&nbsp;\n\t<INPUT TYPE=TEXT NAME=QUICKFIND VALUE="">\n\t<INPUT TYPE=SUBMIT NAME=FINDIT VALUE="Quick Find" ONCLICK="Clicked(\'/grinder/quickfind.cmvp\');">\n\t</TD>\n\t<TD WIDTH=40% ALIGN=RIGHT style="position:absolute; top: 0; bottom: 0;">\n\t\t<TABLE WIDTH=200 BORDER=0 HEIGHT=100%>\n\t\t@if?!AreaData?AREAISBOARDABLE@\n\t\t\t<TR><TD ALIGN=RIGHT>\n\t\t\t@if?AreaData?ISGRID@\n\t\t\t\t<INPUT TYPE=BUTTON NAMEMOVEAREA VALUE="Move" ONCLICK="Clicked(\'/grinder/maparea.cmvp\');">\n\t\t@if?CheckAuthCode?AUTH_EXPORT=true@\r\n\t\t<INPUT TYPE=BUTTON NAME=EXPORT VALUE="Export Data" ONCLICK="Clicked(\'/AreaXML\');">\r\n\t\t@endif@\r\n\t\t<INPUT TYPE=BUTTON NAME=LOGOUT VALUE="Main Menu" ONCLICK="Clicked(\'/grinder/loggedin.cmvp\');">\r\n\t</TD>\r\n</TR>\r\n\t\t\t@endif@\n\t\t\t</TD></TR>\n\t\t\t<TR><TD ALIGN=RIGHT>\n\t\t\t<INPUT TYPE=BUTTON NAME=SCRIPTS VALUE="Scripts" ONCLICK="Clicked(\'/grinder/editareascripts.cmvp\');">\n\t\t\t<INPUT TYPE=BUTTON NAME=EXPORT VALUE="MOBs" ONCLICK="Clicked(\'/grinder/editareamobs.cmvp\');">\n\t\t\t<INPUT TYPE=BUTTON NAME=EXPORT VALUE="Items" ONCLICK="Clicked(\'/grinder/editareaitems.cmvp\');">\n\t\t\t</TD></TR>\n\t\t\t<TR VALIGN=BOTTOM><TD ALIGN=RIGHT HEIGHT=40%>\n\t\t\t<INPUT TYPE=BUTTON NAME=LOGOUT VALUE="Main Menu" ONCLICK="Clicked(\'/grinder/loggedin.cmvp\');">\n\t\t\t</TD></TR>\n\t\t\t</TABLE>\n\t\t@else@\n\t\t\t<P>\n\t\t\t<INPUT TYPE=BUTTON NAME=CLOSE VALUE="Save" ONCLICK="Clicked(\'/grinder/saveboardablearea.cmvp\');">\n\t\t\t<P>\n\t\t\t<INPUT TYPE=BUTTON NAME=CANCELCLOSE VALUE="Cancel" ONCLICK="window.close(); top.closeThisWindow(); parent.closeThisWindow();">\n\t\t@endif@\n\t\t</TABLE>\n\t</TD>\n</TR>\n</TABLE>\n</FORM>\n</BODY>\n</HTML>\n@endif@\n@endif@\n', 'message': '\n\ngit-svn-id: svn://192.168.1.10/public/CoffeeMud@8474 0d6f1817-ed0e-0410-87c9-987e46238f29\n', 'author_name': 'bozimmerman', 'lang': 'cmvp'}