From a171757f1afee864b7d27357b4babb0c28c50d9a Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Wed, 2 Oct 2013 22:01:01 +0100 Subject: [PATCH 1/4] MagicCarpet Fixes [SEE DESC] + Version 2! * Fixed loading plugin + Now uses Core messaging functions --- MCServer/Plugins/MagicCarpet/plugin.lua | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/MCServer/Plugins/MagicCarpet/plugin.lua b/MCServer/Plugins/MagicCarpet/plugin.lua index 27dcdf45d..bcf87d202 100644 --- a/MCServer/Plugins/MagicCarpet/plugin.lua +++ b/MCServer/Plugins/MagicCarpet/plugin.lua @@ -1,18 +1,18 @@ -local PLUGIN = {} local Carpets = {} function Initialize( Plugin ) PLUGIN = Plugin Plugin:SetName( "MagicCarpet" ) - Plugin:SetVersion( 1 ) + Plugin:SetVersion( 2 ) cPluginManager.AddHook(cPluginManager.HOOK_PLAYER_MOVING, OnPlayerMoving) cPluginManager.AddHook(cPluginManager.HOOK_DISCONNECT, OnDisconnect) + local PluginManager = cPluginManager:Get() PluginManager:BindCommand("/mc", "magiccarpet", HandleCarpetCommand, " - Spawns a magical carpet"); - LOG( "Initialized " .. Plugin:GetName() .. " v." .. Plugin:GetVersion() ) + LOG( "Initialised " .. Plugin:GetName() .. " v." .. Plugin:GetVersion() ) return true end @@ -33,14 +33,17 @@ end function HandleCarpetCommand( Split, Player ) Carpet = Carpets[ Player ] + PluginManager = cPluginManager:Get() + local Core = PluginManager:GetPlugin("Core") + if( Carpet == nil ) then Carpets[ Player ] = cCarpet:new() - Player:SendMessage(cChatColor.Green .. "[INFO] " .. cChatColor.White .. "You're on a magic carpet!" ) - Player:SendMessage(cChatColor.Yellow .. "[INFO] " .. cChatColor.White .. "Look straight down to descend. Jump to ascend!" ) + Core:Call("SendMessageSuccess", Player, "You're on a magic carpet!") + Core:Call("SendMessage", Player, "Look straight down to descend. Jump to ascend.") else Carpet:remove() Carpets[ Player ] = nil - Player:SendMessage(cChatColor.Green .. "[INFO] " .. cChatColor.White .. "The carpet vanished!" ) + Core:Call("SendMessage", Player, "The carpet vanished!") end return true From 55e6963107866b1c76689ae39cd965d6446984eb Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Wed, 2 Oct 2013 22:05:26 +0100 Subject: [PATCH 2/4] Fixed discrepancy --- MCServer/Plugins/MagicCarpet/plugin.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MCServer/Plugins/MagicCarpet/plugin.lua b/MCServer/Plugins/MagicCarpet/plugin.lua index bcf87d202..219956984 100644 --- a/MCServer/Plugins/MagicCarpet/plugin.lua +++ b/MCServer/Plugins/MagicCarpet/plugin.lua @@ -43,7 +43,7 @@ function HandleCarpetCommand( Split, Player ) else Carpet:remove() Carpets[ Player ] = nil - Core:Call("SendMessage", Player, "The carpet vanished!") + Core:Call("SendMessageSuccess", Player, "The carpet vanished!") end return true From 914a318b8eab1d5cf913d3707a7af244b58a9bfb Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Fri, 4 Oct 2013 22:22:01 +0100 Subject: [PATCH 3/4] Made MagicCarpet more magical! --- .../Plugins/MagicCarpet/coremessaging.lua | 28 +++++++++++++++++++ MCServer/Plugins/MagicCarpet/plugin.lua | 10 +++---- source/Server.cpp | 2 +- 3 files changed, 33 insertions(+), 7 deletions(-) create mode 100644 MCServer/Plugins/MagicCarpet/coremessaging.lua diff --git a/MCServer/Plugins/MagicCarpet/coremessaging.lua b/MCServer/Plugins/MagicCarpet/coremessaging.lua new file mode 100644 index 000000000..1677e8940 --- /dev/null +++ b/MCServer/Plugins/MagicCarpet/coremessaging.lua @@ -0,0 +1,28 @@ +IniFile = cIniFile( "settings.ini" ) +IniFile:ReadFile() +UsePrefixes = IniFile:GetValueSet( "Messaging", "Prefixes", "true" ) +IniFile:WriteFile() + +function SendMessage(a_Player, a_Message) + if (UsePrefixes) then + a_Player:SendMessage(cChatColor.Yellow .. "[INFO] " .. cChatColor.White .. a_Message) + else + a_Player:SendMessage(cChatColor.Yellow .. a_Message) + end +end + +function SendMessageSuccess(a_Player, a_Message) + if (UsePrefixes) then + a_Player:SendMessage(cChatColor.Green .. "[INFO] " .. cChatColor.White .. a_Message) + else + a_Player:SendMessage(cChatColor.Green .. a_Message) + end +end + +function SendMessageFailure(a_Player, a_Message) + if (UsePrefixes) then + a_Player:SendMessage(cChatColor.Red .. "[INFO] " .. cChatColor.White .. a_Message) + else + a_Player:SendMessage(cChatColor.Red .. a_Message) + end +end \ No newline at end of file diff --git a/MCServer/Plugins/MagicCarpet/plugin.lua b/MCServer/Plugins/MagicCarpet/plugin.lua index 219956984..4a2097351 100644 --- a/MCServer/Plugins/MagicCarpet/plugin.lua +++ b/MCServer/Plugins/MagicCarpet/plugin.lua @@ -33,17 +33,15 @@ end function HandleCarpetCommand( Split, Player ) Carpet = Carpets[ Player ] - PluginManager = cPluginManager:Get() - local Core = PluginManager:GetPlugin("Core") - + if( Carpet == nil ) then Carpets[ Player ] = cCarpet:new() - Core:Call("SendMessageSuccess", Player, "You're on a magic carpet!") - Core:Call("SendMessage", Player, "Look straight down to descend. Jump to ascend.") + SendMessageSuccess(Player, "You're on a magic carpet!") + SendMessage(Player, "Look straight down to descend. Jump to ascend.") else Carpet:remove() Carpets[ Player ] = nil - Core:Call("SendMessageSuccess", Player, "The carpet vanished!") + SendMessageSuccess(Player, "The carpet vanished!") end return true diff --git a/source/Server.cpp b/source/Server.cpp index dd18f8d3d..5e65213fd 100644 --- a/source/Server.cpp +++ b/source/Server.cpp @@ -321,7 +321,7 @@ void cServer::OnConnectionAccepted(cSocket & a_Socket) return; } - LOG("Client \"%s\" connected!", ClientIP.c_str()); + LOGD("Client \"%s\" connected!", ClientIP.c_str()); cClientHandle * NewHandle = new cClientHandle(&a_Socket, m_ClientViewDistance); if (!m_SocketThreads.AddClient(a_Socket, NewHandle)) From 110c633c5fc17aa4d3a3b92f84ee93f9017d179b Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Tue, 8 Oct 2013 20:53:37 +0100 Subject: [PATCH 4/4] Some additional changes * Revert to Core:Call() - Removed variable --- .../Plugins/MagicCarpet/coremessaging.lua | 23 ++++++------------- MCServer/Plugins/MagicCarpet/plugin.lua | 2 -- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/MCServer/Plugins/MagicCarpet/coremessaging.lua b/MCServer/Plugins/MagicCarpet/coremessaging.lua index 1677e8940..acf21df5b 100644 --- a/MCServer/Plugins/MagicCarpet/coremessaging.lua +++ b/MCServer/Plugins/MagicCarpet/coremessaging.lua @@ -1,28 +1,19 @@ -IniFile = cIniFile( "settings.ini" ) -IniFile:ReadFile() -UsePrefixes = IniFile:GetValueSet( "Messaging", "Prefixes", "true" ) -IniFile:WriteFile() +Core = cPluginManager:Get():GetPlugin("Core") function SendMessage(a_Player, a_Message) - if (UsePrefixes) then - a_Player:SendMessage(cChatColor.Yellow .. "[INFO] " .. cChatColor.White .. a_Message) - else - a_Player:SendMessage(cChatColor.Yellow .. a_Message) + if (Core ~= nil) then + Core:Call("SendMessage", a_Player, a_Message) end end function SendMessageSuccess(a_Player, a_Message) - if (UsePrefixes) then - a_Player:SendMessage(cChatColor.Green .. "[INFO] " .. cChatColor.White .. a_Message) - else - a_Player:SendMessage(cChatColor.Green .. a_Message) + if (Core ~= nil) then + Core:Call("SendMessageSuccess", a_Player, a_Message) end end function SendMessageFailure(a_Player, a_Message) - if (UsePrefixes) then - a_Player:SendMessage(cChatColor.Red .. "[INFO] " .. cChatColor.White .. a_Message) - else - a_Player:SendMessage(cChatColor.Red .. a_Message) + if (Core ~= nil) then + Core:Call("SendMessageFailure", a_Player, a_Message) end end \ No newline at end of file diff --git a/MCServer/Plugins/MagicCarpet/plugin.lua b/MCServer/Plugins/MagicCarpet/plugin.lua index 4a2097351..27efdab32 100644 --- a/MCServer/Plugins/MagicCarpet/plugin.lua +++ b/MCServer/Plugins/MagicCarpet/plugin.lua @@ -1,8 +1,6 @@ local Carpets = {} function Initialize( Plugin ) - PLUGIN = Plugin - Plugin:SetName( "MagicCarpet" ) Plugin:SetVersion( 2 )