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

1391 Commits

Author SHA1 Message Date
madmaxoft
ae9334bd93 Merge pull request #49 from mc-server/RemoveSquirrel 
Remove squirrel
 2013-08-08 03:14:47 -07:00
James Ravenscroft
864bdd2626 Made comments more readable by adding space between // and text content. Added /// doxygen syntax comments to declarations 2013-08-08 11:01:45 +01:00
James Ravenscroft
9a6442a206 Fixed the formatting issues in player cpp files 2013-08-08 10:57:36 +01:00
James Ravenscroft
e6c33b0256 Made player drowning implementation 2013-08-08 10:32:34 +01:00
madmaxoft
3f4abe8c95 Addeed OnSpawningEntity, OnSpawnedEntity, OnSpawningMonster, OnSpawnedMonster hooks. 
As requested in FS 418.
 2013-08-08 09:13:13 +02:00
madmaxoft
09ebda4d10 Removed Squirrel. 
This compiles under Windows, but is untested in Linux.
 2013-08-07 22:39:40 +02:00
madmaxoft
3d027a8928 Merge pull request #48 from mc-server/BlockTracing 
Block tracing
 2013-08-07 06:46:43 -07:00
madmaxoft
58a76a90dc Added cLineBlockTracer to the API 2013-08-07 14:34:00 +02:00
madmaxoft
10b8ee7441 Plugin: Fixed plugin name in the cLuaState's subsystem 2013-08-07 14:33:16 +02:00
madmaxoft
29b9fb0a8b LuaScript: removed unused code 2013-08-07 14:32:40 +02:00
madmaxoft
9b839aa32e cLuaState has reference management, param checking and a fixed destructor. 
References are now managed as RAII objects, cLuaState::cRef.
Destructor now calls correct function, either Close() or Detach(), based on the owned-ness of the lua_State *.
 2013-08-07 14:26:18 +02:00
tonibm19
d48ff88e07 Now zombies spawn in Overworld during night 2013-08-06 21:38:32 +02:00
madmaxoft
c55fabb5ad cLuaScript now uses cLuaState 2013-08-06 19:28:09 +02:00
madmaxoft
0281b1db6e Fixed compilation in ManualBindings 2013-08-06 19:27:48 +02:00
madmaxoft
4034136922 cLuaState is used for pushing splits in ManualBindings 2013-08-06 17:17:26 +02:00
madmaxoft
2030bd47c8 cLuaState now tracks the function name and number of args 2013-08-06 08:59:54 +02:00
madmaxoft
2151bb8f5b cLuaState can now contain a detached LuaState, too. 
This will be useful for cases when we get a lua_State * from the outside and are asked to perform operations on it.
 2013-08-06 08:01:00 +02:00
madmaxoft
c0066e7260 Merge branch 'master' into BlockTracing 2013-08-05 16:02:41 +02:00
madmaxoft
73fcd7ad1c Exported the cWorld:TryGetHeight() function 2013-08-05 15:54:10 +02:00
madmaxoft
d83e4369d3 Exported cWorld:DoWithEntityByID() to Lua API 2013-08-05 15:41:24 +02:00
madmaxoft
3b418c7695 Alpha-sorted the manual bindings' functions. 2013-08-05 15:26:43 +02:00
madmaxoft
ca5561c395 cIniFile now reads .example.ini if not requested not to. 
As specified in #44, when the .ini file cannot be opened, a .example.ini is tried, and if it succeeds, it is written as .ini. This makes it easy to provide ini file templates.
 2013-08-05 15:24:23 +02:00
madmaxoft
073bcd0361 Added the Carpet block. 2013-08-05 10:43:43 +02:00
madmaxoft
71bb41ee86 LuaState refactoring: initial part. 
The cLuaState class is a wrapper for the lua_State * and for the common functions on it. The cPlugin_NewLua has been rewritten to use it instead of the raw pointer. Part of #33
 2013-08-04 23:11:25 +02:00
madmaxoft
e21ed58d5f cWorld: Added a self-test for LineBlockTracer, disabled by an #ifdef. 2013-08-04 16:08:09 +02:00
madmaxoft
654714e7bc LineBlockTracer: Fixed initial errors 2013-08-04 16:07:15 +02:00
madmaxoft
6af81c66e9 cItem: Removed a warning emitted when creating an item from air 2013-08-04 16:06:28 +02:00
madmaxoft
5fe7008966 First attempt at implementing a cLineBlockTracer class 
Not yet tested, will probably have lots of bugs, if it is at all usable.
 2013-08-04 13:25:48 +02:00
madmaxoft
37850433d2 Improved logging coloring performance on Windows. 2013-08-04 08:56:20 +02:00
madmaxoft
106308796d Merge branch 'master' into BlockTracing 2013-08-03 20:45:08 +02:00
madmaxoft
4f26f11dc7 Added cWorld::DoWithChunk() function. 
This will be used by the blocktracers to gain direct access to chunk data.
 2013-08-03 20:26:50 +02:00
madmaxoft
b688ba9be8 Removed the unused BlockY parameter from cChunkDef::BlockToChunk() 2013-08-03 20:05:07 +02:00
Alexander Harkness
3255c29e7a Removed some stuff again. 2013-08-03 18:36:04 +01:00
Alexander Harkness
e585600e41 Revert "Rm'd startup credits & mv'd to README" 
This reverts commit 2383977fe7.
 2013-08-03 18:29:49 +01:00
Tiger Wang
e3ddfbc566 Commented out groups spam 
Further reduces chance of error message burying.
 2013-08-03 17:49:38 +01:00
Tiger Wang
2383977fe7 Rm'd startup credits & mv'd to README 
Removed as I feel it serves no purpose other than spam console and bury real error messages from plugins, etc. This is especially the case with running under screen, which makes it very difficult to scroll up or down.
 2013-08-03 17:45:24 +01:00
Tiger Wang
ff91a3317d Updated inbuilt commands description 
Did this to meet help format standards.
 2013-08-03 17:24:06 +01:00
madmaxoft
13c5a7864e AllToLua now resets the git status for the files. 
This should auto-fix merge conflicts when they occur on the Bindings.cpp / Bindings.h files.
http://forum.mc-server.org/showthread.php?tid=1200&pid=9315#pid9315
 2013-08-02 09:25:12 +02:00
madmaxoft
edb299db09 Shift+clicking won't combine different item metas. 
Fixes FS 424.
 2013-08-02 09:12:16 +02:00
bearbin
86ca755bc2 Merge pull request #35 from mc-server/foodstuffs 
Add the new food items.
 2013-08-01 23:56:10 -07:00
bearbin
1d233bdc68 Alpha-sort the foodstuffs. 2013-08-02 07:54:30 +01:00
bearbin
7642fdd194 Add the new food items. 
Enchanted golden apples are not required, as they are a meta value and provide the same nourishment as plain golden apples.
 2013-08-02 07:46:30 +01:00
madmaxoft
3531bdb60b Implemented OnPlayerRightClickingEntity() hook 
Fixes FS 425
 2013-08-02 08:44:06 +02:00
madmaxoft
f481865c35 New players get full health 
Fixes #28.
 2013-08-01 09:51:25 +02:00
madmaxoft
86831056dc ClientHandle: alpha-sorted the HandleXXX functions declarations 2013-08-01 09:46:01 +02:00
madmaxoft
3683601b8b Merge branch 'tabcompletion' 2013-08-01 09:36:33 +02:00
madmaxoft
e8a907d89e Implemented the actual tab completion for commands and playernames. 
Each command is reported only if the player has the permission to use it.
 2013-07-31 11:16:11 +02:00
madmaxoft
e9f18f8b4f Tab completion packet is handled and sent. 
This only handles the network comm and the overall design logic, the actual completion is not yet implemented, only dummy values are returned for now.
 2013-07-30 22:48:59 +02:00
madmaxoft
fedb803acb Fixed inverted sanity check in SetGameMode() 
Fixes #22.
 2013-07-30 14:48:18 +02:00
madmaxoft
9efcd5b82f Added the "Edit Sign" packet sent to the client placing a sign. 
Fixes issue #20. The 1.6.2 client wouldn't open the sign editor UI unless it receives a special packet
 2013-07-29 21:42:05 +02:00
madmaxoft
3920e872f7 Updated the nightbuild script for Git 2013-07-29 19:53:41 +02:00
Alexander Harkness
53e22b1185 Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
madmaxoft
20e7221c7c WebAdmin: Removed the duplicate memory usage querying 2013-07-29 10:59:10 +02:00
madmaxoft
e51221eaf9 Fixed formatting in LuaScript.* 2013-07-29 10:03:42 +02:00
madmaxoft
473dec42c8 Updated the automatic Lua bindings 2013-07-29 09:55:37 +02:00
madmaxoft
752e57108d Merge remote-tracking branch 'origin/master' into hunger 2013-07-29 09:53:47 +02:00
FakeTruth
5a9d4f89c2 WebAdmin templates can use Lua 
New WebAdmin templates can use Lua to completely compose the pages
themselves. This should allow infinite WebAdmin design possibilities.
 2013-07-29 02:37:59 +02:00
madmaxoft
3bf4130e3f Player eating is now properly broadcast to other players. 
Also fixed the API relating to food, determining player gamemode, and removed several unneeded API functions.
 2013-07-28 22:55:09 +02:00
madmaxoft
4746d2251c Implemented basic eating support. 
Food is now properly consumed and it takes 1.5 sec.
 2013-07-28 19:15:03 +02:00
madmaxoft
0caadbb25c Hunger-per-distance is calculated only for the XZ distance 2013-07-28 11:54:37 +02:00
madmaxoft
d155c1cb00 Player food level is reset on respawn 2013-07-28 11:52:24 +02:00
madmaxoft
c5c233312a Merge remote-tracking branch 'origin/master' into hunger 2013-07-28 11:47:29 +02:00
madmaxoft
d3801c0296 Added cPlayer::IsGameModeXXX() and cWorld::IsGameModeXXX() functions. 
These are the preferred way of determining the gamemode, you should use those instead of doing manual comparisons to the gamemode value.
 2013-07-28 11:30:54 +02:00
Tiger Wang
265fa6d750 Fixed Window Titles being MCS-* 
For example, MCS-Chest, MCS-DoubleChest, etc.
 2013-07-27 22:32:07 +01:00
STRWarrior
235c23d464 Hunger: If a player dies the food level resets. 2013-07-27 06:07:10 -07:00
madmaxoft@gmail.com
6b348717d8 Removed debug-logging the player movement in each tick 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1685 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-26 20:03:25 +00:00
madmaxoft@gmail.com
fa66659456 cItemGrid: ChangeSlotCount() now returns -1 if invalid SlotNum 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1684 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-26 19:53:47 +00:00
madmaxoft@gmail.com
cd8720bf7e cInventory: Added the ChangeSlotCount() function to the Lua API 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1683 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-26 19:50:06 +00:00
madmaxoft@gmail.com
1b20cfa425 cEntity doesn't process physics / burning when in an invalid chunk 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1680 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-24 20:36:12 +00:00
madmaxoft@gmail.com
df34c43293 Server shuts down when the stdin is closed (linux Ctrl+D / win Ctrl+Z) 
Fixes FS #419

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1679 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-24 20:25:27 +00:00
madmaxoft@gmail.com
a96ee0abfa cListenThread initializes m_ShouldReuseAddr to false (valgrind error) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1677 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-22 19:55:10 +00:00
madmaxoft@gmail.com
889402a56a Simulators don't simulate in invalid chunks (valgrind error) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1676 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-22 19:54:27 +00:00
madmaxoft@gmail.com
2fca0567bf Added a StringToMobType() function to the Lua API (patch contributed by STR_Warrior) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1674 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-12 20:28:41 +00:00
madmaxoft@gmail.com
4fb771f3ff First implementation of movement-related hunger and API 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1673 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-12 20:01:25 +00:00
madmaxoft@gmail.com
f5e475d44f Added the cFastRandom class 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1672 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-11 08:34:41 +00:00
madmaxoft@gmail.com
94a92a219b Server sends PlayerMaxSpeed after a respawn. 
http://forum.mc-server.org/showthread.php?tid=434&pid=8912#pid8912

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1671 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-08 18:30:27 +00:00
madmaxoft@gmail.com
97dc5a5365 Color codes are stripped from the DC message 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1670 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-08 13:00:09 +00:00
madmaxoft@gmail.com
791bf732fd 1.6.2 protocol implemented, both in MCServer and in ProtoProxy 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1669 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-08 12:59:15 +00:00
madmaxoft@gmail.com
a40585ec99 Pickups have an initial health of 5 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1668 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-08 07:23:44 +00:00
madmaxoft@gmail.com
9214a134ca World: More unused variables removed. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1667 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-07 20:48:50 +00:00
madmaxoft@gmail.com
3df8cfb091 World: Removed an unused variable 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1666 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-07 20:41:43 +00:00
madmaxoft@gmail.com
254295b5b8 Squid: fixed a possible crash caused by access to a wrong chunk 
Fixes FS #411.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1665 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-07 20:20:18 +00:00
madmaxoft@gmail.com
a72c6d9613 Ice is a solid block. 
Helps with FS #381

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1664 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-07 19:58:33 +00:00
madmaxoft@gmail.com
a3c8b12ee9 Mobs are assigned MaxHealth from monsters.ini; reading monsters.ini doesn't need settings.ini values anymore. 
Fixes FS #409.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1662 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-07 15:09:05 +00:00
madmaxoft@gmail.com
5951bc76ec Added StringUtils functions to Lua API; added StripColorCodes(); ChatLog now strips color codes from logged messages. 
Fixes FS #398

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1661 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-07 14:42:07 +00:00
madmaxoft@gmail.com
0224a4f7fc Fixed sprinting in 1.6.1, made speeds available through API; fixed messages containing quotes. 
Fixes FS #415

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1660 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-07 14:13:43 +00:00
madmaxoft@gmail.com
b1d05b0f57 Improved function names for protocol packet sending; alpha-sorted the function lists 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1659 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-07 13:06:06 +00:00
madmaxoft@gmail.com
762f78774d Declaring full 1.6.1 compatibility 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1651 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-05 21:14:55 +00:00
madmaxoft@gmail.com
37590c4bd8 Unmounting vehicles implemented in the 1.6.1 way 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1650 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-05 21:11:06 +00:00
madmaxoft@gmail.com
b818addde4 Fixed 1.6.1's movement speed 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1649 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-05 21:02:08 +00:00
madmaxoft@gmail.com
de5cec7419 Initial 1.6.1 protocol support. 
The client connects and is capable of basic gameplay, but the player moves at an incredible speed (50 blocks / sec).

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1646 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-05 19:40:19 +00:00
madmaxoft@gmail.com
eff79ee55f Fixed a crash when moving a player to a non-existent world (reported by tonibm19) 
http://forum.mc-server.org/showthread.php?tid=434&pid=8865#pid8865 crashdump.zip/crash_mcs_165c.dmp

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1645 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-05 17:04:12 +00:00
madmaxoft
e27a5db409 Empty buckets replace fluid buckets on use and vice versa (patch contributed by Mgueydan) 
Fixes FS #277.
API change: added an optional parameter to cItemGrid:AddItem(), cItemGrid:AddItems(), cInventory:AddItem() and cInventory:AddItems()

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1643 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-03 13:56:11 +00:00
madmaxoft@gmail.com
f7b8a301f8 Fixed player moving between worlds. 
Fixes FS #407.
Also fixes a few possible deadlocks between SocketThreads and TickThread

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1641 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-03 07:47:35 +00:00
madmaxoft@gmail.com
2f8eebaad1 dtOnFire damage wasn't dealt properly 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1640 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-01 18:52:24 +00:00
madmaxoft@gmail.com
37f6c78404 Added DamageType translation to API 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1639 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-01 18:46:45 +00:00
madmaxoft@gmail.com
2e9cf0ae28 Fixed burn / fire damage in each game tick. 
http://forum.mc-server.org/showthread.php?tid=434&pid=8798#pid8798

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1638 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-01 18:37:27 +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
madmaxoft@gmail.com
623adcad0f Fixed crouch-placing unplaceable items (FS #399) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1632 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-29 15:45:46 +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