LunaChat v2.6.10 : Fixed issue #109

ucchyocean · Oct 18, 2014 · ef864c1 · ef864c1
1 parent 5f46227
commit ef864c1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.ucchyocean</groupId>
   <artifactId>LunaChat</artifactId>
-  <version>2.6.9</version>
+  <version>2.6.10</version>
   <description>チャンネルチャットプラグイン</description>
 
   <licenses>

diff --git a/src/main/java/com/github/ucchyocean/lc/channel/ChannelImpl.java b/src/main/java/com/github/ucchyocean/lc/channel/ChannelImpl.java
@@ -300,14 +300,14 @@ public void sendMessage(ChannelPlayer player, String message,
 
         // 受信者を設定する
         ArrayList<ChannelPlayer> recipients = new ArrayList<ChannelPlayer>();
-        boolean isRangeChat = false;
+        boolean sendNoRecipientMessage = false;
 
         if ( isBroadcastChannel() ) {
             // ブロードキャストチャンネル
 
             if ( isWorldRange() && player != null &&
                     player.isOnline() && player.getPlayer() != null ) {
-                isRangeChat = true;
+
                 World w = player.getPlayer().getWorld();
 
                 if ( getChatRange() > 0 ) {
@@ -334,6 +334,14 @@ public void sendMessage(ChannelPlayer player, String message,
                     }
                 }
 
+                // 受信者が自分以外いない場合は、メッセージを表示する
+                if ( !MSG_NO_RECIPIENT.equals("") && (
+                        recipients.size() == 0 ||
+                        (recipients.size() == 1 &&
+                         recipients.get(0).getName().equals(player.getName()) ) ) ) {
+                    sendNoRecipientMessage = true;
+                }
+
             } else {
                 // 通常ブロードキャスト（全員へ送信）
 
@@ -409,10 +417,7 @@ public void sendMessage(ChannelPlayer player, String message,
         }
 
         // 受信者が自分以外いない場合は、メッセージを表示する
-        if ( !MSG_NO_RECIPIENT.equals("") && isRangeChat && (
-                recipients.size() == 0 ||
-                (recipients.size() == 1 &&
-                 recipients.get(0).getName().equals(player.getName()) ) ) ) {
+        if ( sendNoRecipientMessage ) {
             String msg = replaceKeywordsForSystemMessages(MSG_NO_RECIPIENT, "");
             player.sendMessage(msg);
         }