LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v1.2.0: fixed keyblocker triggering in some cases when it shouldn't

Browse Source
This commit is contained in:
Evan Debenham 2022-02-16 13:26:21 -05:00
parent d7aef5bd39
commit 776661e739
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/InventoryPane.java
View File

@ -66,7 +66,7 @@ public class InventoryPane extends Component {
//used to prevent clicks through the BG normally, or to cancel selectors if they're enabled //used to prevent clicks through the BG normally, or to cancel selectors if they're enabled
private PointerArea blocker; private PointerArea blocker;
private Signal.Listener keyBlocker; private Signal.Listener<KeyEvent> keyBlocker;
private static InventoryPane instance; private static InventoryPane instance;
@ -107,6 +107,7 @@ public class InventoryPane extends Component {
@Override @Override
public synchronized void destroy() { public synchronized void destroy() {
KeyEvent.removeKeyListener(keyBlocker);
super.destroy(); super.destroy();
if (instance == this) instance = null; if (instance == this) instance = null;
} }
@ -139,7 +140,7 @@ public class InventoryPane extends Component {
keyBlocker = new Signal.Listener<KeyEvent>(){ keyBlocker = new Signal.Listener<KeyEvent>(){
@Override @Override
public boolean onSignal(KeyEvent keyEvent) { public boolean onSignal(KeyEvent keyEvent) {
if (keyEvent.pressed && isSelecting() if (keyEvent.pressed && isSelecting() && InventoryPane.this.visible
&& KeyBindings.getActionForKey(keyEvent) != SPDAction.BAG_1 && KeyBindings.getActionForKey(keyEvent) != SPDAction.BAG_1
&& KeyBindings.getActionForKey(keyEvent) != SPDAction.BAG_2 && KeyBindings.getActionForKey(keyEvent) != SPDAction.BAG_2
&& KeyBindings.getActionForKey(keyEvent) != SPDAction.BAG_3 && KeyBindings.getActionForKey(keyEvent) != SPDAction.BAG_3