From d7b1ae68ed2ce0cf9f6f971a13541ee6087dcb27 Mon Sep 17 00:00:00 2001 From: spjspj Date: Fri, 18 Nov 2016 00:14:59 +1100 Subject: [PATCH] spjspj - Sorcery count was double --- Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java | 1 - Mage.Server/src/main/java/mage/server/ChatManager.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java b/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java index 125023b4e5..e192c16c24 100644 --- a/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java +++ b/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java @@ -564,7 +564,6 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg artifactCounter, enchantmentCounter, instantCounter, - sorceryCounter, planeswalkerCounter, sorceryCounter, tribalCounter diff --git a/Mage.Server/src/main/java/mage/server/ChatManager.java b/Mage.Server/src/main/java/mage/server/ChatManager.java index 98208801ab..57d9ff3753 100644 --- a/Mage.Server/src/main/java/mage/server/ChatManager.java +++ b/Mage.Server/src/main/java/mage/server/ChatManager.java @@ -107,7 +107,7 @@ public class ChatManager { } private boolean containsSwearing(String message) { - if (message != null && message.toLowerCase().matches("^.*(anal|asshole|balls|bastard|bitch|blowjob|cock|crap|cunt|damn|dick|douche|fag|fuck|idiot|moron|piss|prick|pussy|rape|rapist|sex|screw you|shit|slut|vagina).*$")) { + if (message != null && message.toLowerCase().matches("^.*(anal|asshole|balls|bastard|bitch|blowjob|cock|crap|cunt|cum|damn|dick|dildo|douche|fag|fuck|idiot|moron|piss|prick|pussy|rape|rapist|sex|screw|shit|slut|vagina).*$")) { return true; } return false;