PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

#2978: Allow sending messages from specific UUIDs

Browse Source
This commit is contained in:
Gerrygames
2020-10-17 17:46:01 +11:00
committed by md_5
parent c987ee199d
commit 8fffa206e4
3 changed files with 51 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
proxy/src/main/java/net/md_5/bungee/UserConnection.java
View File

@@ -441,13 +441,36 @@ public final class UserConnection implements ProxiedPlayer
sendMessage( ChatMessageType.SYSTEM, message );
}
private void sendMessage(ChatMessageType position, String message)
@Override
public void sendMessage(ChatMessageType position, BaseComponent... message)
{
unsafe().sendPacket( new Chat( message, (byte) position.ordinal() ) );
sendMessage( position, null, message );
}
@Override
public void sendMessage(ChatMessageType position, BaseComponent... message)
public void sendMessage(ChatMessageType position, BaseComponent message)
{
sendMessage( position, (UUID) null, message );
}
@Override
public void sendMessage(UUID sender, BaseComponent... message)
{
sendMessage( ChatMessageType.CHAT, sender, message );
}
@Override
public void sendMessage(UUID sender, BaseComponent message)
{
sendMessage( ChatMessageType.CHAT, sender, message );
}
private void sendMessage(ChatMessageType position, UUID sender, String message)
{
unsafe().sendPacket( new Chat( message, (byte) position.ordinal(), sender ) );
}
private void sendMessage(ChatMessageType position, UUID sender, BaseComponent... message)
{
// transform score components
message = ChatComponentTransformer.getInstance().transform( this, true, message );
@@ -458,7 +481,7 @@ public final class UserConnection implements ProxiedPlayer
// Fix by converting to a legacy message, see https://bugs.mojang.com/browse/MC-119145
if ( getPendingConnection().getVersion() <= ProtocolConstants.MINECRAFT_1_10 )
{
sendMessage( position, ComponentSerializer.toString( new TextComponent( BaseComponent.toLegacyText( message ) ) ) );
sendMessage( position, sender, ComponentSerializer.toString( new TextComponent( BaseComponent.toLegacyText( message ) ) ) );
} else
{
net.md_5.bungee.protocol.packet.Title title = new net.md_5.bungee.protocol.packet.Title();
@@ -468,22 +491,7 @@ public final class UserConnection implements ProxiedPlayer
}
} else
{
sendMessage( position, ComponentSerializer.toString( message ) );
}
}
@Override
public void sendMessage(ChatMessageType position, BaseComponent message)
{
message = ChatComponentTransformer.getInstance().transform( this, true, message )[0];
// Action bar doesn't display the new JSON formattings, legacy works - send it using this for now
if ( position == ChatMessageType.ACTION_BAR )
{
sendMessage( position, ComponentSerializer.toString( new TextComponent( BaseComponent.toLegacyText( message ) ) ) );
} else
{
sendMessage( position, ComponentSerializer.toString( message ) );
sendMessage( position, sender, ComponentSerializer.toString( message ) );
}
}