flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
1,609 Commits 1 Branch 0 Tags 92 MiB
67924b5941
Commit Graph

62 Commits

Author SHA1 Message Date
Alexander Harkness
67924b5941 Pulled in the latest version of core - fix the bugs that were stopping - #5 
Squashed commit of the following:

commit 1ca42172391d41ba71c65a3f15d3a96d15a80496
Merge: 52a6f4e 7a40336
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Sat Jul 27 09:01:45 2013 -0700

    Merge pull request #2 from tigerw/master

    Fixed /give descriptor & removed webadmin

commit 7a40336437525c447adae3d9800e75b39c0300c4
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Sat Jul 27 17:00:38 2013 +0100

    Fixed /give descriptor & removed webadmin

commit 52a6f4e35bdea2ae9f33977928b6693f5800e515
Merge: f5d56ff 2af1da8
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Sat Jul 27 08:51:45 2013 -0700

    Merge pull request #1 from tigerw/master

    Added TPA (tonibm9's fork)

commit 2af1da8a3cd8e94674b22805662b83de87ac4a95
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Sat Jul 27 16:38:10 2013 +0100

    Added TPA (tonibm9's fork)

    With code from STR_Warrior.

commit f5d56ffeb02fef4735e846661fa71d15622d25b9
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Sat Jul 27 15:51:18 2013 +0100

    Integrated SpawnProtect & Bugfixes [SEE DESC.]

    Integrated bearbin's SpawnProtect. Fixed config file bugs. Improved
    SpawnProtect to use settings.ini. Variable cleanup (SHOW_PLUGIN_NAMES).
    File and filename cleanup.

commit 56dc51c00af4514253c04e38b5ccc9fbed2f0022
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Fri Jul 26 23:14:40 2013 +0100

    Update README.md

    Added info.

commit acd7e2849dcd7f3ee7bdc6b0f9b777ee1d9cbb3c
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Fri Jul 26 19:37:59 2013 +0100

    Implemented Block Property checking for Collisions

    Used g_BlockIsSolid, instead of checking data values.

commit 246d423ff9660a2b00a1c51e6276ec74eb3419de
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Fri Jul 26 15:49:55 2013 +0100

    Updated Files

    Buildpermandcollision: updated collision code to check for torches and
    redstone torches.
    Help: attempt at always showing page number
    Web_serversettings: attempt at introducing a check for Maximum Players
    (must be above zero).

commit 868f99ab49edeee78f4fc1c212c6bf614b860378
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Thu Jul 25 19:46:08 2013 +0100

    Update README.md

    Extended 'GUI Redesign' section.

commit e0df40bd082bdeb5c6823b485bc5001103a77502
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Thu Jul 25 19:43:00 2013 +0100

    Update README.md

    Added features and fixes and instructions for use.

commit 332d8221f753f1a38d6c21bfc30af5890f48e3bb
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Thu Jul 25 19:35:27 2013 +0100

    Uploaded All Files

    All Core files, both modified and unmodified.

commit 3dd191f6bed71c863ee264856fbc3660e52cf88b
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Thu Jul 25 04:59:50 2013 -0700

    Initial commit
 2013-07-27 17:07:28 +01:00
Alexander Harkness
7d28f8bbff Merged in latest version of CoreSquashed commit of the following: 
commit 52a6f4e35bdea2ae9f33977928b6693f5800e515
Merge: f5d56ff 2af1da8
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Sat Jul 27 08:51:45 2013 -0700

    Merge pull request #1 from tigerw/master

    Added TPA (tonibm9's fork)

commit 2af1da8a3cd8e94674b22805662b83de87ac4a95
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Sat Jul 27 16:38:10 2013 +0100

    Added TPA (tonibm9's fork)

    With code from STR_Warrior.

commit f5d56ffeb02fef4735e846661fa71d15622d25b9
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Sat Jul 27 15:51:18 2013 +0100

    Integrated SpawnProtect & Bugfixes [SEE DESC.]

    Integrated bearbin's SpawnProtect. Fixed config file bugs. Improved
    SpawnProtect to use settings.ini. Variable cleanup (SHOW_PLUGIN_NAMES).
    File and filename cleanup.

commit 56dc51c00af4514253c04e38b5ccc9fbed2f0022
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Fri Jul 26 23:14:40 2013 +0100

    Update README.md

    Added info.

commit acd7e2849dcd7f3ee7bdc6b0f9b777ee1d9cbb3c
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Fri Jul 26 19:37:59 2013 +0100

    Implemented Block Property checking for Collisions

    Used g_BlockIsSolid, instead of checking data values.

commit 246d423ff9660a2b00a1c51e6276ec74eb3419de
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Fri Jul 26 15:49:55 2013 +0100

    Updated Files

    Buildpermandcollision: updated collision code to check for torches and
    redstone torches.
    Help: attempt at always showing page number
    Web_serversettings: attempt at introducing a check for Maximum Players
    (must be above zero).

commit 868f99ab49edeee78f4fc1c212c6bf614b860378
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Thu Jul 25 19:46:08 2013 +0100

    Update README.md

    Extended 'GUI Redesign' section.

commit e0df40bd082bdeb5c6823b485bc5001103a77502
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Thu Jul 25 19:43:00 2013 +0100

    Update README.md

    Added features and fixes and instructions for use.

commit 332d8221f753f1a38d6c21bfc30af5890f48e3bb
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Thu Jul 25 19:35:27 2013 +0100

    Uploaded All Files

    All Core files, both modified and unmodified.

commit 3dd191f6bed71c863ee264856fbc3660e52cf88b
Author: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date:   Thu Jul 25 04:59:50 2013 -0700

    Initial commit
 2013-07-27 16:54:25 +01:00
Alexander Harkness
983d87e443 Added correct core plugin 2013-07-27 16:24:03 +01:00
Alexander Harkness
aa64450421 Removed all the pre-exising core files. 2013-07-27 16:15:29 +01:00
madmaxoft@gmail.com
0756c72486 Core: /tp command can teleport either to a player or to a set of XYZ coords 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1663 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-07 19:57:56 +00:00
nielsbreu@gmail.com
4b18fd2eb1 Added missing "Colors", Documented the code + Cleanup. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1654 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-06 18:24:33 +00:00
nielsbreu@gmail.com
daff3ca687 Just a tiny speedup for the motd loading. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1653 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-06 13:30:10 +00:00
nielsbreu@gmail.com
983e29f065 Simplefied the motd loading function. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1652 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-06 11:13:29 +00:00
nielsbreu@gmail.com
ae22e2545d The motd is now loaded from a file in the root dir called motd.txt. You can easily edit the modt and add colors to it. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1647 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-05 19:56:32 +00:00
nielsbreu@gmail.com
cc4a1cad39 Reduced the amount of tables. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1644 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-05 11:13:21 +00:00
nielsbreu@gmail.com
504f6192f7 Updated LimitWorld. (Patch by tonibm19) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1642 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-03 08:13:53 +00:00
nielsbreu@gmail.com
3a6e9983f5 Fixed /stop command. The console still doesn't get closed though(FS#249). 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1637 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-01 11:42:59 +00:00
nielsbreu@gmail.com
0ba7a42762 Updated the /back and /top command. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1636 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-01 10:54:34 +00:00
madmaxoft@gmail.com
37276a4430 Rewritten entity-on-fire management ("forever on fire" bugs) 
Fixes FS #297 and part of FS #403.
Added sizes to all entities.
Moved all damage-related functions from cPawn to cEntity
API change: renamed cPawn:TeleportTo() to cEntity:TeleportToCoords()

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1635 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-01 10:39:56 +00:00
nielsbreu@gmail.com
290ab0b588 The LimitWorlds function now uses cCuboid 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1633 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-30 19:14:22 +00:00
madmaxoft@gmail.com
7b75aaea7c Advanced RCON: Command output is sent to the RCON client. 
RCON authentication is now required before executing commands.
Console command handlers now return two values, bool (IsHandled) and string (CommandOutput).
API change: removed cRoot:ExecuteConsoleCommand(), added cRoot:QueueExecuteConsoleCommand().
API change: removed cPluginManager:ExecuteConsoleCommand(), use cRoot:QueueExecuteConsoleCommand() instead

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1631 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-29 15:30:05 +00:00
nielsbreu@gmail.com
cff6ff2223 Added a function that allows you to change the /back coordinates. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1630 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-28 18:43:29 +00:00
nielsbreu@gmail.com
beb36ee149 Added /listworlds command and fixed bug in /listgroups where you have an extra comma at the end. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1629 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-28 10:18:55 +00:00
madmaxoft@gmail.com
64f70c2e2c Core: fixed a warning message when using the /item command 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1600 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-16 17:23:01 +00:00
nielsbreu@gmail.com
1e6e39f10a Added the option of saving all the chunks of a world using the webadmin. 
FS #354

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1588 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-13 17:05:53 +00:00
madmaxoft@gmail.com
cf87169737 Refactored cInventory to use cItemGrid for the actual Storage 
This makes the API more orthogonal and is easier to use in the plugins. Also changes in the inventory are now propagated to the needed places (armor updates to BroadcastEntityEquipment etc.) even when the inventory is changed by a plugin.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1503 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-05-24 07:30:39 +00:00
madmaxoft@gmail.com
d28ff25c33 Added Decoda projects for ChunkWorx and Core 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1500 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-05-21 09:30:09 +00:00
nielsbreu@gmail.com
1e4aaa774a WebAdmin: The plugin list is sorted alphabetically and if they are enabled or disabled. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1488 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-05-17 14:34:51 +00:00
nielsbreu@gmail.com
df2249ecb5 Updated the core's settings.ini settings tab 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1462 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-05-08 18:58:14 +00:00
nielsbreu@gmail.com
474b113b2f made the permission page more manageable. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1453 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-05-06 19:53:35 +00:00
nielsbreu@gmail.com
1e71a8a6bf Fixed the stop and restart button in the manage server tab. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1450 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-05-06 13:35:04 +00:00
nielsbreu@gmail.com
ad4a61ae0e Added lots of new options in the world config tab. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1440 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-05-03 20:22:01 +00:00
nielsbreu@gmail.com
e0e9360f25 Fixed bug where you could not use /time day/night 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1407 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-04-23 20:20:01 +00:00
nielsbreu@gmail.com
fd4f5b0ce5 Simplified onkilling.lua and added /time set and /time add 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1398 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-04-20 08:49:41 +00:00
nielsbreu@gmail.com
8050c89fab Added a tab in the serversettings where you can edit the world.ini of all your worlds. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1364 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-04-06 19:44:15 +00:00
nielsbreu@gmail.com
b72b7c33ac for some reason TortoiseSVN didn't commit listgroups.lua 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1354 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-04-03 16:30:02 +00:00
nielsbreu@gmail.com
f78a29a9b1 Added a /listgroups where you can see... a list of the groups ;) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1352 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-04-03 15:25:25 +00:00
nielsbreu@gmail.com
aae46468c7 Added a /toggledownfall command that toggles the weather. 
changed back the stop.lua

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1312 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-03-24 18:41:19 +00:00
nielsbreu@gmail.com
03e29802cd Updated core plugin. 
Added limited world. Configurable through webadmin.
Added a Manage server page in webadmin where you can reload/restart/stop the server.
You can add players to groups with the webadmin. without the player have to relog first
You can change someone's group in-game with a command, without the player have to relog first
Hardcore mode
Improved death messages

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1306 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-03-24 15:44:44 +00:00
madmaxoft
ef65bd6f49 Core: added PortsIPv6 setting to webadmin (contributed by STR_Warrior) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1261 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-03-08 09:29:22 +00:00
madmaxoft@gmail.com
476cd25ade Core: Updated with new features (contributed by STR_Warrior) 
http://forum.mc-server.org/showthread.php?tid=4&pid=6634#pid6634

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1235 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-03-02 14:43:46 +00:00
madmaxoft@gmail.com
8e64ad0848 Core: Players console command now shows players' IP addresses (patch contributed by STR_Warrior) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1220 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-02-19 14:13:44 +00:00
madmaxoft@gmail.com
34b3c13404 Plugins can now bind console commands 
FS #300
Most console commands are now implemented in the Core plugin.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1214 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-02-15 13:00:59 +00:00
madmaxoft@gmail.com
019c8b5bc7 Moved command API into cPluginManager. 
As specified in http://forum.mc-server.org/showthread.php?tid=765 , commands are now bound using a single function, cPluginManager:BindCommand().

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1183 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-02-01 19:55:42 +00:00
madmaxoft@gmail.com
71bbf2d44b Renamed HOOK_KILLED to HOOK_KILLING to match naming conventions. 
Also tweaked the mechanics so that plugins may revive without dropping other plugins out of the picture.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1182 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-01-28 16:54:11 +00:00
madmaxoft@gmail.com
752057fb1b Forgotten files for previous merge commit (rev 1139) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1140 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-01-13 11:10:26 +00:00
madmaxoft@gmail.com
e690694aa2 Added "Latest version" to the PrimaryServerVersion in webadmin settings (patch contributed by STR_Warrior) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1091 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-12-21 12:44:46 +00:00
madmaxoft@gmail.com
65aa72a2c3 Added PrimaryServerVersion to the webadmin (patch contributed by STR_Warrior) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1088 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-12-21 11:13:43 +00:00
madmaxoft@gmail.com
4cebaa99f8 Refactored the world time. 
Now it is stored in two values - WorldAge (only incremented, plugins cannot change) and TimeOfDay (plugins can change). Since sub-tick precision is needed in Tick(), we store it both as number of seconds (double) and number of ticks (Int64) is calculated off of that.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1022 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-11-01 21:38:20 +00:00
faketruth
6d121a4914 Core: fixed /help and /pluginlist 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@967 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-10-15 22:55:45 +00:00
faketruth
41ba1a7642 Completely removed support for old style Lua plugins (can use both Plugin and NewPlugin in settings.ini for now) 
Removed cPlugin_Lua, obviously
cPluginManager stores plugins by their (folder)name
cPluginManager now scans the Plugins folder for potential plugins and adds them as non-loaded plugins
Added a DisablePlugin and LoadPlugin to disable and load plugins on a per-plugin basis instead of all at once
cPluginManager::FindPlugins refreshes the plugin list by removing non-existing plugins and adding new plugins
Made it incredibly easy to use new plugins from the WebAdmin
Exposed some food/hunger related functions in cPlayer to Lua

git-svn-id: http://mc-server.googlecode.com/svn/trunk@959 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-10-13 23:34:47 +00:00
faketruth
12b536d467 Core: Removed /home since other plugins want to use it 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@951 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-10-11 21:02:02 +00:00
faketruth
0433de9955 Core: made ban and kick functions accessible to other plugins 
Core: fixed banning and whitelisting in OnLogin

git-svn-id: http://mc-server.googlecode.com/svn/trunk@947 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-10-11 14:30:28 +00:00
faketruth
917259f2e7 Core now uses built in item functions ( StringToItem() ) for the /item command 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@855 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-09-08 21:41:17 +00:00
faketruth
6bc916fc3c Added cPlugin_NewLua::GetLocalDirectory() and exported it to Lua so plugins can store their settings in their own folder. 
Core now stores banned players and whitelist data in its own directory

git-svn-id: http://mc-server.googlecode.com/svn/trunk@850 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-09-08 20:49:29 +00:00