summaryrefslogtreecommitdiffstats
path: root/MCServer/Plugins/Debuggers
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--MCServer/Plugins/Debuggers/Debuggers.lua63
-rw-r--r--MCServer/Plugins/Debuggers/Info.lua16
2 files changed, 62 insertions, 17 deletions
diff --git a/MCServer/Plugins/Debuggers/Debuggers.lua b/MCServer/Plugins/Debuggers/Debuggers.lua
index a46072324..c8069a411 100644
--- a/MCServer/Plugins/Debuggers/Debuggers.lua
+++ b/MCServer/Plugins/Debuggers/Debuggers.lua
@@ -25,13 +25,14 @@ function Initialize(Plugin)
PM:AddHook(cPluginManager.HOOK_PLAYER_RIGHT_CLICKING_ENTITY, OnPlayerRightClickingEntity);
PM:AddHook(cPluginManager.HOOK_WORLD_TICK, OnWorldTick);
PM:AddHook(cPluginManager.HOOK_PLUGINS_LOADED, OnPluginsLoaded);
- PM:AddHook(cPluginManager.HOOK_PLUGIN_MESSAGE, OnPluginMessage);
PM:AddHook(cPluginManager.HOOK_PLAYER_JOINED, OnPlayerJoined);
PM:AddHook(cPluginManager.HOOK_PROJECTILE_HIT_BLOCK, OnProjectileHitBlock);
PM:AddHook(cPluginManager.HOOK_CHUNK_UNLOADING, OnChunkUnloading);
PM:AddHook(cPluginManager.HOOK_WORLD_STARTED, OnWorldStarted);
PM:AddHook(cPluginManager.HOOK_PROJECTILE_HIT_BLOCK, OnProjectileHitBlock);
+ -- _X: Disabled WECUI manipulation:
+ -- PM:AddHook(cPluginManager.HOOK_PLUGIN_MESSAGE, OnPluginMessage);
-- _X: Disabled so that the normal operation doesn't interfere with anything
-- PM:AddHook(cPluginManager.HOOK_CHUNK_GENERATED, OnChunkGenerated);
@@ -1476,7 +1477,7 @@ function HandleWESel(a_Split, a_Player)
SelCuboid:Expand(NumBlocks, NumBlocks, 0, 0, NumBlocks, NumBlocks)
-- Set the selection:
- local IsSuccess = cPluginManager:CallPlugin("WorldEdit", "SetPlayerCuboidSelection", a_Player, SelCuboid)
+ IsSuccess = cPluginManager:CallPlugin("WorldEdit", "SetPlayerCuboidSelection", a_Player, SelCuboid)
if not(IsSuccess) then
a_Player:SendMessage(cCompositeChat():SetMessageType(mtFailure):AddTextPart("Cannot adjust selection, WorldEdit reported failure while setting new selection"))
return true
@@ -1606,17 +1607,36 @@ end
-function HandleConsoleSchedule(a_Split)
- local prev = os.clock()
- LOG("Scheduling a task for 2 seconds in the future (current os.clock is " .. prev .. ")")
- cRoot:Get():GetDefaultWorld():ScheduleTask(40,
- function ()
- local current = os.clock()
- local diff = current - prev
- LOG("Scheduled function is called. Current os.clock is " .. current .. ", difference is " .. diff .. ")")
- end
- )
- return true, "Task scheduled"
+-- List of hashing functions to test:
+local HashFunctions =
+{
+ {"md5", md5 },
+ {"cCryptoHash.md5", cCryptoHash.md5 },
+ {"cCryptoHash.md5HexString", cCryptoHash.md5HexString },
+ {"cCryptoHash.sha1", cCryptoHash.sha1 },
+ {"cCryptoHash.sha1HexString", cCryptoHash.sha1HexString },
+}
+
+-- List of strings to try hashing:
+local HashExamples =
+{
+ "",
+ "\0",
+ "test",
+}
+
+function HandleConsoleHash(a_Split)
+ for _, str in ipairs(HashExamples) do
+ LOG("Hashing string \"" .. str .. "\":")
+ for _, hash in ipairs(HashFunctions) do
+ if not(hash[2]) then
+ LOG("Hash function " .. hash[1] .. " doesn't exist in the API!")
+ else
+ LOG(hash[1] .. "() = " .. hash[2](str))
+ end
+ end -- for hash - HashFunctions[]
+ end -- for str - HashExamples[]
+ return true
end
@@ -1704,3 +1724,20 @@ end
+
+function HandleConsoleSchedule(a_Split)
+ local prev = os.clock()
+ LOG("Scheduling a task for 2 seconds in the future (current os.clock is " .. prev .. ")")
+ cRoot:Get():GetDefaultWorld():ScheduleTask(40,
+ function ()
+ local current = os.clock()
+ local diff = current - prev
+ LOG("Scheduled function is called. Current os.clock is " .. current .. ", difference is " .. diff .. ")")
+ end
+ )
+ return true, "Task scheduled"
+end
+
+
+
+
diff --git a/MCServer/Plugins/Debuggers/Info.lua b/MCServer/Plugins/Debuggers/Info.lua
index b96ef3de5..63a4b9177 100644
--- a/MCServer/Plugins/Debuggers/Info.lua
+++ b/MCServer/Plugins/Debuggers/Info.lua
@@ -200,21 +200,29 @@ g_PluginInfo =
ConsoleCommands =
{
- ["sched"] =
+ ["hash"] =
{
- Handler = HandleConsoleSchedule,
- HelpString = "Tests the world scheduling",
+ Handler = HandleConsoleHash,
+ HelpString = "Tests the crypto hashing functions",
},
+
["loadchunk"] =
{
Handler = HandleConsoleLoadChunk,
HelpString = "Loads the specified chunk into memory",
},
+
["preparechunk"] =
{
Handler = HandleConsolePrepareChunk,
HelpString = "Prepares the specified chunk completely (load / gen / light)",
- }
+ },
+
+ ["sched"] =
+ {
+ Handler = HandleConsoleSchedule,
+ HelpString = "Tests the world scheduling",
+ },
}, -- ConsoleCommands
} -- g_PluginInfo