madmaxoft
c0629a9a6e
Fixed player swimstate crash.
...
The check for swimming / submersion checks the Y coord first. Fixes #63 .
2013-08-14 10:33:26 +02:00
madmaxoft
8c3837987b
Player counts are now properly handled.
...
Fixes #80
2013-08-14 10:24:34 +02:00
madmaxoft
b65a91dde3
Exported cWorld:BroadcastChat() to the Lua API; used in the Core.
2013-08-13 23:10:59 +02:00
madmaxoft
af645c62c9
Merge branch 'master' into PerWorldThreads.
...
Also fixed the AllToLua script not resolving conflicts.
2013-08-13 23:02:22 +02:00
madmaxoft
9020dc9932
Clients are now ticked in cServer first, then in cWorld once they get assigned a world.
2013-08-13 22:45:29 +02:00
Tiger Wang
020ff36af2
YET ANOTHER ERROR >:(
2013-08-13 17:45:40 +01:00
Tiger Wang
27b400adf8
Credits
2013-08-13 17:44:01 +01:00
Tiger Wang
dd6450c2a9
Attempt three
...
This is extremely embarrassing...
2013-08-13 17:41:50 +01:00
Tiger Wang
a322bb275f
Attempt two
2013-08-13 16:47:44 +01:00
Tiger Wang
2b0541ab39
Attempt at fixing sleep issue
2013-08-13 16:42:02 +01:00
Tiger Wang
23a5fb1450
Removed more comments
2013-08-13 16:36:19 +01:00
Tiger Wang
9ec248eaa0
Fixes #57
2013-08-13 16:34:26 +01:00
madmaxoft
27d0c9aef2
Fixed logging into debug console.
...
Was missing the LF at the end.
2013-08-12 14:47:08 +02:00
STRWarrior
9ad3c52593
Keep players from taking damage when teleporting.
2013-08-12 02:52:32 -07:00
STRWarrior
83d3635e0b
Added quartz stairs.
2013-08-12 02:31:02 -07:00
madmaxoft
90ef9cfe97
Fixed logging into debug console.
...
Was missing the LF at the end.
2013-08-12 08:42:18 +02:00
madmaxoft
c628ab03e9
Removed cServer::BroadcastChat() and cServer::SendMessage().
...
These two functions make it difficult to move to the new ticking system, and they aren't used anyway. If so required, they can be emulated by ForEachWorld / ForEachPlayer calls.
2013-08-12 08:35:13 +02:00
madmaxoft
6914bf4c65
Removed unused cServer::IsConnected() function.
2013-08-12 07:55:53 +02:00
madmaxoft
79ece8eb0d
Merge branch 'master' into PerWorldThreads
2013-08-12 07:46:41 +02:00
Tiger Wang
d23b8e0c7c
Merge pull request #77 from tonibm19/patch-1
...
Now Endermans spawn in The End
2013-08-11 14:38:31 -07:00
Tiger Wang
b48651a034
Really removed comments this time
2013-08-11 21:08:20 +01:00
tonibm19
67351d7d7b
Now Endermans spawn in The End
2013-08-11 21:54:39 +02:00
Tiger Wang
1599d607d1
Merge pull request #74 from tigerw/master
...
Further attempt at fixing torch placements
2013-08-11 12:44:54 -07:00
madmaxoft
829cc866cd
Added cWorld:QueueSaveAllChunks() function for saving chunks asynchronously.
...
The cWorld:SaveAllChunks() is therefore deprecated in the API and will be removed soon, use QueueSaveAllChunks() instead.
2013-08-11 21:05:44 +02:00
madmaxoft
ac9224da91
cIsThread threads get a window identification on Win.
...
This enables tools such as TaskInfo to report the thread name directly.
2013-08-11 20:22:42 +02:00
madmaxoft
4c5590636c
Each world now ticks in a separate thread.
2013-08-11 20:16:41 +02:00
madmaxoft
c59d80a2af
Removed cServer::m_pState, dissolved into direct member variables.
...
The server tick thread is now in the cServer::cTickThread object.
2013-08-11 19:46:27 +02:00
madmaxoft
2baa6634ec
cIsThread: Added the Stop() method and debugging output in Wait()
2013-08-11 19:40:15 +02:00
madmaxoft
eb9d45e906
Moved MaxPlayers and Description from cWorld to cServer.
...
Also started creating a new cWorld::cTickThread class, but not used yet.
2013-08-11 19:18:06 +02:00
madmaxoft
b58ca60815
Added doxyComments for cIsThread.
2013-08-11 18:46:49 +02:00
Tiger Wang
93f5a4388c
Removed unneeded case clause
2013-08-11 15:21:31 +01:00
madmaxoft
dd60f55bcc
Added the OnHopperPullingItem and OnHopperPushingItem hooks.
...
Requested in FS 412, slightly modified the params.
2013-08-11 14:57:07 +02:00
madmaxoft
d97b4463c6
Added an AllowEmptyStacks param to cItemGrid::HowManyCanFit().
2013-08-11 14:54:45 +02:00
Tiger Wang
e7ecd78312
Tried adding bracket
2013-08-11 12:08:09 +01:00
Tiger Wang
baae26ab22
Further attempt at fixing torch placements
...
Also fixed block on flower placement. #71
2013-08-11 11:58:57 +01:00
madmaxoft
deeb3a15dc
Added OnPlayerAnimation() hook.
...
Initial patch by @STR_Warrior, updated to account for different animation packets.
2013-08-11 12:29:05 +02:00
Tiger Wang
7e288850b1
Attempt at fixing torch placement
...
Attempt at fixing #71 and placement of torches.
2013-08-10 21:32:50 +01:00
Alexander Harkness
7d6bde3d93
Added back the required extra line in player.cpp
2013-08-10 17:40:52 +01:00
Tiger Wang
b999b27e05
Removed extra disconnect message
...
There seems to be already one in the HandleDisconnect hook function.
2013-08-10 17:09:14 +01:00
Tiger Wang
7035dbd7f1
Deleting cPlayer now does LOGD instead of LOG
...
Hopefully only prints in debug the debug message!
2013-08-10 16:59:48 +01:00
Alexander Harkness
e508e09753
Merge pull request #56 from mc-server/LinuxColorConsole
...
Linux color console
2013-08-10 04:40:38 -07:00
madmaxoft
15f80e0811
Linux color redirection fixed.
...
Outputting to stdin, yeah, right, that's gonna work :P
2013-08-10 13:07:49 +02:00
madmaxoft
19781ecad5
Coloring is reset before the LF.
2013-08-10 13:03:05 +02:00
madmaxoft
9794496571
Another Linux compilation fix.
2013-08-10 12:51:57 +02:00
madmaxoft
211a8395d4
Fixed Linux build.
2013-08-10 12:50:23 +02:00
madmaxoft
63b2fa21e8
Disabled coloring for redirected output.
2013-08-10 12:44:39 +02:00
madmaxoft
528feaba2c
Use printf() instead of puts().
...
puts() outputs an extra newline, making it unsuitable
2013-08-10 09:45:05 +02:00
madmaxoft
2a97bed3b4
Bad preprocesor used for discovering Linux
2013-08-10 09:42:20 +02:00
madmaxoft
d3c29c5a88
Piston head, when removed, removes the associated piston body, too.
...
Fixes FS 388
2013-08-10 08:22:53 +02:00
madmaxoft
72e2891017
Fixed squid crashing the server when above or below the world
2013-08-10 08:22:53 +02:00
madmaxoft
c85acd4ece
Renamed Plugin_NewLua to PluginLua.
2013-08-10 08:22:52 +02:00
madmaxoft
8fd67cf12a
First attempt at Linux console colors
...
Ref.: issue #41
2013-08-09 22:40:12 +02:00
Alexander Harkness
33155a51e2
Merge pull request #55 from mc-server/falldamage-teleport
...
Keep players from taking damage when teleporting. (Hopefully).
2013-08-09 12:36:45 -07:00
Alexander Harkness
e9b9f1861c
Fixed stupid syntax error (thanks build system).
2013-08-09 17:17:04 +01:00
Alexander Harkness
eaec6a4aab
Keep players from taking damage when teleporting. (Hopefully).
...
Fixes #29
2013-08-09 16:18:24 +01:00
madmaxoft
f89d6cc9af
Piston head, when removed, removes the associated piston body, too.
...
Fixes FS 388
2013-08-09 16:20:12 +02:00
madmaxoft
7c9c51425b
Fixed squid crashing the server when above or below the world
2013-08-09 15:53:43 +02:00
madmaxoft
7d70a06461
Renamed Plugin_NewLua to PluginLua.
2013-08-09 15:15:56 +02:00
madmaxoft
d4a3c451c4
Added OnExploding() and OnExploded() hooks.
...
As requested in FS 413, with extra parameters:
World, BlockX, BlockY, BlockZ, Size, CanCauseFire, Source, SourceData
OnExploding() can return 3 values:
StopHook, CanCauseFire, ExplosionSize
2013-08-09 14:58:43 +02:00
Alexander Harkness
6f2c099f70
Merge pull request #52 from ravenscroftj/feature/food
...
A few fixes for the hunger/food system + tests for swimming and submerged in cPlayer.
2013-08-09 01:06:30 -07:00
James Ravenscroft
6963e8119c
Fixed some formatting issues I accidentally introduced
2013-08-09 08:57:24 +01:00
James Ravenscroft
ffce5d143f
Removed the need to recalculate whether player is under water in ApplyFoodExhaustion
2013-08-09 08:50:33 +01:00
James Ravenscroft
dace1f7bd2
Added IsSwimming and IsSubmerged flags and access methods
2013-08-09 08:37:39 +01:00
James Ravenscroft
2b9fdc3e36
Fixed the jump food exhaustion being added when player is swimming
2013-08-08 16:57:34 +01:00
James Ravenscroft
9f7db50de0
Fixed food handler for mushroom soup - proper food level and saturation are applied and the player receives a wooden bowl back after nomming
2013-08-08 16:32:14 +01:00
madmaxoft
23b15a926c
Fixed a copypasta error in hook function names.
...
Thanks STR_Warrior for the report
2013-08-08 16:32:55 +02:00
madmaxoft
eb323166d9
Removed LuaScript.
...
The WebAdmin now uses LuaState directly to call the one function it needs.
2013-08-08 16:30:02 +02:00
madmaxoft
cc920ea929
cPlugin_NewLua is now completely rewritten to use templated LuaState calls.
2013-08-08 16:02:07 +02:00
madmaxoft
9e34a878ef
cPlugin: Name now defaults to the plugin folder name.
2013-08-08 16:01:26 +02:00
madmaxoft
198b221997
LuaState refactoring: using templates for hook function calls.
...
This simplifies calling Lua functions considerably, it's almost like calling a C++ function, only with an extra argument to delimit args from returned values.
2013-08-08 14:08:35 +02:00
madmaxoft
6c54650b27
cPlugin: Removed empty default implementation of virtual calls.
2013-08-08 14:08:34 +02:00
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