From 8031913a908e116bea9414722edbe6aeadd35257 Mon Sep 17 00:00:00 2001
From: DSH105 <jason.chirgwin@icloud.com>
Date: Wed, 19 Feb 2014 20:07:52 +1100
Subject: [PATCH] Fix sending an empty prefix when the message is set to
 nothing

---
 src/main/java/io/github/dsh105/echopet/util/Lang.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/github/dsh105/echopet/util/Lang.java b/src/main/java/io/github/dsh105/echopet/util/Lang.java
index bcbacba2..95f7d3ef 100644
--- a/src/main/java/io/github/dsh105/echopet/util/Lang.java
+++ b/src/main/java/io/github/dsh105/echopet/util/Lang.java
@@ -117,7 +117,7 @@ public static void sendTo(CommandSender sender, String message) {
         EchoPetPlugin.getInstance().getServer().getPluginManager().callEvent(event);
         if (!event.isCancelled()) {
             String msg = event.getMessageToSend();
-            if (msg != null || !msg.equalsIgnoreCase("") && !msg.equalsIgnoreCase(" ") && !msg.equalsIgnoreCase("none")) {
+            if (msg != null && !msg.equalsIgnoreCase("") && !msg.equalsIgnoreCase(" ") && !msg.equalsIgnoreCase("none")) {
                 event.getRecipient().sendMessage(EchoPetPlugin.getInstance().prefix + " " + msg);
             }
         }