From fa2ad0fa6c5cb5b996915dd67842cef2af97df8f Mon Sep 17 00:00:00 2001
From: Ray Greenwell <ray@threerings.net>
Date: Thu, 7 Apr 2005 02:19:07 +0000
Subject: [PATCH] Fixed two bugs with the messages related to shunned players.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3460 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../com/threerings/crowd/chat/server/SpeakProvider.java     | 3 ++-
 .../com/threerings/whirled/spot/server/SpotProvider.java    | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/java/com/threerings/crowd/chat/server/SpeakProvider.java b/src/java/com/threerings/crowd/chat/server/SpeakProvider.java
index 8545d0e03..f1b2fa2a4 100644
--- a/src/java/com/threerings/crowd/chat/server/SpeakProvider.java
+++ b/src/java/com/threerings/crowd/chat/server/SpeakProvider.java
@@ -25,6 +25,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 
 import com.samskivert.util.ObserverList;
+import com.threerings.util.MessageManager;
 import com.threerings.util.Name;
 
 import com.threerings.presents.data.ClientObject;
@@ -124,7 +125,7 @@ public class SpeakProvider
             // we normally don't listen for responses to speak messages so
             // we can't just throw an InvocationException we have to
             // specifically communicate the error to the user
-            sendFeedback(source, null, errmsg);
+            sendFeedback(source, MessageManager.GLOBAL_BUNDLE, errmsg);
             return;
         }
 
diff --git a/src/java/com/threerings/whirled/spot/server/SpotProvider.java b/src/java/com/threerings/whirled/spot/server/SpotProvider.java
index 4244c5053..f865e5518 100644
--- a/src/java/com/threerings/whirled/spot/server/SpotProvider.java
+++ b/src/java/com/threerings/whirled/spot/server/SpotProvider.java
@@ -22,6 +22,7 @@
 package com.threerings.whirled.spot.server;
 
 import com.samskivert.util.StringUtil;
+import com.threerings.util.MessageManager;
 import com.threerings.util.Name;
 
 import com.threerings.presents.data.ClientObject;
@@ -30,6 +31,7 @@ import com.threerings.presents.server.InvocationException;
 import com.threerings.presents.server.InvocationProvider;
 
 import com.threerings.crowd.chat.data.ChatCodes;
+import com.threerings.crowd.chat.server.SpeakProvider;
 import com.threerings.crowd.data.BodyObject;
 import com.threerings.crowd.server.PlaceRegistry;
 
@@ -244,7 +246,9 @@ public class SpotProvider
         BodyObject source = (BodyObject)caller;
         String errmsg = source.checkAccess(ChatCodes.CHAT_ACCESS, null);
         if (errmsg != null) {
-            throw new InvocationException(errmsg);
+            SpeakProvider.sendFeedback(source,
+                MessageManager.GLOBAL_BUNDLE, errmsg);
+            return;
         }
 
         sendClusterChatMessage(getCallerSceneId(caller), source.getOid(),