Index: /binary-improvements/AllocsCommands/Commands/Give.cs =================================================================== --- /binary-improvements/AllocsCommands/Commands/Give.cs (revision 358) +++ /binary-improvements/AllocsCommands/Commands/Give.cs (revision 359) @@ -25,61 +25,57 @@ public override void Execute (List _params, CommandSenderInfo _senderInfo) { - try { - if (_params.Count != 3 && _params.Count != 4) { - SdtdConsole.Instance.Output ("Wrong number of arguments, expected 3 or 4, found " + _params.Count + - "."); + if (_params.Count != 3 && _params.Count != 4) { + SdtdConsole.Instance.Output ("Wrong number of arguments, expected 3 or 4, found " + _params.Count + + "."); + return; + } + + ClientInfo ci = ConsoleHelper.ParseParamIdOrName (_params [0]); + + if (ci == null) { + SdtdConsole.Instance.Output ("Playername or entity id not found."); + return; + } + + ItemValue iv = ItemClass.GetItem (_params [1], true); + if (iv.type == ItemValue.None.type) { + SdtdConsole.Instance.Output ("Item not found."); + return; + } + + iv = new ItemValue (iv.type, true); + + int n; + if (!int.TryParse (_params [2], out n) || n <= 0) { + SdtdConsole.Instance.Output ("Amount is not an integer or not greater than zero."); + return; + } + + int quality = Constants.cItemMaxQuality; + + if (_params.Count == 4) { + if (!int.TryParse (_params [3], out quality) || quality <= 0) { + SdtdConsole.Instance.Output ("Quality is not an integer or not greater than zero."); return; } + } - ClientInfo ci = ConsoleHelper.ParseParamIdOrName (_params [0]); + if (ItemClass.list [iv.type].HasSubItems) { + for (int i = 0; i < iv.Modifications.Length; i++) { + ItemValue tmp = iv.Modifications [i]; + tmp.Quality = quality; + iv.Modifications [i] = tmp; + } + } else if (ItemClass.list [iv.type].HasQuality) { + iv.Quality = quality; + } - if (ci == null) { - SdtdConsole.Instance.Output ("Playername or entity id not found."); - return; - } + EntityPlayer p = GameManager.Instance.World.Players.dict [ci.entityId]; - ItemValue iv = ItemClass.GetItem (_params [1], true); - if (iv.type == ItemValue.None.type) { - SdtdConsole.Instance.Output ("Item not found."); - return; - } + ItemStack invField = new ItemStack (iv, n); - iv = new ItemValue (iv.type, true); + GameManager.Instance.ItemDropServer (invField, p.GetPosition (), Vector3.zero); - int n; - if (!int.TryParse (_params [2], out n) || n <= 0) { - SdtdConsole.Instance.Output ("Amount is not an integer or not greater than zero."); - return; - } - - int quality = Constants.cItemMaxQuality; - - if (_params.Count == 4) { - if (!int.TryParse (_params [3], out quality) || quality <= 0) { - SdtdConsole.Instance.Output ("Quality is not an integer or not greater than zero."); - return; - } - } - - if (ItemClass.list [iv.type].HasSubItems) { - for (int i = 0; i < iv.Modifications.Length; i++) { - ItemValue tmp = iv.Modifications [i]; - tmp.Quality = quality; - iv.Modifications [i] = tmp; - } - } else if (ItemClass.list [iv.type].HasQuality) { - iv.Quality = quality; - } - - EntityPlayer p = GameManager.Instance.World.Players.dict [ci.entityId]; - - ItemStack invField = new ItemStack (iv, n); - - GameManager.Instance.ItemDropServer (invField, p.GetPosition (), Vector3.zero); - - SdtdConsole.Instance.Output ("Dropped item"); - } catch (Exception e) { - Log.Out ("Error in Give.Run: " + e); - } + SdtdConsole.Instance.Output ("Dropped item"); } } Index: /binary-improvements/AllocsCommands/Commands/ListItems.cs =================================================================== --- /binary-improvements/AllocsCommands/Commands/ListItems.cs (revision 358) +++ /binary-improvements/AllocsCommands/Commands/ListItems.cs (revision 359) @@ -22,26 +22,22 @@ public override void Execute (List _params, CommandSenderInfo _senderInfo) { - try { - if (_params.Count != 1 || _params [0].Length == 0) { - SdtdConsole.Instance.Output ("Usage: listitems "); - return; + if (_params.Count != 1 || _params [0].Length == 0) { + SdtdConsole.Instance.Output ("Usage: listitems "); + return; + } + + int count = ItemClass.ItemNames.Count; + bool showAll = _params [0].Trim ().Equals ("*"); + + int listed = 0; + for (int i = 0; i < count; i++) { + string s = ItemClass.ItemNames [i]; + if (showAll || s.IndexOf (_params [0], StringComparison.OrdinalIgnoreCase) >= 0) { + SdtdConsole.Instance.Output (" " + s); + listed++; } + } - int count = ItemClass.ItemNames.Count; - bool showAll = _params [0].Trim ().Equals ("*"); - - int listed = 0; - for (int i = 0; i < count; i++) { - string s = ItemClass.ItemNames [i]; - if (showAll || s.IndexOf (_params [0], StringComparison.OrdinalIgnoreCase) >= 0) { - SdtdConsole.Instance.Output (" " + s); - listed++; - } - } - - SdtdConsole.Instance.Output ("Listed " + listed + " matching items."); - } catch (Exception e) { - Log.Out ("Error in ListItems.Run: " + e); - } + SdtdConsole.Instance.Output ("Listed " + listed + " matching items."); } } Index: /binary-improvements/AllocsCommands/Commands/ListKnownPlayers.cs =================================================================== --- /binary-improvements/AllocsCommands/Commands/ListKnownPlayers.cs (revision 358) +++ /binary-improvements/AllocsCommands/Commands/ListKnownPlayers.cs (revision 359) @@ -26,61 +26,57 @@ public override void Execute (List _params, CommandSenderInfo _senderInfo) { - try { - AdminTools admTools = GameManager.Instance.adminTools; + AdminTools admTools = GameManager.Instance.adminTools; - bool onlineOnly = false; - bool notBannedOnly = false; - string nameFilter = string.Empty; - bool isSteamId = false; + bool onlineOnly = false; + bool notBannedOnly = false; + string nameFilter = string.Empty; + bool isSteamId = false; - if (_params.Count == 1) { - long steamid; - if (_params [0].EqualsCaseInsensitive ("-online")) { - onlineOnly = true; - } else if (_params [0].EqualsCaseInsensitive ("-notbanned")) { - notBannedOnly = true; - } else if (_params [0].Length == 17 && long.TryParse (_params [0], out steamid)) { - isSteamId = true; - } else { - nameFilter = _params [0]; + if (_params.Count == 1) { + long steamid; + if (_params [0].EqualsCaseInsensitive ("-online")) { + onlineOnly = true; + } else if (_params [0].EqualsCaseInsensitive ("-notbanned")) { + notBannedOnly = true; + } else if (_params [0].Length == 17 && long.TryParse (_params [0], out steamid)) { + isSteamId = true; + } else { + nameFilter = _params [0]; + } + } + + if (isSteamId) { + Player p = PersistentContainer.Instance.Players [_params [0], false]; + + if (p != null) { + SdtdConsole.Instance.Output (string.Format ( + "{0}. {1}, id={2}, steamid={3}, online={4}, ip={5}, playtime={6} m, seen={7}", + 0, p.Name, p.EntityID, _params [0], p.IsOnline, p.IP, + p.TotalPlayTime / 60, + p.LastOnline.ToString ("yyyy-MM-dd HH:mm")) + ); + } else { + SdtdConsole.Instance.Output (string.Format ("SteamID {0} unknown!", _params [0])); + } + } else { + int num = 0; + foreach (KeyValuePair kvp in PersistentContainer.Instance.Players.Dict) { + Player p = kvp.Value; + + if ( + (!onlineOnly || p.IsOnline) + && (!notBannedOnly || !admTools.IsBanned (kvp.Key)) + && (nameFilter.Length == 0 || p.Name.ContainsCaseInsensitive (nameFilter)) + ) { + SdtdConsole.Instance.Output (string.Format ( + "{0}. {1}, id={2}, steamid={3}, online={4}, ip={5}, playtime={6} m, seen={7}", + ++num, p.Name, p.EntityID, kvp.Key, p.IsOnline, p.IP, + p.TotalPlayTime / 60, + p.LastOnline.ToString ("yyyy-MM-dd HH:mm")) + ); } } - if (isSteamId) { - Player p = PersistentContainer.Instance.Players [_params [0], false]; - - if (p != null) { - SdtdConsole.Instance.Output (string.Format ( - "{0}. {1}, id={2}, steamid={3}, online={4}, ip={5}, playtime={6} m, seen={7}", - 0, p.Name, p.EntityID, _params [0], p.IsOnline, p.IP, - p.TotalPlayTime / 60, - p.LastOnline.ToString ("yyyy-MM-dd HH:mm")) - ); - } else { - SdtdConsole.Instance.Output (string.Format ("SteamID {0} unknown!", _params [0])); - } - } else { - int num = 0; - foreach (KeyValuePair kvp in PersistentContainer.Instance.Players.Dict) { - Player p = kvp.Value; - - if ( - (!onlineOnly || p.IsOnline) - && (!notBannedOnly || !admTools.IsBanned (kvp.Key)) - && (nameFilter.Length == 0 || p.Name.ContainsCaseInsensitive (nameFilter)) - ) { - SdtdConsole.Instance.Output (string.Format ( - "{0}. {1}, id={2}, steamid={3}, online={4}, ip={5}, playtime={6} m, seen={7}", - ++num, p.Name, p.EntityID, kvp.Key, p.IsOnline, p.IP, - p.TotalPlayTime / 60, - p.LastOnline.ToString ("yyyy-MM-dd HH:mm")) - ); - } - } - - SdtdConsole.Instance.Output ("Total of " + PersistentContainer.Instance.Players.Count + " known"); - } - } catch (Exception e) { - Log.Out ("Error in ListKnownPlayers.Run: " + e); + SdtdConsole.Instance.Output ("Total of " + PersistentContainer.Instance.Players.Count + " known"); } } Index: /binary-improvements/AllocsCommands/Commands/ListLandProtection.cs =================================================================== --- /binary-improvements/AllocsCommands/Commands/ListLandProtection.cs (revision 358) +++ /binary-improvements/AllocsCommands/Commands/ListLandProtection.cs (revision 359) @@ -25,107 +25,103 @@ public override void Execute (List _params, CommandSenderInfo _senderInfo) { - try { - if (_senderInfo.RemoteClientInfo != null) { - if (_params.Count >= 1 && _params [0].EqualsCaseInsensitive ("nearby")) { - _params.Add (_senderInfo.RemoteClientInfo.playerId); - } + if (_senderInfo.RemoteClientInfo != null) { + if (_params.Count >= 1 && _params [0].EqualsCaseInsensitive ("nearby")) { + _params.Add (_senderInfo.RemoteClientInfo.playerId); } + } - World w = GameManager.Instance.World; - PersistentPlayerList ppl = GameManager.Instance.GetPersistentPlayerList (); + World w = GameManager.Instance.World; + PersistentPlayerList ppl = GameManager.Instance.GetPersistentPlayerList (); - bool summaryOnly = false; - string steamIdFilter = string.Empty; - Vector3i closeTo = default (Vector3i); - bool onlyCloseToPlayer = false; - int closeToDistance = 32; - bool parseableOutput = false; + bool summaryOnly = false; + string steamIdFilter = string.Empty; + Vector3i closeTo = default (Vector3i); + bool onlyCloseToPlayer = false; + int closeToDistance = 32; + bool parseableOutput = false; - if (_params.Contains ("parseable")) { - parseableOutput = true; - _params.Remove ("parseable"); - } + if (_params.Contains ("parseable")) { + parseableOutput = true; + _params.Remove ("parseable"); + } - if (_params.Count == 1) { - long tempLong; + if (_params.Count == 1) { + long tempLong; - if (_params [0].EqualsCaseInsensitive ("summary")) { - summaryOnly = true; - } else if (_params [0].Length == 17 && long.TryParse (_params [0], out tempLong)) { - steamIdFilter = _params [0]; + if (_params [0].EqualsCaseInsensitive ("summary")) { + summaryOnly = true; + } else if (_params [0].Length == 17 && long.TryParse (_params [0], out tempLong)) { + steamIdFilter = _params [0]; + } else { + ClientInfo ci = ConsoleHelper.ParseParamIdOrName (_params [0]); + if (ci != null) { + steamIdFilter = ci.playerId; } else { - ClientInfo ci = ConsoleHelper.ParseParamIdOrName (_params [0]); - if (ci != null) { - steamIdFilter = ci.playerId; - } else { - SdtdConsole.Instance.Output ("Player name or entity id \"" + _params [0] + "\" not found."); - return; - } - } - } else if (_params.Count >= 2) { - if (_params [0].EqualsCaseInsensitive ("nearby")) { - try { - if (_params.Count == 3) { - if (!int.TryParse (_params [1], out closeToDistance)) { - SdtdConsole.Instance.Output ("Given length is not an integer!"); - return; - } - - closeToDistance /= 2; - } - - ClientInfo ci = ConsoleHelper.ParseParamSteamIdOnline (_params [_params.Count - 1]); - EntityPlayer ep = w.Players.dict [ci.entityId]; - closeTo = new Vector3i (ep.GetPosition ()); - onlyCloseToPlayer = true; - } catch (Exception e) { - SdtdConsole.Instance.Output ("Error getting current player's position"); - Log.Out ("Error in ListLandProtection.Run: " + e); - return; - } - } else { - SdtdConsole.Instance.Output ("Illegal parameter list"); + SdtdConsole.Instance.Output ("Player name or entity id \"" + _params [0] + "\" not found."); return; } } + } else if (_params.Count >= 2) { + if (_params [0].EqualsCaseInsensitive ("nearby")) { + try { + if (_params.Count == 3) { + if (!int.TryParse (_params [1], out closeToDistance)) { + SdtdConsole.Instance.Output ("Given length is not an integer!"); + return; + } + + closeToDistance /= 2; + } + + ClientInfo ci = ConsoleHelper.ParseParamSteamIdOnline (_params [_params.Count - 1]); + EntityPlayer ep = w.Players.dict [ci.entityId]; + closeTo = new Vector3i (ep.GetPosition ()); + onlyCloseToPlayer = true; + } catch (Exception e) { + SdtdConsole.Instance.Output ("Error getting current player's position"); + Log.Out ("Error in ListLandProtection.Run: " + e); + return; + } + } else { + SdtdConsole.Instance.Output ("Illegal parameter list"); + return; + } + } - LandClaimList.OwnerFilter[] ownerFilters = null; - if (!string.IsNullOrEmpty (steamIdFilter)) { - ownerFilters = new[] {LandClaimList.SteamIdFilter (steamIdFilter)}; - } + LandClaimList.OwnerFilter[] ownerFilters = null; + if (!string.IsNullOrEmpty (steamIdFilter)) { + ownerFilters = new[] {LandClaimList.SteamIdFilter (steamIdFilter)}; + } - LandClaimList.PositionFilter[] posFilters = null; - if (onlyCloseToPlayer) { - posFilters = new[] {LandClaimList.CloseToFilter2dRect (closeTo, closeToDistance)}; - } + LandClaimList.PositionFilter[] posFilters = null; + if (onlyCloseToPlayer) { + posFilters = new[] {LandClaimList.CloseToFilter2dRect (closeTo, closeToDistance)}; + } - Dictionary> claims = LandClaimList.GetLandClaims (ownerFilters, posFilters); + Dictionary> claims = LandClaimList.GetLandClaims (ownerFilters, posFilters); - foreach (KeyValuePair> kvp in claims) { - SdtdConsole.Instance.Output (string.Format ( - "Player \"{0} ({1})\" owns {4} keystones (protected: {2}, current hardness multiplier: {3})", - kvp.Key.Name, - kvp.Key.SteamID, - kvp.Key.LandProtectionActive, - kvp.Key.LandProtectionMultiplier, - kvp.Value.Count)); - if (!summaryOnly) { - foreach (Vector3i v in kvp.Value) { - if (parseableOutput) { - SdtdConsole.Instance.Output ("LandProtectionOf: id=" + kvp.Key.SteamID + - ", playerName=" + kvp.Key.Name + ", location=" + v); - } else { - SdtdConsole.Instance.Output (" (" + v + ")"); - } + foreach (KeyValuePair> kvp in claims) { + SdtdConsole.Instance.Output (string.Format ( + "Player \"{0} ({1})\" owns {4} keystones (protected: {2}, current hardness multiplier: {3})", + kvp.Key.Name, + kvp.Key.SteamID, + kvp.Key.LandProtectionActive, + kvp.Key.LandProtectionMultiplier, + kvp.Value.Count)); + if (!summaryOnly) { + foreach (Vector3i v in kvp.Value) { + if (parseableOutput) { + SdtdConsole.Instance.Output ("LandProtectionOf: id=" + kvp.Key.SteamID + + ", playerName=" + kvp.Key.Name + ", location=" + v); + } else { + SdtdConsole.Instance.Output (" (" + v + ")"); } } } + } - if (string.IsNullOrEmpty (steamIdFilter)) { - SdtdConsole.Instance.Output ("Total of " + ppl.m_lpBlockMap.Count + " keystones in the game"); - } - } catch (Exception e) { - Log.Out ("Error in ListLandProtection.Run: " + e); + if (string.IsNullOrEmpty (steamIdFilter)) { + SdtdConsole.Instance.Output ("Total of " + ppl.m_lpBlockMap.Count + " keystones in the game"); } } Index: /binary-improvements/AllocsCommands/Commands/RemoveLandProtection.cs =================================================================== --- /binary-improvements/AllocsCommands/Commands/RemoveLandProtection.cs (revision 358) +++ /binary-improvements/AllocsCommands/Commands/RemoveLandProtection.cs (revision 359) @@ -58,37 +58,33 @@ private void removeByPosition (List _coords) { - try { - int x, y, z; - int.TryParse (_coords [0], out x); - int.TryParse (_coords [1], out y); - int.TryParse (_coords [2], out z); + int x, y, z; + int.TryParse (_coords [0], out x); + int.TryParse (_coords [1], out y); + int.TryParse (_coords [2], out z); - if (x == int.MinValue || y == int.MinValue || z == int.MinValue) { - SdtdConsole.Instance.Output ("At least one of the given coordinates is not a valid integer"); - return; - } + if (x == int.MinValue || y == int.MinValue || z == int.MinValue) { + SdtdConsole.Instance.Output ("At least one of the given coordinates is not a valid integer"); + return; + } - Vector3i v = new Vector3i (x, y, z); + Vector3i v = new Vector3i (x, y, z); - PersistentPlayerList ppl = GameManager.Instance.GetPersistentPlayerList (); + PersistentPlayerList ppl = GameManager.Instance.GetPersistentPlayerList (); - Dictionary d = ppl.m_lpBlockMap; - if (d == null || !d.ContainsKey (v)) { - SdtdConsole.Instance.Output ( - "No land protection block at the given position or not a valid position. Use \"listlandprotection\" to get a list of keystones."); - return; - } + Dictionary d = ppl.m_lpBlockMap; + if (d == null || !d.ContainsKey (v)) { + SdtdConsole.Instance.Output ( + "No land protection block at the given position or not a valid position. Use \"listlandprotection\" to get a list of keystones."); + return; + } - BlockChangeInfo bci = new BlockChangeInfo (v, new BlockValue (0), true, false); + BlockChangeInfo bci = new BlockChangeInfo (v, new BlockValue (0), true, false); - List changes = new List (); - changes.Add (bci); + List changes = new List (); + changes.Add (bci); - GameManager.Instance.SetBlocksRPC (changes); + GameManager.Instance.SetBlocksRPC (changes); - SdtdConsole.Instance.Output ("Land protection block at (" + v + ") removed"); - } catch (Exception e) { - Log.Out ("Error in RemoveLandProtection.removeByPosition: " + e); - } + SdtdConsole.Instance.Output ("Land protection block at (" + v + ") removed"); } Index: /binary-improvements/AllocsCommands/Commands/SayToPlayer.cs =================================================================== --- /binary-improvements/AllocsCommands/Commands/SayToPlayer.cs (revision 358) +++ /binary-improvements/AllocsCommands/Commands/SayToPlayer.cs (revision 359) @@ -35,12 +35,8 @@ public override void Execute (List _params, CommandSenderInfo _senderInfo) { - try { - if (_senderInfo.RemoteClientInfo != null) { - RunInternal (_senderInfo.RemoteClientInfo, _params); - } else { - RunInternal (null, _params); - } - } catch (Exception e) { - Log.Out ("Error in SayToPlayer.Run: " + e); + if (_senderInfo.RemoteClientInfo != null) { + RunInternal (_senderInfo.RemoteClientInfo, _params); + } else { + RunInternal (null, _params); } } Index: /binary-improvements/AllocsCommands/Commands/ShowInventory.cs =================================================================== --- /binary-improvements/AllocsCommands/Commands/ShowInventory.cs (revision 358) +++ /binary-improvements/AllocsCommands/Commands/ShowInventory.cs (revision 359) @@ -25,55 +25,51 @@ public override void Execute (List _params, CommandSenderInfo _senderInfo) { - try { - if (_params.Count < 1) { - SdtdConsole.Instance.Output ("Usage: showinventory [tag]"); - return; - } + if (_params.Count < 1) { + SdtdConsole.Instance.Output ("Usage: showinventory [tag]"); + return; + } - string steamid = PersistentContainer.Instance.Players.GetSteamID (_params [0], true); - if (steamid == null) { - SdtdConsole.Instance.Output ( - "Playername or entity/steamid id not found or no inventory saved (first saved after a player has been online for 30s)."); - return; - } + string steamid = PersistentContainer.Instance.Players.GetSteamID (_params [0], true); + if (steamid == null) { + SdtdConsole.Instance.Output ( + "Playername or entity/steamid id not found or no inventory saved (first saved after a player has been online for 30s)."); + return; + } - string tag = null; - if (_params.Count > 1 && _params [1].Length > 0) { - tag = _params [1]; - } + string tag = null; + if (_params.Count > 1 && _params [1].Length > 0) { + tag = _params [1]; + } - Player p = PersistentContainer.Instance.Players [steamid, false]; - PersistentData.Inventory inv = p.Inventory; + Player p = PersistentContainer.Instance.Players [steamid, false]; + PersistentData.Inventory inv = p.Inventory; - if (tag == null) { - SdtdConsole.Instance.Output ("Belt of player " + p.Name + ":"); - } + if (tag == null) { + SdtdConsole.Instance.Output ("Belt of player " + p.Name + ":"); + } - PrintInv (inv.belt, p.EntityID, "belt", tag); - if (tag == null) { - SdtdConsole.Instance.Output (string.Empty); - } + PrintInv (inv.belt, p.EntityID, "belt", tag); + if (tag == null) { + SdtdConsole.Instance.Output (string.Empty); + } - if (tag == null) { - SdtdConsole.Instance.Output ("Bagpack of player " + p.Name + ":"); - } + if (tag == null) { + SdtdConsole.Instance.Output ("Bagpack of player " + p.Name + ":"); + } - PrintInv (inv.bag, p.EntityID, "backpack", tag); - if (tag == null) { - SdtdConsole.Instance.Output (string.Empty); - } + PrintInv (inv.bag, p.EntityID, "backpack", tag); + if (tag == null) { + SdtdConsole.Instance.Output (string.Empty); + } - if (tag == null) { - SdtdConsole.Instance.Output ("Equipment of player " + p.Name + ":"); - } + if (tag == null) { + SdtdConsole.Instance.Output ("Equipment of player " + p.Name + ":"); + } - PrintEquipment (inv.equipment, p.EntityID, "equipment", tag); + PrintEquipment (inv.equipment, p.EntityID, "equipment", tag); - if (tag != null) { - SdtdConsole.Instance.Output ("tracker_item id=" + p.EntityID + ", tag=" + tag + - ", SHOWINVENTORY DONE"); - } - } catch (Exception e) { - Log.Out ("Error in ShowInventory.Run: " + e); + if (tag != null) { + SdtdConsole.Instance.Output ("tracker_item id=" + p.EntityID + ", tag=" + tag + + ", SHOWINVENTORY DONE"); } } Index: /binary-improvements/MapRendering/Commands/EnableOpenIDDebug.cs =================================================================== --- /binary-improvements/MapRendering/Commands/EnableOpenIDDebug.cs (revision 358) +++ /binary-improvements/MapRendering/Commands/EnableOpenIDDebug.cs (revision 359) @@ -14,15 +14,11 @@ public override void Execute (List _params, CommandSenderInfo _senderInfo) { - try { - if (_params.Count != 1) { - SdtdConsole.Instance.Output ("Current state: " + OpenID.debugOpenId); - return; - } + if (_params.Count != 1) { + SdtdConsole.Instance.Output ("Current state: " + OpenID.debugOpenId); + return; + } - OpenID.debugOpenId = _params [0].Equals ("1"); - SdtdConsole.Instance.Output ("Set OpenID debugging to " + _params [0].Equals ("1")); - } catch (Exception e) { - Log.Out ("Error in EnableOpenIDDebug.Run: " + e); - } + OpenID.debugOpenId = _params [0].Equals ("1"); + SdtdConsole.Instance.Output ("Set OpenID debugging to " + _params [0].Equals ("1")); } } Index: /binary-improvements/MapRendering/Commands/EnableRendering.cs =================================================================== --- /binary-improvements/MapRendering/Commands/EnableRendering.cs (revision 358) +++ /binary-improvements/MapRendering/Commands/EnableRendering.cs (revision 359) @@ -13,15 +13,11 @@ public override void Execute (List _params, CommandSenderInfo _senderInfo) { - try { - if (_params.Count != 1) { - SdtdConsole.Instance.Output ("Current state: " + MapRendering.MapRendering.renderingEnabled); - return; - } + if (_params.Count != 1) { + SdtdConsole.Instance.Output ("Current state: " + MapRendering.MapRendering.renderingEnabled); + return; + } - MapRendering.MapRendering.renderingEnabled = _params [0].Equals ("1"); - SdtdConsole.Instance.Output ("Set live map rendering to " + _params [0].Equals ("1")); - } catch (Exception e) { - Log.Out ("Error in EnableRendering.Run: " + e); - } + MapRendering.MapRendering.renderingEnabled = _params [0].Equals ("1"); + SdtdConsole.Instance.Output ("Set live map rendering to " + _params [0].Equals ("1")); } } Index: /binary-improvements/MapRendering/Commands/ReloadWebPermissions.cs =================================================================== --- /binary-improvements/MapRendering/Commands/ReloadWebPermissions.cs (revision 358) +++ /binary-improvements/MapRendering/Commands/ReloadWebPermissions.cs (revision 359) @@ -14,10 +14,6 @@ public override void Execute (List _params, CommandSenderInfo _senderInfo) { - try { - WebPermissions.Instance.Load (); - SdtdConsole.Instance.Output ("Web permissions file reloaded"); - } catch (Exception e) { - Log.Out ("Error in ReloadWebPermissions.Run: " + e); - } + WebPermissions.Instance.Load (); + SdtdConsole.Instance.Output ("Web permissions file reloaded"); } } Index: /binary-improvements/MapRendering/Commands/RenderMap.cs =================================================================== --- /binary-improvements/MapRendering/Commands/RenderMap.cs (revision 358) +++ /binary-improvements/MapRendering/Commands/RenderMap.cs (revision 359) @@ -13,11 +13,7 @@ public override void Execute (List _params, CommandSenderInfo _senderInfo) { - try { - MapRendering.MapRendering.Instance.RenderFullMap (); + MapRendering.MapRendering.Instance.RenderFullMap (); - SdtdConsole.Instance.Output ("Render map done"); - } catch (Exception e) { - Log.Out ("Error in RenderMap.Run: " + e); - } + SdtdConsole.Instance.Output ("Render map done"); } } Index: /binary-improvements/MapRendering/Commands/webstat.cs =================================================================== --- /binary-improvements/MapRendering/Commands/webstat.cs (revision 358) +++ /binary-improvements/MapRendering/Commands/webstat.cs (revision 359) @@ -14,24 +14,20 @@ public override void Execute (List _params, CommandSenderInfo _senderInfo) { - try { - int curHandlers = Web.currentHandlers; - int totalHandlers = Web.handlingCount; - long totalTime = Web.totalHandlingTime; - SdtdConsole.Instance.Output ("Current Web handlers: " + curHandlers + " - total: " + totalHandlers); - SdtdConsole.Instance.Output (" - Total time: " + totalTime + " µs - average time: " + - totalTime / totalHandlers + " µs"); + int curHandlers = Web.currentHandlers; + int totalHandlers = Web.handlingCount; + long totalTime = Web.totalHandlingTime; + SdtdConsole.Instance.Output ("Current Web handlers: " + curHandlers + " - total: " + totalHandlers); + SdtdConsole.Instance.Output (" - Total time: " + totalTime + " µs - average time: " + + totalTime / totalHandlers + " µs"); - curHandlers = WebCommandResult.currentHandlers; - totalHandlers = WebCommandResult.handlingCount; - totalTime = WebCommandResult.totalHandlingTime; - SdtdConsole.Instance.Output ("Current Web command handlers: " + curHandlers + " - total: " + - totalHandlers); - SdtdConsole.Instance.Output (" - Total time: " + totalTime + " µs" + - (totalHandlers > 0 - ? " - average time: " + totalTime / totalHandlers + " µs" - : "")); - } catch (Exception e) { - Log.Out ("Error in webstat.Run: " + e); - } + curHandlers = WebCommandResult.currentHandlers; + totalHandlers = WebCommandResult.handlingCount; + totalTime = WebCommandResult.totalHandlingTime; + SdtdConsole.Instance.Output ("Current Web command handlers: " + curHandlers + " - total: " + + totalHandlers); + SdtdConsole.Instance.Output (" - Total time: " + totalTime + " µs" + + (totalHandlers > 0 + ? " - average time: " + totalTime / totalHandlers + " µs" + : "")); } }