From 0d0619cd458f0a7c748390f70f8576c6161daa68 Mon Sep 17 00:00:00 2001 From: 15987632 Date: Mon, 29 Apr 2019 19:33:24 -0400 Subject: [PATCH] chat message manager: don't send messages on tutorial island --- .../net/runelite/client/chat/ChatMessageManager.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java index 9cf5caead5..bc0d3bc58a 100644 --- a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java +++ b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java @@ -27,12 +27,14 @@ package net.runelite.client.chat; import com.google.common.base.MoreObjects; import com.google.common.base.Strings; import com.google.common.collect.HashMultimap; +import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; import java.awt.Color; import java.util.Arrays; import java.util.Collection; import java.util.Objects; import java.util.Queue; +import java.util.Set; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicReference; import javax.inject.Inject; @@ -41,6 +43,7 @@ import net.runelite.api.ChatLineBuffer; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; import net.runelite.api.MessageNode; +import net.runelite.api.Player; import net.runelite.api.Varbits; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ConfigChanged; @@ -56,6 +59,8 @@ import net.runelite.client.util.ColorUtil; @Singleton public class ChatMessageManager { + private static final Set TUTORIAL_ISLAND_REGIONS = ImmutableSet.of(12336, 12335, 12592, 12080, 12079, 12436); + private final Multimap colorCache = HashMultimap.create(); private final Client client; private final ChatColorConfig chatColorConfig; @@ -550,6 +555,13 @@ public class ChatMessageManager private void add(QueuedMessage message) { + // Do not send message if the player is on tutorial island + final Player player = client.getLocalPlayer(); + if (player != null && TUTORIAL_ISLAND_REGIONS.contains(player.getWorldLocation().getRegionID())) + { + return; + } + // this updates chat cycle client.addChatMessage( message.getType(),