Revert "simplified event message handling logic in ChatMessagesListener"
				
					
				
			This reverts commit db13a9f0a2.
			
			
This commit is contained in:
		@@ -21,17 +21,18 @@ class ChatMessagesListener extends ApplianceListener<ChatMessages> {
 | 
			
		||||
    public void onPlayerChatEvent(AsyncChatEvent event) {
 | 
			
		||||
        event.renderer(
 | 
			
		||||
            (source, sourceDisplayName, message, viewer) ->
 | 
			
		||||
                Component.text()
 | 
			
		||||
                Component.text("")
 | 
			
		||||
                    .append(this.getAppliance().getReportablePlayerName(source))
 | 
			
		||||
                    .append(Component.text(" > ").color(TextColor.color(Color.GRAY.asRGB())))
 | 
			
		||||
                    .append(message).color(TextColor.color(Color.SILVER.asRGB()))
 | 
			
		||||
                    .build()
 | 
			
		||||
        );
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @EventHandler(priority = EventPriority.HIGH)
 | 
			
		||||
    public void onPlayerJoin(PlayerJoinEvent event) {
 | 
			
		||||
        if(event.joinMessage() == null) return;
 | 
			
		||||
        boolean wasHidden = event.joinMessage() == null;
 | 
			
		||||
        event.joinMessage(null);
 | 
			
		||||
        if(wasHidden) return;
 | 
			
		||||
        IteratorUtil.onlinePlayers(player -> {
 | 
			
		||||
            if(!Settings.instance().getSetting(player, Settings.Key.ShowJoinAndLeaveMessages, Boolean.class)) return;
 | 
			
		||||
            player.sendMessage(
 | 
			
		||||
@@ -44,7 +45,9 @@ class ChatMessagesListener extends ApplianceListener<ChatMessages> {
 | 
			
		||||
 | 
			
		||||
    @EventHandler
 | 
			
		||||
    public void onPlayerLeave(PlayerQuitEvent event) {
 | 
			
		||||
        if(event.quitMessage() == null) return;
 | 
			
		||||
        boolean wasHidden = event.quitMessage() == null;
 | 
			
		||||
        event.quitMessage(null);
 | 
			
		||||
        if(wasHidden) return;
 | 
			
		||||
        IteratorUtil.onlinePlayers(player -> {
 | 
			
		||||
            if(!Settings.instance().getSetting(player, Settings.Key.ShowJoinAndLeaveMessages, Boolean.class)) return;
 | 
			
		||||
            player.sendMessage(
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user