tale
/
ProjectAres
mirror of https://github.com/OvercastNetwork/ProjectAres.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix whispers not being delivered in some cases

This commit is contained in:
cswhite2000 2018-01-11 20:04:20 -08:00
parent 4f095f5566
commit 0ce2f2739c
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/whisper/WhisperFormatter.java
View File

@ -11,6 +11,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import tc.oc.api.docs.Server; import tc.oc.api.docs.Server;
import tc.oc.api.docs.Whisper; import tc.oc.api.docs.Whisper;
import tc.oc.api.docs.virtual.ServerDoc;
import tc.oc.api.servers.ServerStore; import tc.oc.api.servers.ServerStore;
import tc.oc.commons.bukkit.chat.Audiences; import tc.oc.commons.bukkit.chat.Audiences;
import tc.oc.commons.bukkit.chat.BukkitSound; import tc.oc.commons.bukkit.chat.BukkitSound;
@ -97,7 +98,11 @@ public class WhisperFormatter {
// will also know what server they are on. The former is unavoidable. The latter could be // will also know what server they are on. The former is unavoidable. The latter could be
// avoided by saving a flag in the message indicating that the sender was disguised, but // avoided by saving a flag in the message indicating that the sender was disguised, but
// that probably isn't worth the trouble. We might do it when we move PMs to the API. // that probably isn't worth the trouble. We might do it when we move PMs to the API.
from.extra(serverFormatter.nameWithDatacenter(serverStore.byId(whisper.server_id()))).extra(" "); try {
from.extra(serverFormatter.nameWithDatacenter(serverStore.byId(whisper._id()))).extra(" ");
} catch(IllegalStateException e) {
// Send the message without the server of origin if the document cannot be found
}
} }
from.extra(new PlayerComponent(sender, NameStyle.VERBOSE)); from.extra(new PlayerComponent(sender, NameStyle.VERBOSE));