Skip to content

Commit

Permalink
Fix keybind issue from iChunUtil and Minecraft binds.
Browse files Browse the repository at this point in the history
  • Loading branch information
iChun committed Aug 6, 2014
1 parent f189319 commit 24b2cde
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/main/java/morph/common/core/EventHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ else if(event.keyBind.equals(Morph.config.getKeyBind("keySelectorLeft")) || even
}
}
}
else if(event.keyBind.equals(Morph.config.getKeyBind("keySelectorSelect")) || event.keyBind.keyIndex == mc.gameSettings.keyBindAttack.getKeyCode())
else if(event.keyBind.equals(Morph.config.getKeyBind("keySelectorSelect")) || (event.keyBind.keyIndex == mc.gameSettings.keyBindAttack.getKeyCode() && event.keyBind.isMinecraftBind()))
{
if(Morph.proxy.tickHandlerClient.selectorShow)
{
Expand Down Expand Up @@ -883,7 +883,7 @@ else if(Morph.proxy.tickHandlerClient.radialShow)
Morph.proxy.tickHandlerClient.radialShow = false;
}
}
else if(event.keyBind.equals(Morph.config.getKeyBind("keySelectorCancel")) || event.keyBind.keyIndex == mc.gameSettings.keyBindUseItem.getKeyCode())
else if(event.keyBind.equals(Morph.config.getKeyBind("keySelectorCancel")) || (event.keyBind.keyIndex == mc.gameSettings.keyBindUseItem.getKeyCode() && event.keyBind.isMinecraftBind()))
{
if(Morph.proxy.tickHandlerClient.selectorShow)
{
Expand Down

0 comments on commit 24b2cde

Please sign in to comment.