summaryrefslogtreecommitdiffstats
path: root/MCServer/webadmin
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-09-21 19:00:01 +0200
committermadmaxoft <github@xoft.cz>2013-09-21 19:00:01 +0200
commit6b61df3b73f5ff26f1d85c48c2b13e4c71738946 (patch)
treedb8b8f70923a3caf5380e633b7cc68adc66bbcae /MCServer/webadmin
parentFixed pickup spawning with inherited gamemode. (diff)
downloadcuberite-6b61df3b73f5ff26f1d85c48c2b13e4c71738946.tar
cuberite-6b61df3b73f5ff26f1d85c48c2b13e4c71738946.tar.gz
cuberite-6b61df3b73f5ff26f1d85c48c2b13e4c71738946.tar.bz2
cuberite-6b61df3b73f5ff26f1d85c48c2b13e4c71738946.tar.lz
cuberite-6b61df3b73f5ff26f1d85c48c2b13e4c71738946.tar.xz
cuberite-6b61df3b73f5ff26f1d85c48c2b13e4c71738946.tar.zst
cuberite-6b61df3b73f5ff26f1d85c48c2b13e4c71738946.zip
Diffstat (limited to 'MCServer/webadmin')
-rw-r--r--MCServer/webadmin/template.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/MCServer/webadmin/template.lua b/MCServer/webadmin/template.lua
index 1ab1aab88..c9fdf7148 100644
--- a/MCServer/webadmin/template.lua
+++ b/MCServer/webadmin/template.lua
@@ -58,7 +58,7 @@ function ShowPage(WebAdmin, TemplateRequest)
SiteContent = {}
local BaseURL = WebAdmin:GetBaseURL(TemplateRequest.Request.Path)
local Title = "MCServer"
- local MemoryUsage = cWebAdmin:GetMemoryUsage()
+ local MemoryUsageKiB = cWebAdmin:GetMemoryUsage()
local NumChunks = cRoot:Get():GetTotalChunkCount()
local PluginPage = WebAdmin:GetPage(TemplateRequest.Request)
local PageContent = PluginPage.Content
@@ -456,7 +456,7 @@ function ShowPage(WebAdmin, TemplateRequest)
</div>
<!-- // #containerHolder -->
- <p id="footer">MCServer is using: ]] .. MemoryUsage .. [[MB of memory; Current chunk count: ]] .. NumChunks .. [[ </p>
+ <p id="footer">MCServer is using: ]] .. MemoryUsageKiB / 1024 .. [[ MiB of memory; Current chunk count: ]] .. NumChunks .. [[ </p>
</div>
<!-- // #wrapper -->
</body>