diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index abb1ba1e..1c91ae71 100755
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -276,19 +276,19 @@ namespace TShockAPI
}
else
{
- Tools.SendMessage(args.PlayerID, "You are not in a party!", 255f, 240f, 20f);
+ Tools.SendMessage(args.PlayerID, "You are not in a party!", 255, 240, 20);
}
}
public static void ThirdPerson(CommandArgs args)
{
string msg = args.Message.Remove(0, 3);
- Tools.Broadcast(string.Format("*{0} {1}", Tools.FindPlayer(args.PlayerID), msg, 205, 133, 63));
+ Tools.Broadcast(string.Format("*{0} {1}", Tools.FindPlayer(args.PlayerID), msg), 205, 133, 63);
}
public static void Playing(CommandArgs args)
{
- Tools.SendMessage(args.PlayerID, string.Format("Current players: {0}.", Tools.GetPlayers()), 255f, 240f, 20f);
+ Tools.SendMessage(args.PlayerID, string.Format("Current players: {0}.", Tools.GetPlayers()), 255, 240, 20);
}
public static void DebugConfiguration(CommandArgs args)
diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index d3ac12a6..1c487a29 100755
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -338,7 +338,7 @@ namespace TShockAPI
));
return Tools.HandleGriefer(e.Msg.whoAmI, "Placing impossible to place blocks.");
}
- }
+ }
if (ConfigurationManager.disableBuild)
{
if (!players[e.Msg.whoAmI].group.HasPermission("editspawn"))
@@ -602,7 +602,7 @@ namespace TShockAPI
if (players[ply].group.HasPermission("adminchat") && !text.StartsWith("/"))
{
- Tools.Broadcast(ConfigurationManager.adminChatPrefix + "<" + Main.player[ply].name + "> " + text, ConfigurationManager.adminChatRGB);
+ Tools.Broadcast(ConfigurationManager.adminChatPrefix + "<" + Main.player[ply].name + "> " + text, (byte)ConfigurationManager.adminChatRGB[0], (byte)ConfigurationManager.adminChatRGB[1], (byte)ConfigurationManager.adminChatRGB[2]);
e.Handled = true;
return;
}
diff --git a/TShockAPI/Tools.cs b/TShockAPI/Tools.cs
index 025e3e58..6e5a8a0f 100755
--- a/TShockAPI/Tools.cs
+++ b/TShockAPI/Tools.cs
@@ -94,28 +94,16 @@ namespace TShockAPI
/// string message
public static void Broadcast(string msg)
{
- for (int i = 0; i < Main.player.Length; i++)
- {
- SendMessage(i, msg);
- }
- Log.Info(string.Format("Broadcast: {0}", msg));
+ Broadcast(msg, 0, 255, 0);
}
- public static void Broadcast(string msg, float red, float green, float blue)
+ public static void Broadcast(string msg, byte red, byte green, byte blue)
{
- for (int i = 0; i < Main.player.Length; i++)
- {
- SendMessage(i, msg, Tools.Clamp(red, 255, 0), Tools.Clamp(green, 255, 0), Tools.Clamp(blue, 255, 0));
- }
- Log.Info(string.Format("Broadcast: {0}", msg));
+ Broadcast(msg, new Color(red, green, blue));
}
-
- public static void Broadcast(string msg, float[] colors)
+ public static void Broadcast(string msg, Color color)
{
- for (int i = 0; i < Main.player.Length; i++)
- {
- SendMessage(i, msg, Tools.Clamp(colors[0], 255, 0), Tools.Clamp(colors[1], 255, 0), Tools.Clamp(colors[2], 255, 0));
- }
+ SendMessage(-1, msg, color);
Log.Info(string.Format("Broadcast: {0}", msg));
}
@@ -124,10 +112,10 @@ namespace TShockAPI
///
/// int socket thingy for the player from the server socket
/// String message
-
- public static void SendMessage(int ply, string msg, float red, float green, float blue)
+
+ public static void SendMessage(int ply, string msg, byte red, byte green, byte blue)
{
- NetMessage.SendData(0x19, ply, -1, msg, 255, red, green, blue);
+ SendMessage(ply, msg, new Color(red, green, blue));
}
///
@@ -167,7 +155,7 @@ namespace TShockAPI
/// string message
public static void SendMessage(int ply, string message)
{
- NetMessage.SendData(0x19, ply, -1, message, 255, 0f, 255f, 0f);
+ SendMessage(ply, message, 0, 255, 0);
}
///
@@ -361,6 +349,7 @@ namespace TShockAPI
///
/// int player
/// string filename reletave to savedir
+ //Todo: Fix this
public static void ShowFileToUser(int ply, string file)
{
string foo = "";
@@ -380,7 +369,7 @@ namespace TShockAPI
{
try
{
- SendMessage(ply, foo, Clamp(Convert.ToInt32(pCc[0]), 255, 0), Clamp(Convert.ToInt32(pCc[1]), 255, 0), Clamp(Convert.ToInt32(pCc[2]), 255, 0));
+ SendMessage(ply, foo, (byte)Convert.ToInt32(pCc[0]), (byte)Convert.ToInt32(pCc[1]), (byte)Convert.ToInt32(pCc[2]));
continue;
}
catch (Exception e)