fix chat escaping

RandomityGuy · RandomityGuy · commit 6ffd04038c5c · 2026-04-06T12:31:24.000+01:00
diff --git a/src/MarbleGame.hx b/src/MarbleGame.hx
@@ -42,7 +42,7 @@ class MarbleGame {
 
 	static var instance:MarbleGame;
 
-	static var currentVersion = "1.7.2";
+	static var currentVersion = "1.7.3";
 
 	var world:MarbleWorld;
 
diff --git a/src/gui/ChatCtrl.hx b/src/gui/ChatCtrl.hx
@@ -89,10 +89,10 @@ class ChatCtrl extends GuiControl {
 				if (StringTools.trim(this.chatHudInput.text.text) != "") {
 					sendText = '<font color="#F29515">${StringTools.htmlEscape(Settings.highscoreName.substr(0, 20))}:</font> ${StringTools.htmlEscape(this.chatHudInput.text.text.substr(0, 150))}';
 					if (Net.isClient) {
-						NetCommands.sendChatMessage(StringTools.htmlEscape(sendText));
+						NetCommands.sendChatMessage(sendText);
 					}
 					if (Net.isHost) {
-						NetCommands.sendServerChatMessage(StringTools.htmlEscape(sendText));
+						NetCommands.sendServerChatMessage(sendText);
 					}
 				}
 				this.chatHudInput.text.text = "";
@@ -118,7 +118,7 @@ class ChatCtrl extends GuiControl {
 	}
 
 	public function addChatMessage(text:String) {
-		var realText = StringTools.htmlEscape(text);
+		var realText = text;
 		this.chats.push({
 			text: realText,
 			age: 10.0
diff --git a/src/gui/MPPlayMissionGui.hx b/src/gui/MPPlayMissionGui.hx
@@ -434,10 +434,10 @@ class MPPlayMissionGui extends GuiImage {
 				if (StringTools.trim(chatInput.text.text) != "") {
 					var sendText = '<font color="#F29515">${StringTools.htmlEscape(Settings.highscoreName.substr(0, 20))}:</font> ${StringTools.htmlEscape(chatInput.text.text.substr(0, 100))}';
 					if (Net.isClient) {
-						NetCommands.sendChatMessage(StringTools.htmlEscape(sendText));
+						NetCommands.sendChatMessage(sendText);
 					}
 					if (Net.isHost) {
-						NetCommands.sendServerChatMessage(StringTools.htmlEscape(sendText));
+						NetCommands.sendServerChatMessage(sendText);
 					}
 				}
 				chatInput.text.text = "";
@@ -728,7 +728,7 @@ class MPPlayMissionGui extends GuiImage {
 	}
 
 	public static function addChatMessage(s:String) {
-		var realText = StringTools.htmlEscape(s);
+		var realText = s;
 		allChats.push(realText);
 		if (allChats.length > 100) {
 			allChats = allChats.slice(allChats.length - 100);

Original file line number	Diff line number	Diff line change
`@@ -89,10 +89,10 @@ class ChatCtrl extends GuiControl {`
`89`	`89`	`if (StringTools.trim(this.chatHudInput.text.text) != "") {`
`90`	`90`	`sendText = '<font color="#F29515">${StringTools.htmlEscape(Settings.highscoreName.substr(0, 20))}:</font> ${StringTools.htmlEscape(this.chatHudInput.text.text.substr(0, 150))}';`
`91`	`91`	`if (Net.isClient) {`
`92`		`- NetCommands.sendChatMessage(StringTools.htmlEscape(sendText));`
	`92`	`+ NetCommands.sendChatMessage(sendText);`
`93`	`93`	`}`
`94`	`94`	`if (Net.isHost) {`
`95`		`- NetCommands.sendServerChatMessage(StringTools.htmlEscape(sendText));`
	`95`	`+ NetCommands.sendServerChatMessage(sendText);`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`	`this.chatHudInput.text.text = "";`
`@@ -118,7 +118,7 @@ class ChatCtrl extends GuiControl {`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`public function addChatMessage(text:String) {`
`121`		`- var realText = StringTools.htmlEscape(text);`
	`121`	`+ var realText = text;`
`122`	`122`	`this.chats.push({`
`123`	`123`	`text: realText,`
`124`	`124`	`age: 10.0`
Original file line number	Diff line number	Diff line change
`@@ -434,10 +434,10 @@ class MPPlayMissionGui extends GuiImage {`
`434`	`434`	`if (StringTools.trim(chatInput.text.text) != "") {`
`435`	`435`	`var sendText = '<font color="#F29515">${StringTools.htmlEscape(Settings.highscoreName.substr(0, 20))}:</font> ${StringTools.htmlEscape(chatInput.text.text.substr(0, 100))}';`
`436`	`436`	`if (Net.isClient) {`
`437`		`- NetCommands.sendChatMessage(StringTools.htmlEscape(sendText));`
	`437`	`+ NetCommands.sendChatMessage(sendText);`
`438`	`438`	`}`
`439`	`439`	`if (Net.isHost) {`
`440`		`- NetCommands.sendServerChatMessage(StringTools.htmlEscape(sendText));`
	`440`	`+ NetCommands.sendServerChatMessage(sendText);`
`441`	`441`	`}`
`442`	`442`	`}`
`443`	`443`	`chatInput.text.text = "";`
`@@ -728,7 +728,7 @@ class MPPlayMissionGui extends GuiImage {`
`728`	`728`	`}`
`729`	`729`
`730`	`730`	`public static function addChatMessage(s:String) {`
`731`		`- var realText = StringTools.htmlEscape(s);`
	`731`	`+ var realText = s;`
`732`	`732`	`allChats.push(realText);`
`733`	`733`	`if (allChats.length > 100) {`
`734`	`734`	`allChats = allChats.slice(allChats.length - 100);`