diff --git a/Minecraft.Client/Common/App_Defines.h b/Minecraft.Client/Common/App_Defines.h
index 7e96896c9..209031b9a 100644
--- a/Minecraft.Client/Common/App_Defines.h
+++ b/Minecraft.Client/Common/App_Defines.h
@@ -102,8 +102,9 @@ enum EGameHostOptionWorldSize
 #define GAMESETTING_UISIZE								0x00001800
 #define GAMESETTING_UISIZE_SPLITSCREEN					0x00006000
 #define GAMESETTING_ANIMATEDCHARACTER					0x00008000
-#define GAMESETTING_PS3EULAREAD							0x00010000
-#define GAMESETTING_PSVITANETWORKMODEADHOC				0x00020000
+#define GAMESETTING_PS3EULAREAD							0x01000000
+#define GAMESETTING_PSVITANETWORKMODEADHOC				0x02000000
+#define GAMESETTING_JAVAFLIGHTCONTROLS					0x04000000
 
 
 // defines for languages
diff --git a/Minecraft.Client/Common/Consoles_App.cpp b/Minecraft.Client/Common/Consoles_App.cpp
index 43cf73e15..7e934a172 100644
--- a/Minecraft.Client/Common/Consoles_App.cpp
+++ b/Minecraft.Client/Common/Consoles_App.cpp
@@ -2279,7 +2279,7 @@ void CMinecraftApp::SetGameSettings(int iPad,eGameSetting eVal,unsigned char ucV
 		}
 		break;
 	case eGameSetting_PS3_EULA_Read:
-		if((GameSettingsA[iPad]->uiBitmaskValues&GAMESETTING_PS3EULAREAD)!=(ucVal&0x01)<<16)
+		if((GameSettingsA[iPad]->uiBitmaskValues&GAMESETTING_PS3EULAREAD)!=(ucVal&0x01)<<24)
 		{
 			if(ucVal==1)
 			{
@@ -2294,7 +2294,7 @@ void CMinecraftApp::SetGameSettings(int iPad,eGameSetting eVal,unsigned char ucV
 		}
 		break;
 	case eGameSetting_PSVita_NetworkModeAdhoc:
-		if((GameSettingsA[iPad]->uiBitmaskValues&GAMESETTING_PSVITANETWORKMODEADHOC)!=(ucVal&0x01)<<17)
+		if((GameSettingsA[iPad]->uiBitmaskValues&GAMESETTING_PSVITANETWORKMODEADHOC)!=(ucVal&0x01)<<25)
 		{
 			if(ucVal==1)
 			{
@@ -2308,6 +2308,13 @@ void CMinecraftApp::SetGameSettings(int iPad,eGameSetting eVal,unsigned char ucV
 			GameSettingsA[iPad]->bSettingsChanged=true;
 		}
 		break;
+	case eGameSetting_JavaFlightControls:
+		if(ucVal==1)
+			GameSettingsA[iPad]->uiBitmaskValues|=GAMESETTING_JAVAFLIGHTCONTROLS;
+		else
+			GameSettingsA[iPad]->uiBitmaskValues&=~GAMESETTING_JAVAFLIGHTCONTROLS;
+		GameSettingsA[iPad]->bSettingsChanged=true;
+		break;
 
 	}
 }
@@ -2439,10 +2446,13 @@ unsigned char CMinecraftApp::GetGameSettings(int iPad,eGameSetting eVal)
 		return (GameSettingsA[iPad]->uiBitmaskValues&GAMESETTING_ANIMATEDCHARACTER)>>15;
 
 	case eGameSetting_PS3_EULA_Read:
-		return (GameSettingsA[iPad]->uiBitmaskValues&GAMESETTING_PS3EULAREAD)>>16;
+		return (GameSettingsA[iPad]->uiBitmaskValues&GAMESETTING_PS3EULAREAD)>>24;
 
 	case eGameSetting_PSVita_NetworkModeAdhoc:
-		return (GameSettingsA[iPad]->uiBitmaskValues&GAMESETTING_PSVITANETWORKMODEADHOC)>>17;
+		return (GameSettingsA[iPad]->uiBitmaskValues&GAMESETTING_PSVITANETWORKMODEADHOC)>>25;
+
+	case eGameSetting_JavaFlightControls:
+		return (GameSettingsA[iPad]->uiBitmaskValues&GAMESETTING_JAVAFLIGHTCONTROLS)?1:0;
 
 	}
 	return 0;