From c4188ca09d1b0f1ac2f5da9fb5da03d864efccb3 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Mon, 29 Jul 2013 14:18:35 +0100 Subject: Another partial redesign of WebAdmin Done due to strong persuasion from FakeTruth and xoft. --- MCServer/webadmin/template.html | 71 ++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 47 deletions(-) diff --git a/MCServer/webadmin/template.html b/MCServer/webadmin/template.html index b2e3fa1eb..4636959f2 100644 --- a/MCServer/webadmin/template.html +++ b/MCServer/webadmin/template.html @@ -2,16 +2,14 @@ {TITLE} | {PLUGIN_NAME} - - - + + -
+ Login: {USERNAME}
- -

MCServer, the Minecraft Server coded in C++!

+
-

Welcome {USERNAME}, to the Control Panel! :D

{CONTENT}

MCServer is using {MEM}MB of memory, with {NUMCHUNKS} chunks loaded.

Web Design by Tiger

-- cgit v1.2.3 From 25abfb9476cac32d8db59b73f8bdfc60ba85ff79 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Tue, 30 Jul 2013 22:26:50 +0100 Subject: Updated MagicCarpet to use new API [SEE DESC] Fixed non-teleportation upon falling through carpet due to use of deprecated function. Fixed spam of console upon falling through carpet. Added descriptive upon-enable message. --- MCServer/Plugins/MagicCarpet/plugin.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MCServer/Plugins/MagicCarpet/plugin.lua b/MCServer/Plugins/MagicCarpet/plugin.lua index b78c45f14..2fe5ba84f 100644 --- a/MCServer/Plugins/MagicCarpet/plugin.lua +++ b/MCServer/Plugins/MagicCarpet/plugin.lua @@ -37,6 +37,7 @@ function HandleCarpetCommand( Split, Player ) if( Carpet == nil ) then Carpets[ Player ] = cCarpet:new() Player:SendMessage("You're on a magic carpet!" ) + Player:SendMessage("Look straight down to descend. Jump to ascend!" ) else Carpet:remove() Carpets[ Player ] = nil @@ -72,8 +73,7 @@ function OnPlayerMoving(Player) Carpet:moveTo( cLocation:new( Player:GetPosX(), Player:GetPosY() - 1, Player:GetPosZ() ) ) else if( Player:GetPosY() < Carpet:getY() ) then - LOGINFO("Fell tru mc!") - Player:TeleportTo( Player:GetPosX(), Carpet:getY(), Player:GetPosZ() ) + Player:TeleportToCoords(Player:GetPosX(), Carpet:getY(), Player:GetPosZ()) end Carpet:moveTo( cLocation:new( Player:GetPosX(), Player:GetPosY(), Player:GetPosZ() ) ) end -- cgit v1.2.3