diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-02-01 21:11:12 +0100 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-02-01 21:11:12 +0100 |
| commit | f00515ba2e392bd9a9ce4d5a812307a0db0b2936 (patch) | |
| tree | d687e2b505dbb755d4932595682c2614ea99f529 /MCServer | |
| parent | Simplified cWorld::FindAndDoWithPlayer() (diff) | |
| download | cuberite-f00515ba2e392bd9a9ce4d5a812307a0db0b2936.tar cuberite-f00515ba2e392bd9a9ce4d5a812307a0db0b2936.tar.gz cuberite-f00515ba2e392bd9a9ce4d5a812307a0db0b2936.tar.bz2 cuberite-f00515ba2e392bd9a9ce4d5a812307a0db0b2936.tar.lz cuberite-f00515ba2e392bd9a9ce4d5a812307a0db0b2936.tar.xz cuberite-f00515ba2e392bd9a9ce4d5a812307a0db0b2936.tar.zst cuberite-f00515ba2e392bd9a9ce4d5a812307a0db0b2936.zip | |
Diffstat (limited to 'MCServer')
| -rw-r--r-- | MCServer/Plugins/MagicCarpet/objects.lua | 4 | ||||
| -rw-r--r-- | MCServer/Plugins/MagicCarpet/plugin.lua | 32 |
2 files changed, 27 insertions, 9 deletions
diff --git a/MCServer/Plugins/MagicCarpet/objects.lua b/MCServer/Plugins/MagicCarpet/objects.lua index 30528cc42..7c19fc232 100644 --- a/MCServer/Plugins/MagicCarpet/objects.lua +++ b/MCServer/Plugins/MagicCarpet/objects.lua @@ -52,7 +52,7 @@ function cCarpet:new() end
function cCarpet:remove()
- local World = cRoot:Get():GetWorld()
+ local World = cRoot:Get():GetDefaultWorld()
for i, fib in ipairs( self.Fibers ) do
local x = self.Location.x + fib.x
local y = self.Location.y + fib.y
@@ -66,7 +66,7 @@ function cCarpet:remove() end
function cCarpet:draw()
- local World = cRoot:Get():GetWorld()
+ local World = cRoot:Get():GetDefaultWorld()
for i, fib in ipairs( self.Fibers ) do
local x = self.Location.x + fib.x
local y = self.Location.y + fib.y
diff --git a/MCServer/Plugins/MagicCarpet/plugin.lua b/MCServer/Plugins/MagicCarpet/plugin.lua index 22604c9d9..2c9fb9160 100644 --- a/MCServer/Plugins/MagicCarpet/plugin.lua +++ b/MCServer/Plugins/MagicCarpet/plugin.lua @@ -8,16 +8,19 @@ function Initialize( Plugin ) Plugin:SetVersion( 1 )
PluginManager = cRoot:Get():GetPluginManager()
- PluginManager:AddHook( Plugin, cPluginManager.E_PLUGIN_PLAYER_MOVE)
- PluginManager:AddHook( Plugin, cPluginManager.E_PLUGIN_DISCONNECT)
+ PluginManager:AddHook(Plugin, cPluginManager.HOOK_PLAYER_MOVING)
+ PluginManager:AddHook(Plugin, cPluginManager.HOOK_DISCONNECT)
- Plugin:AddCommand("/mc", " - Spawns a magical carpet!", "magiccarpet")
- Plugin:BindCommand( "/mc", "magiccarpet", HandleCarpetCommand )
+ PluginManager:BindCommand("/mc", "magiccarpet", HandleCarpetCommand, " - Spawns a magical carpet");
Log( "Initialized " .. Plugin:GetName() .. " v." .. Plugin:GetVersion() )
return true
end
+
+
+
+
function OnDisable()
Log( PLUGIN:GetName() .. " v." .. PLUGIN:GetVersion() .. " is shutting down..." )
for i, Carpet in pairs( Carpets ) do
@@ -25,6 +28,10 @@ function OnDisable() end
end
+
+
+
+
function HandleCarpetCommand( Split, Player )
Carpet = Carpets[ Player ]
if( Carpet == nil ) then
@@ -39,6 +46,10 @@ function HandleCarpetCommand( Split, Player ) return true
end
+
+
+
+
function OnDisconnect( Reason, Player )
local Carpet = Carpets[ Player ]
if( Carpet ~= nil ) then
@@ -47,14 +58,18 @@ function OnDisconnect( Reason, Player ) Carpets[ Player ] = nil
end
-function OnPlayerMove( Player )
+
+
+
+
+function OnPlayerMoving(Player)
local Carpet = Carpets[ Player ]
if( Carpet == nil ) then
return
end
if( Player:GetPitch() == 90 ) then
- Carpet:moveTo( cLocation:new( Player:GetPosX(), Player:GetPosY()-1, Player:GetPosZ() ) )
+ Carpet:moveTo( cLocation:new( Player:GetPosX(), Player:GetPosY() - 1, Player:GetPosZ() ) )
else
if( Player:GetPosY() < Carpet:getY() ) then
LOGINFO("Fell tru mc!")
@@ -62,4 +77,7 @@ function OnPlayerMove( Player ) end
Carpet:moveTo( cLocation:new( Player:GetPosX(), Player:GetPosY(), Player:GetPosZ() ) )
end
-end
\ No newline at end of file +end
+
+
+
|