summaryrefslogtreecommitdiffstats
path: root/Android/jni/app-android.cpp
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2013-12-24 17:20:55 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2013-12-24 17:20:55 +0100
commit9e5e4156747f308ff3bc5da4b14a1c5dd4d7fca5 (patch)
tree2fbb60615fa5f1ea1d4b6378b7cf9c7c76f718b7 /Android/jni/app-android.cpp
parentMerge pull request #468 from mc-server/colourchange (diff)
parentRemoved unneeded include. (diff)
downloadcuberite-9e5e4156747f308ff3bc5da4b14a1c5dd4d7fca5.tar
cuberite-9e5e4156747f308ff3bc5da4b14a1c5dd4d7fca5.tar.gz
cuberite-9e5e4156747f308ff3bc5da4b14a1c5dd4d7fca5.tar.bz2
cuberite-9e5e4156747f308ff3bc5da4b14a1c5dd4d7fca5.tar.lz
cuberite-9e5e4156747f308ff3bc5da4b14a1c5dd4d7fca5.tar.xz
cuberite-9e5e4156747f308ff3bc5da4b14a1c5dd4d7fca5.tar.zst
cuberite-9e5e4156747f308ff3bc5da4b14a1c5dd4d7fca5.zip
Diffstat (limited to 'Android/jni/app-android.cpp')
-rw-r--r--Android/jni/app-android.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Android/jni/app-android.cpp b/Android/jni/app-android.cpp
index 197df29c4..386f1b90e 100644
--- a/Android/jni/app-android.cpp
+++ b/Android/jni/app-android.cpp
@@ -11,7 +11,7 @@
#include <assert.h>
#include "OSSupport/CriticalSection.h"
-#include "OSSupport/MakeDir.h"
+#include "OSSupport/File.h"
#include "ToJava.h"
#include "Root.h"
@@ -84,7 +84,7 @@ extern "C" void Java_com_mcserver_MCServerActivity_NativeOnCreate( JNIEnv* env,
//__android_log_print(ANDROID_LOG_ERROR,"MCServer", "%s", "Logging from C++!");
g_CriticalSection.Unlock();
- mkdir("/sdcard/mcserver", S_IRWXU | S_IRWXG | S_IRWXO);
+ cFile::CreateFolder("/sdcard/mcserver");
pRoot = new cRoot();
pRoot->Start();
@@ -105,7 +105,7 @@ extern "C" void Java_com_mcserver_MCServerActivity_NativeCleanUp( JNIEnv* env,
__android_log_print(ANDROID_LOG_ERROR,"MCServer", "pRoot: %p", pRoot);
if( pRoot != NULL )
{
- pRoot->ExecuteConsoleCommand("stop");
+ pRoot->QueueExecuteConsoleCommand("stop");
}
}
@@ -124,7 +124,7 @@ extern "C" jint Java_com_mcserver_MCServerActivity_NativeGetWebAdminPort( JNIEnv
{
if( pRoot != NULL && pRoot->GetWebAdmin() != NULL )
{
- return pRoot->GetWebAdmin()->GetPort();
+ return atoi(pRoot->GetWebAdmin()->GetIPv4Ports().c_str());
}
return 0;
-} \ No newline at end of file
+}