diff options
author | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-11 00:01:35 +0100 |
---|---|---|
committer | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-11 00:01:35 +0100 |
commit | dd633d5a947771cd37f8a853ceb44660752a7e3c (patch) | |
tree | 0141233cb7025eaca681513b6670b325c76f57c1 /MCServer | |
parent | added tolua++ command and removed stackwalker from build (diff) | |
parent | Merge branch 'master' of https://github.com/mc-server/MCServer (diff) | |
download | cuberite-dd633d5a947771cd37f8a853ceb44660752a7e3c.tar cuberite-dd633d5a947771cd37f8a853ceb44660752a7e3c.tar.gz cuberite-dd633d5a947771cd37f8a853ceb44660752a7e3c.tar.bz2 cuberite-dd633d5a947771cd37f8a853ceb44660752a7e3c.tar.lz cuberite-dd633d5a947771cd37f8a853ceb44660752a7e3c.tar.xz cuberite-dd633d5a947771cd37f8a853ceb44660752a7e3c.tar.zst cuberite-dd633d5a947771cd37f8a853ceb44660752a7e3c.zip |
Diffstat (limited to 'MCServer')
-rw-r--r-- | MCServer/Plugins/APIDump/APIDesc.lua | 11 | ||||
-rw-r--r-- | MCServer/Plugins/APIDump/Hooks/OnWorldStarted.lua | 24 | ||||
m--------- | MCServer/Plugins/Core | 0 | ||||
-rw-r--r-- | MCServer/banned.example.ini | 3 | ||||
-rw-r--r-- | MCServer/groups.example.ini | 17 | ||||
-rw-r--r-- | MCServer/users.example.ini | 23 | ||||
-rw-r--r-- | MCServer/whitelist.example.ini | 6 |
7 files changed, 35 insertions, 49 deletions
diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua index 75d5c011f..b7dddec05 100644 --- a/MCServer/Plugins/APIDump/APIDesc.lua +++ b/MCServer/Plugins/APIDump/APIDesc.lua @@ -1862,6 +1862,17 @@ end }, }, -- cServer + cTNTEntity = + { + Desc = "This class manages a TNT entity.", + Functions = + { + GetCounterTime = { Return = "number", Notes = "Returns the time until the entity explodes." }, + GetMaxFuseTime = { Return = "number", Notes = "Returns how long the fuse was." }, + }, + Inherits = "cEntity", + }, + cTracer = { Desc = [[ diff --git a/MCServer/Plugins/APIDump/Hooks/OnWorldStarted.lua b/MCServer/Plugins/APIDump/Hooks/OnWorldStarted.lua new file mode 100644 index 000000000..61e3de86e --- /dev/null +++ b/MCServer/Plugins/APIDump/Hooks/OnWorldStarted.lua @@ -0,0 +1,24 @@ +return +{ + HOOK_WORLD_STARTED = + { + CalledWhen = "A {{cWorld|world}} is initialized", + DefaultFnName = "OnWorldStarted", -- also used as pagename + Desc = [[ + This hook is called whenever a {{cWorld|world}} is initialized. + ]], + Params = + { + { Name = "World", Type = "{{cWorld}}", Notes = "World that is started" }, + }, + Returns = [[ + If the function returns false or no value, the next plugin's callback is called. If the function + returns true, no other callback is called for this event. There is no overridable behavior. + ]], + }, -- HOOK_WORLD_STARTED +} + + + + + diff --git a/MCServer/Plugins/Core b/MCServer/Plugins/Core -Subproject ede668bc7c310af49ad7354c00d3f11adbae792 +Subproject 351aff7efa94ce3c7ba733d5f83013e8a3fdfbf diff --git a/MCServer/banned.example.ini b/MCServer/banned.example.ini deleted file mode 100644 index ceb71fe0b..000000000 --- a/MCServer/banned.example.ini +++ /dev/null @@ -1,3 +0,0 @@ -[Banned] -;PlayerName=1 - diff --git a/MCServer/groups.example.ini b/MCServer/groups.example.ini deleted file mode 100644 index 2e4b5ebee..000000000 --- a/MCServer/groups.example.ini +++ /dev/null @@ -1,17 +0,0 @@ -[Admins] -Permissions=* -Color=c - -[Mods] -Color=5 -Inherits=Vips -Permissions=core.time,core.item - -[Vips] -Permissions=core.teleport -Color=2 -Inherits=Default - -[Default] -Permissions=core.build,core.help,core.playerlist,core.pluginlist,core.spawn,transapi.setlang,core.tell,core.me -Color=7 diff --git a/MCServer/users.example.ini b/MCServer/users.example.ini deleted file mode 100644 index 6726c0bf8..000000000 --- a/MCServer/users.example.ini +++ /dev/null @@ -1,23 +0,0 @@ -[FakeTruth] -Groups=Admins - -[Duralex] -Groups=Admins - -[Luthrandel] -Groups=Admins - -[cruisecho] -Groups=Admins - -[Kwen] -Groups=Admins - -[aloe_vera] -Groups=Admins - -[xoft] -Groups=Admins - -[Player] -Groups=Admins
\ No newline at end of file diff --git a/MCServer/whitelist.example.ini b/MCServer/whitelist.example.ini deleted file mode 100644 index a89c148c9..000000000 --- a/MCServer/whitelist.example.ini +++ /dev/null @@ -1,6 +0,0 @@ -[WhiteListSettings] -WhiteListOn=0 - -[WhiteList] -;PlayerName=1 - |