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

Merge pull request #12048 from zeffirojoe/key-remapping-authent

Browse Source
This commit is contained in:
Jordan
2020-07-06 22:19:52 -07:00
committed by GitHub
parent 3988ef0a4e 349efebd58
commit f91fd11621
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/net/runelite/client/input/KeyManager.java
View File

@@ -145,6 +145,6 @@ public class KeyManager
return true; return true;
} }
return client.getGameState() != GameState.LOGIN_SCREEN; return client.getGameState() != GameState.LOGIN_SCREEN && client.getGameState() != GameState.LOGIN_SCREEN_AUTHENTICATOR;
} }
} }

3
runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java
View File

@@ -33,7 +33,6 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import javax.inject.Inject; import javax.inject.Inject;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.VarClientStr; import net.runelite.api.VarClientStr;
import net.runelite.client.callback.ClientThread; import net.runelite.client.callback.ClientThread;
import net.runelite.client.input.KeyListener; import net.runelite.client.input.KeyListener;
@@ -68,7 +67,7 @@ class KeyRemappingListener implements KeyListener
@Override @Override
public void keyPressed(KeyEvent e) public void keyPressed(KeyEvent e)
{ {
if (client.getGameState() == GameState.LOGIN_SCREEN || !plugin.chatboxFocused()) if (!plugin.chatboxFocused())
{ {
return; return;
} }

3
runelite-client/src/test/java/net/runelite/client/plugins/keyremapping/KeyRemappingListenerTest.java
View File

@@ -30,7 +30,6 @@ import com.google.inject.testing.fieldbinder.BoundFieldModule;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import javax.inject.Inject; import javax.inject.Inject;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.client.config.ModifierlessKeybind; import net.runelite.client.config.ModifierlessKeybind;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -64,8 +63,6 @@ public class KeyRemappingListenerTest
public void setUp() public void setUp()
{ {
Guice.createInjector(BoundFieldModule.of(this)).injectMembers(this); Guice.createInjector(BoundFieldModule.of(this)).injectMembers(this);
when(client.getGameState()).thenReturn(GameState.LOGGED_IN);
} }
@Test @Test