summaryrefslogtreecommitdiffstats
path: root/MCServer
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-02-10 21:13:22 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-02-10 21:13:22 +0100
commit0cf1c1d91d97efeb968382bc95b3a8e9a836496f (patch)
treea6bfe19d8e3afcc3657a239f2857ff24e1dcb7ad /MCServer
parentMerge branch 'master' into playerimprovements (diff)
downloadcuberite-0cf1c1d91d97efeb968382bc95b3a8e9a836496f.tar
cuberite-0cf1c1d91d97efeb968382bc95b3a8e9a836496f.tar.gz
cuberite-0cf1c1d91d97efeb968382bc95b3a8e9a836496f.tar.bz2
cuberite-0cf1c1d91d97efeb968382bc95b3a8e9a836496f.tar.lz
cuberite-0cf1c1d91d97efeb968382bc95b3a8e9a836496f.tar.xz
cuberite-0cf1c1d91d97efeb968382bc95b3a8e9a836496f.tar.zst
cuberite-0cf1c1d91d97efeb968382bc95b3a8e9a836496f.zip
Diffstat (limited to '')
m---------MCServer/Plugins/Core0
-rw-r--r--MCServer/Plugins/MagicCarpet/coremessaging.lua19
-rw-r--r--MCServer/Plugins/MagicCarpet/plugin.lua8
3 files changed, 4 insertions, 23 deletions
diff --git a/MCServer/Plugins/Core b/MCServer/Plugins/Core
-Subproject 7f97e93ef25616673e8342b7919d9b5914e1327
+Subproject 8ddc8a9d027a9471c72270ec82cc618069710fa
diff --git a/MCServer/Plugins/MagicCarpet/coremessaging.lua b/MCServer/Plugins/MagicCarpet/coremessaging.lua
deleted file mode 100644
index 9fb2c0db1..000000000
--- a/MCServer/Plugins/MagicCarpet/coremessaging.lua
+++ /dev/null
@@ -1,19 +0,0 @@
-Core = cPluginManager:Get():GetPlugin("Core")
-
-function SendMessage(a_Player, a_Message)
- if (Core ~= nil) then
- Core:Call("SendMessage", a_Player, a_Message)
- end
-end
-
-function SendMessageSuccess(a_Player, a_Message)
- if (Core ~= nil) then
- Core:Call("SendMessageSuccess", a_Player, a_Message)
- end
-end
-
-function SendMessageFailure(a_Player, a_Message)
- if (Core ~= nil) then
- Core:Call("SendMessageFailure", a_Player, a_Message)
- end
-end
diff --git a/MCServer/Plugins/MagicCarpet/plugin.lua b/MCServer/Plugins/MagicCarpet/plugin.lua
index b05816e48..417ea0e02 100644
--- a/MCServer/Plugins/MagicCarpet/plugin.lua
+++ b/MCServer/Plugins/MagicCarpet/plugin.lua
@@ -6,7 +6,7 @@ function Initialize( Plugin )
Plugin:SetVersion( 2 )
cPluginManager.AddHook(cPluginManager.HOOK_PLAYER_MOVING, OnPlayerMoving)
- cPluginManager.AddHook(cPluginManager.HOOK_DISCONNECT, OnDisconnect)
+ cPluginManager.AddHook(cPluginManager.HOOK_PLAYER_DESTROYED, OnDisconnect)
local PluginManager = cPluginManager:Get()
PluginManager:BindCommand("/mc", "magiccarpet", HandleCarpetCommand, " - Spawns a magical carpet");
@@ -37,12 +37,12 @@ function HandleCarpetCommand( Split, Player )
if( Carpet == nil ) then
Carpets[ Player ] = cCarpet:new()
- SendMessageSuccess(Player, "You're on a magic carpet!")
- SendMessage(Player, "Look straight down to descend. Jump to ascend.")
+ Player:SendMessageSuccess("You're on a magic carpet!")
+ Player:SendMessageInfo("Look straight down to descend. Jump to ascend.")
else
Carpet:remove()
Carpets[ Player ] = nil
- SendMessageSuccess(Player, "The carpet vanished!")
+ Player:SendMessageSuccess("The carpet vanished!")
end
return true