AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-25 22:30:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix ' not being unescaped when printing a message block.

Browse Source
This commit is contained in:
UnknownShadow200 2016-01-28 18:26:16 +11:00
parent 6190cf7e97
commit 95da74a955
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Player/Player.cs
View File

@ -1215,6 +1215,7 @@ namespace MCGalaxy {
} }
static char[] trimChars = { ' '};
public void HandleMsgBlock(Player p, ushort x, ushort y, ushort z, byte b) { public void HandleMsgBlock(Player p, ushort x, ushort y, ushort z, byte b) {
try { try {
//safe against SQL injections because no user input is given here //safe against SQL injections because no user input is given here
@ -1223,17 +1224,14 @@ namespace MCGalaxy {
int LastMsg = Messages.Rows.Count - 1; int LastMsg = Messages.Rows.Count - 1;
if ( LastMsg > -1 ) { if ( LastMsg > -1 ) {
string message = Messages.Rows[LastMsg]["Message"].ToString().Trim(); string message = Messages.Rows[LastMsg]["Message"].ToString().Trim();
message = message.Replace("\\'", "\'");
if ( message != prevMsg || Server.repeatMessage ) { if ( message != prevMsg || Server.repeatMessage ) {
if ( message.StartsWith("/") ) { if ( message.StartsWith("/") ) {
List<string> Message = message.Remove(0, 1).Split(' ').ToList(); string[] parts = message.Remove(0, 1).Split(trimChars, 2);
string command = Message[0]; HandleCommand(parts[0], parts.Length > 1 ? parts[1] : "");
Message.RemoveAt(0); } else {
string args = string.Join(" ", Message.ToArray());
HandleCommand(command, args);
}
else
Player.SendMessage(p, message); Player.SendMessage(p, message);
}
prevMsg = message; prevMsg = message;
} }
SendBlockchange(x, y, z, b); SendBlockchange(x, y, z, b);