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
This commit is contained in:
Ray Greenwell
2005-04-07 02:19:07 +00:00
parent 5539822fe2
commit fa2ad0fa6c
2 changed files with 7 additions and 2 deletions
@@ -25,6 +25,7 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import com.samskivert.util.ObserverList; import com.samskivert.util.ObserverList;
import com.threerings.util.MessageManager;
import com.threerings.util.Name; import com.threerings.util.Name;
import com.threerings.presents.data.ClientObject; 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 normally don't listen for responses to speak messages so
// we can't just throw an InvocationException we have to // we can't just throw an InvocationException we have to
// specifically communicate the error to the user // specifically communicate the error to the user
sendFeedback(source, null, errmsg); sendFeedback(source, MessageManager.GLOBAL_BUNDLE, errmsg);
return; return;
} }
@@ -22,6 +22,7 @@
package com.threerings.whirled.spot.server; package com.threerings.whirled.spot.server;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
import com.threerings.util.MessageManager;
import com.threerings.util.Name; import com.threerings.util.Name;
import com.threerings.presents.data.ClientObject; 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.presents.server.InvocationProvider;
import com.threerings.crowd.chat.data.ChatCodes; import com.threerings.crowd.chat.data.ChatCodes;
import com.threerings.crowd.chat.server.SpeakProvider;
import com.threerings.crowd.data.BodyObject; import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.server.PlaceRegistry; import com.threerings.crowd.server.PlaceRegistry;
@@ -244,7 +246,9 @@ public class SpotProvider
BodyObject source = (BodyObject)caller; BodyObject source = (BodyObject)caller;
String errmsg = source.checkAccess(ChatCodes.CHAT_ACCESS, null); String errmsg = source.checkAccess(ChatCodes.CHAT_ACCESS, null);
if (errmsg != null) { if (errmsg != null) {
throw new InvocationException(errmsg); SpeakProvider.sendFeedback(source,
MessageManager.GLOBAL_BUNDLE, errmsg);
return;
} }
sendClusterChatMessage(getCallerSceneId(caller), source.getOid(), sendClusterChatMessage(getCallerSceneId(caller), source.getOid(),