mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2025-08-05 20:12:54 +00:00
XMPP: Don't send messages from spy users back to them.
This commit is contained in:
parent
094a747db3
commit
5196237c46
3 changed files with 7 additions and 4 deletions
|
@ -124,14 +124,17 @@ public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcastMessage(final IUser sender, final String message)
|
public void broadcastMessage(final IUser sender, final String message, final String xmppAddress)
|
||||||
{
|
{
|
||||||
ess.broadcastMessage(sender, message);
|
ess.broadcastMessage(sender, message);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
for (String address : getSpyUsers())
|
for (String address : getSpyUsers())
|
||||||
{
|
{
|
||||||
sendMessage(address, message);
|
if (!address.equalsIgnoreCase(xmppAddress))
|
||||||
|
{
|
||||||
|
sendMessage(address, message);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
|
|
|
@ -24,5 +24,5 @@ public interface IEssentialsXMPP extends Plugin
|
||||||
|
|
||||||
boolean toggleSpy(final Player user);
|
boolean toggleSpy(final Player user);
|
||||||
|
|
||||||
void broadcastMessage(final IUser sender, final String message);
|
void broadcastMessage(final IUser sender, final String message, final String xmppAddress);
|
||||||
}
|
}
|
||||||
|
|
|
@ -103,7 +103,7 @@ public class XMPPManager extends Handler implements MessageListener, ChatManager
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
final IUser sender = parent.getUserByAddress(StringUtils.parseBareAddress(chat.getParticipant()));
|
final IUser sender = parent.getUserByAddress(StringUtils.parseBareAddress(chat.getParticipant()));
|
||||||
parent.broadcastMessage(sender, "="+sender.getDisplayName()+": "+ message);
|
parent.broadcastMessage(sender, "="+sender.getDisplayName()+": "+ message, StringUtils.parseBareAddress(chat.getParticipant()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue