Merge branch 'master' into experimental

This commit is contained in:
Bernhard Bonigl committed 2014-12-04 19:26:11 +01:00
commit a1bde95c36
4 files changed
+15 -4

No files matched your search

@@ -104,7 +104,7 @@ public class ArmorControls {
private void checkKeys() {
for (KeyBinding key : this.keys) {
if (this.isKeyActive(key.getKeyCode())) {
if (key != null && this.isKeyActive(key.getKeyCode())) {
this.keyPressed(key);
}
}