themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

That should be all of it

Browse source
This commit is contained in:
MarioE 2012-06-04 21:28:47 -04:00
parent f4dbb552da
commit b85bed52d2
4 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
TShockAPI/BackupManager.cs
View file

@ -60,22 +60,22 @@ namespace TShockAPI
if (worldpath != null && !Directory.Exists(worldpath)) if (worldpath != null && !Directory.Exists(worldpath))
Directory.CreateDirectory(worldpath); Directory.CreateDirectory(worldpath);
TShock.Utils.Broadcast("Server map saving, potential lag spike"); TShock.Utils.Broadcast("Server map saving, potential lag spike..");
Console.WriteLine("Backing up world..."); Console.WriteLine("Backing up world...");
SaveManager.Instance.SaveWorld(); SaveManager.Instance.SaveWorld();
Console.WriteLine("World backed up"); Console.WriteLine("World backed up.");
Console.ForegroundColor = ConsoleColor.Gray; Console.ForegroundColor = ConsoleColor.Gray;
Log.Info(string.Format("World backed up ({0})", Main.worldPathName)); Log.Info(string.Format("World backed up ({0}).", Main.worldPathName));
Main.worldPathName = worldname; Main.worldPathName = worldname;
} }
catch (Exception ex) catch (Exception ex)
{ {
Console.ForegroundColor = ConsoleColor.Red; Console.ForegroundColor = ConsoleColor.Red;
Console.WriteLine("Backup failed"); Console.WriteLine("Backup failed!");
Console.ForegroundColor = ConsoleColor.Gray; Console.ForegroundColor = ConsoleColor.Gray;
Log.Error("Backup failed"); Log.Error("Backup failed!");
Log.Error(ex.ToString()); Log.Error(ex.ToString());
} }
} }

4
TShockAPI/Commands.cs
View file

@ -1101,11 +1101,11 @@ namespace TShockAPI
var players = TShock.Utils.FindPlayer(args.Parameters[0]); var players = TShock.Utils.FindPlayer(args.Parameters[0]);
if( players.Count < 1 ) if( players.Count < 1 )
{ {
args.Player.SendErrorMessage("No players match " + args.Parameters[0]); args.Player.SendErrorMessage("No players match " + args.Parameters[0] + "!");
} }
else if( players.Count > 1 ) else if( players.Count > 1 )
{ {
args.Player.SendErrorMessage( players.Count + " players matched " + args.Parameters[0]); args.Player.SendErrorMessage( players.Count + " players matched " + args.Parameters[0] + "!");
} }
else if (TShock.Config.ServerSideInventory) else if (TShock.Config.ServerSideInventory)
{ {

12
TShockAPI/DB/GroupManager.cs
View file

@ -106,7 +106,7 @@ namespace TShockAPI.DB
{ {
if (exceptions) if (exceptions)
throw new GroupExistsException(name); throw new GroupExistsException(name);
return "Error: Group already exists. Use /modGroup to change permissions."; return "Error: Group already exists. Use /modgroup to change permissions.";
} }
var group = new Group(name, null, chatcolor); var group = new Group(name, null, chatcolor);
@ -134,7 +134,7 @@ namespace TShockAPI.DB
return "Group " + name + " has been created successfully."; return "Group " + name + " has been created successfully.";
} }
else if (exceptions) else if (exceptions)
throw new GroupManagerException("Failed to add group '" + name + "'"); throw new GroupManagerException("Failed to add group '" + name + ".'");
return ""; return "";
} }
@ -200,7 +200,7 @@ namespace TShockAPI.DB
{ {
if (exceptions) if (exceptions)
throw new GroupNotExistException(name); throw new GroupNotExistException(name);
return "Error: Group doesn't exists."; return "Error: Group doesn't exist.";
} }
if (database.Query("DELETE FROM GroupList WHERE GroupName=@0", name) == 1) if (database.Query("DELETE FROM GroupList WHERE GroupName=@0", name) == 1)
@ -209,7 +209,7 @@ namespace TShockAPI.DB
return "Group " + name + " has been deleted successfully."; return "Group " + name + " has been deleted successfully.";
} }
else if (exceptions) else if (exceptions)
throw new GroupManagerException("Failed to delete group '" + name + "'"); throw new GroupManagerException("Failed to delete group '" + name + ".'");
return ""; return "";
} }
@ -217,7 +217,7 @@ namespace TShockAPI.DB
public String AddPermissions(String name, List<String> permissions) public String AddPermissions(String name, List<String> permissions)
{ {
if (!GroupExists(name)) if (!GroupExists(name))
return "Error: Group doesn't exists."; return "Error: Group doesn't exist.";
var group = TShock.Utils.GetGroup(name); var group = TShock.Utils.GetGroup(name);
var oldperms = group.Permissions; // Store old permissions in case of error var oldperms = group.Permissions; // Store old permissions in case of error
@ -234,7 +234,7 @@ namespace TShockAPI.DB
public String DeletePermissions(String name, List<String> permissions) public String DeletePermissions(String name, List<String> permissions)
{ {
if (!GroupExists(name)) if (!GroupExists(name))
return "Error: Group doesn't exists."; return "Error: Group doesn't exist.";
var group = TShock.Utils.GetGroup(name); var group = TShock.Utils.GetGroup(name);
var oldperms = group.Permissions; // Store old permissions in case of error var oldperms = group.Permissions; // Store old permissions in case of error

4
TShockAPI/TSPlayer.cs
View file

@ -640,13 +640,13 @@ namespace TShockAPI
SetBuff(32, 330, true); //Slow SetBuff(32, 330, true); //Slow
SetBuff(23, 330, true); //Cursed SetBuff(23, 330, true); //Cursed
if (!string.IsNullOrEmpty(reason)) if (!string.IsNullOrEmpty(reason))
Log.ConsoleInfo(string.Format("Player {0} has been disabled for {1}", Name, reason)); Log.ConsoleInfo(string.Format("Player {0} has been disabled for {1}.", Name, reason));
var trace = new StackTrace(); var trace = new StackTrace();
StackFrame frame = null; StackFrame frame = null;
frame = trace.GetFrame(1); frame = trace.GetFrame(1);
if (frame != null && frame.GetMethod().DeclaringType != null) if (frame != null && frame.GetMethod().DeclaringType != null)
Log.Debug(frame.GetMethod().DeclaringType.Name + " called Disable()"); Log.Debug(frame.GetMethod().DeclaringType.Name + " called Disable().");
} }
public virtual void Whoopie(object time) public virtual void Whoopie(object time)