Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

* Fixed chat command handling (\list), the user chat input is now escaped to prevent using html tags.

Browse source
This commit is contained in:
LevelX2 2014-09-26 19:42:58 +02:00
parent 54ec3b658e
commit 0a068e2258
7 changed files with 53 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Mage.Client/src/main/java/mage/client/chat/ChatPanel.java
View file

@ -118,19 +118,6 @@ public class ChatPanel extends javax.swing.JPanel {
DEFAULT, GAME, TABLES, TOURNAMENT
}
private boolean startMessageDone = false;
// /**
// * Maps message colors to {@link Color}.
// */
// private static final Map<MessageColor, Color> colorMap = new EnumMap<>(MessageColor.class);
//
// static {
// colorMap.put(MessageColor.BLACK, Color.black);
// colorMap.put(MessageColor.GREEN, Color.green);
// colorMap.put(MessageColor.ORANGE, Color.orange);
// colorMap.put(MessageColor.BLUE, Color.blue);
// colorMap.put(MessageColor.RED, Color.red);
// colorMap.put(MessageColor.YELLOW, Color.YELLOW);
// }
/**
* Creates new form ChatPanel
@ -243,11 +230,9 @@ public class ChatPanel extends javax.swing.JPanel {
if (username != null && !username.isEmpty()) {
text.append(getColoredText(userColor, username + userSeparator));
}
text.append(getColoredText(textColor, ManaSymbols.replaceSymbolsWithHTML(message, ManaSymbols.Type.PAY) + "\n"));
text.append(getColoredText(textColor, ManaSymbols.replaceSymbolsWithHTML(message, ManaSymbols.Type.PAY) + "<br/>"));
this.txtConversation.setEditable(true);
this.txtConversation.append(text.toString());
this.txtConversation.setEditable(false);
}
private String getColoredText(String color, String text) {