2 tiny bugs

jrbudda · Dec 23, 2016 · 5cfc530 · 5cfc530
1 parent 99c843e
commit 5cfc530
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/com/mtbs3d/minecrift/provider/MCOpenVR.java b/src/com/mtbs3d/minecrift/provider/MCOpenVR.java
@@ -1864,9 +1864,7 @@ private static void processControllerButtonsOculus(boolean sleeping, boolean gui
 			boolean pressedStickLeft  = controllerStateReference[LEFT_CONTROLLER].rAxis[k_EAxis_TouchPad].x  < -0.5 ;
 			boolean pressedStickDown = controllerStateReference[LEFT_CONTROLLER].rAxis[k_EAxis_TouchPad].y < -0.5 ;		
 			boolean pressedStickUp  = controllerStateReference[LEFT_CONTROLLER].rAxis[k_EAxis_TouchPad].y  > 0.5 ;
-
-
-
+
 			rtbX = controllerStateReference[LEFT_CONTROLLER].rAxis[k_EAxis_TouchPad].x;
 			rtbY = controllerStateReference[LEFT_CONTROLLER].rAxis[k_EAxis_TouchPad].y;
 
@@ -1987,7 +1985,7 @@ private static void processControllerButtonsOculus(boolean sleeping, boolean gui
 				mc.vrSettings.buttonMappings[ViveButtons.OCULUS_LEFT_STICK_TOUCH.ordinal()].unpress();
 			}
 
-			if(pressedY  && !pressedY) { //handle menu directly
+			if(pressedY && !lastpressedY) { //handle menu directly
 
 				if(pressedLHandTrigger){				
 					setKeyboardOverlayShowing(!keyboardShowing, null);			

diff --git a/src/com/mtbs3d/minecrift/provider/OpenVRPlayer.java b/src/com/mtbs3d/minecrift/provider/OpenVRPlayer.java
@@ -991,7 +991,7 @@ else if (item instanceof ItemTool ||
         		){
         	tool = true;
         }
-        else if(Reflector.forgeExists()){
+        else if(item !=null && Reflector.forgeExists()){
         	String c = item.getClass().getSuperclass().getName().toLowerCase();
         	//System.out.println(c);
         	if (c.contains("weapon") || c.contains("sword")) {