ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

keyremapping: Merge nested if statements

Browse Source
This commit is contained in:
sdburns1998
2019-07-07 15:16:15 +02:00
parent a67920956b
commit 7739448a32
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java
View File

@@ -197,13 +197,10 @@ public class KeyRemappingPlugin extends Plugin
{ {
case SCRIPT_EVENT_SET_CHATBOX_INPUT: case SCRIPT_EVENT_SET_CHATBOX_INPUT:
Widget chatboxInput = client.getWidget(WidgetInfo.CHATBOX_INPUT); Widget chatboxInput = client.getWidget(WidgetInfo.CHATBOX_INPUT);
if (chatboxInput != null) if (chatboxInput != null && chatboxFocused() && !typing)
{
if (chatboxFocused() && !typing)
{ {
chatboxInput.setText(getWaitingText()); chatboxInput.setText(getWaitingText());
} }
}
break; break;
case SCRIPT_EVENT_BLOCK_CHAT_INPUT: case SCRIPT_EVENT_BLOCK_CHAT_INPUT:
if (!typing) if (!typing)
@@ -230,16 +227,13 @@ public class KeyRemappingPlugin extends Plugin
void unlockChat() void unlockChat()
{ {
Widget chatboxInput = client.getWidget(WidgetInfo.CHATBOX_INPUT); Widget chatboxInput = client.getWidget(WidgetInfo.CHATBOX_INPUT);
if (chatboxInput != null) if (chatboxInput != null && client.getGameState() == GameState.LOGGED_IN)
{
if (client.getGameState() == GameState.LOGGED_IN)
{ {
final boolean isChatboxTransparent = client.isResized() && client.getVar(Varbits.TRANSPARENT_CHATBOX) == 1; final boolean isChatboxTransparent = client.isResized() && client.getVar(Varbits.TRANSPARENT_CHATBOX) == 1;
final Color textColor = isChatboxTransparent ? JagexColors.CHAT_TYPED_TEXT_TRANSPARENT_BACKGROUND : JagexColors.CHAT_TYPED_TEXT_OPAQUE_BACKGROUND; final Color textColor = isChatboxTransparent ? JagexColors.CHAT_TYPED_TEXT_TRANSPARENT_BACKGROUND : JagexColors.CHAT_TYPED_TEXT_OPAQUE_BACKGROUND;
chatboxInput.setText(getPlayerNameWithIcon() + ": " + ColorUtil.wrapWithColorTag(client.getVar(VarClientStr.CHATBOX_TYPED_TEXT) + "*", textColor)); chatboxInput.setText(getPlayerNameWithIcon() + ": " + ColorUtil.wrapWithColorTag(client.getVar(VarClientStr.CHATBOX_TYPED_TEXT) + "*", textColor));
} }
} }
}
private String getPlayerNameWithIcon() private String getPlayerNameWithIcon()
{ {