flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge branch 'master' into ChunkStay

Browse Source
This commit is contained in:
madmaxoft 2014-02-11 08:50:30 +01:00
commit 8a8997cc38
4 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MCServer/Plugins/Core

@ -1 +1 @@
Subproject commit 7f97e93ef25616673e8342b7919d9b5914e1327e Subproject commit 8ddc8a9d027a9471c72270ec82cc618069710faa

19
MCServer/Plugins/MagicCarpet/coremessaging.lua
View File

@ -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

8
MCServer/Plugins/MagicCarpet/plugin.lua
View File

@ -6,7 +6,7 @@ function Initialize( Plugin )
Plugin:SetVersion( 2 ) Plugin:SetVersion( 2 )
cPluginManager.AddHook(cPluginManager.HOOK_PLAYER_MOVING, OnPlayerMoving) cPluginManager.AddHook(cPluginManager.HOOK_PLAYER_MOVING, OnPlayerMoving)
cPluginManager.AddHook(cPluginManager.HOOK_DISCONNECT, OnDisconnect) cPluginManager.AddHook(cPluginManager.HOOK_PLAYER_DESTROYED, OnDisconnect)
local PluginManager = cPluginManager:Get() local PluginManager = cPluginManager:Get()
PluginManager:BindCommand("/mc", "magiccarpet", HandleCarpetCommand, " - Spawns a magical carpet"); PluginManager:BindCommand("/mc", "magiccarpet", HandleCarpetCommand, " - Spawns a magical carpet");
@ -37,12 +37,12 @@ function HandleCarpetCommand( Split, Player )
if( Carpet == nil ) then if( Carpet == nil ) then
Carpets[ Player ] = cCarpet:new() Carpets[ Player ] = cCarpet:new()
SendMessageSuccess(Player, "You're on a magic carpet!") Player:SendMessageSuccess("You're on a magic carpet!")
SendMessage(Player, "Look straight down to descend. Jump to ascend.") Player:SendMessageInfo("Look straight down to descend. Jump to ascend.")
else else
Carpet:remove() Carpet:remove()
Carpets[ Player ] = nil Carpets[ Player ] = nil
SendMessageSuccess(Player, "The carpet vanished!") Player:SendMessageSuccess("The carpet vanished!")
end end
return true return true

3
src/Items/ItemBoat.h
View File

@ -1,4 +1,3 @@
// ItemBoat.h // ItemBoat.h
// Declares the various boat ItemHandlers // Declares the various boat ItemHandlers
@ -31,7 +30,7 @@ public:
virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override
{ {
if (a_Dir != BLOCK_FACE_YM || a_Dir != BLOCK_FACE_NONE) if ((a_Dir != BLOCK_FACE_YM) && (a_Dir != BLOCK_FACE_NONE))
{ {
return false; return false;
} }