1
0
Fork 0
Commit Graph

348 Commits

Author SHA1 Message Date
tycho 81c0116cf1 Merge branch 'master' into PreventNewWarnings 2015-05-23 07:33:52 -07:00
Lukas Pioch e30b2ed487 Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher. 2015-05-23 16:28:37 +02:00
tycho 1577a080ee Merge branch 'master' into PreventNewWarnings 2015-05-23 11:31:03 +01:00
worktycho c0d7b4d569 Merge pull request #2030 from beeduck/master
Issue #1868 and Issue #1984
2015-05-21 07:50:30 +01:00
b33duck a511db78ca Added thunder sound effect to CastThunderbolt() 2015-05-20 16:23:56 -07:00
tycho fa4fb75e03 Fixed compile and a few more warnings 2015-05-19 12:28:31 +01:00
Alexander Harkness fff5efedc3 Merge pull request #2019 from mc-server/OverrideArgs
Initial Implementation of command line arguments
2015-05-19 10:53:44 +01:00
STRWarrior b9481dafeb Updated the defaults for the overworld world generator 2015-05-17 19:36:18 +02:00
tycho c96849f431 Move make_unique into a namespace to avoid ADL issues
this prevents VS finding std::make_unique for constructors that take types from std
2015-05-16 10:47:04 +01:00
Martin Fahy 8f0f421ae4 Update World.cpp
Fixed minor typos in comments, simply trying to understand the code base to fix issue regarding no sound when lighting is produced, no change to actual code.
2015-05-13 23:05:44 -04:00
Mattes D 846d16315a CheckBasicStyle: checks spaces around * and &. 2015-05-09 12:58:55 +02:00
Mattes D c13b1931ff More style checking.
Spaces around some operators are checked.
2015-05-09 12:58:54 +02:00
tycho 448df85e56 Added support for additional data in the ParticleEffect Packet
Also started refactoring how broadcasts are handled
2015-05-07 03:47:46 +01:00
Mathias 17343d8215 Added Guardian and Rabbit to DefaultMonsters in Overworld 2015-04-29 18:07:26 +03:00
Woazboat 6caf08da99 cSetChunkData constructor explicitly requires std::move() instead of
unsafely stealing data
2015-04-27 21:18:56 +02:00
STRWarrior e7542f676d Added GlowStone finisher 2015-04-19 19:45:18 +02:00
Mattes D e5a7a730ed Merge pull request #1826 from mc-server/UnifyPacketizer
Unify packetizer
2015-03-24 13:09:41 +01:00
Mattes D e9b8be25f9 Changed linked world name variables and setters / getters.
Ref.: #1792
Ref.: https://github.com/mc-server/MCServer/pull/1792#discussion_r25946707
2015-03-21 15:20:31 +01:00
Mattes D cc069ccb2a Changed cEntity::m_UniqueID to UInt32. 2015-03-21 15:18:17 +01:00
Mattes D 781c8683f7 Added cPluginLua::cResettable interface, used for scheduled tasks.
This allows plugins to register objects that can "survive" the plugin unloading - they will simply bail out if the plugin is already unloaded, instead of referencing bad plugin data.
Fixes #1556.
2015-03-20 15:13:33 +01:00
Mattes D f3046417ec Fixed a clang warning, improved comments. 2015-03-19 12:46:37 +01:00
Mattes D 49e59ee06b World:DoWithEntityByID() checks the entities-to-add as well.
This allows plugins to create entities and immediately act on them using that call. This will most likely need to be added to most of the DoWith<> and ForEach<> calls.
2015-03-18 15:35:19 +01:00
Mattes D 65d2ef32e9 Merge pull request #1734 from mc-server/pistons
Handle client 'leave bed' request
2015-03-14 22:44:04 +01:00
tumultenrx 5c45c8897c Fixed a small bug 2015-03-14 20:45:16 +01:00
tumultenrx a215070cf2 Monsters will now attack. Additional checks have been added when generating spawn.
Monsters will now attack. Additional checks have been added when generating spawn.
2015-03-13 00:02:36 +01:00
Tiger Wang f3da0cf1ae Reverted non-functional changes 2015-03-05 21:21:39 +00:00
Tiger Wang 3869f76cc2 Handle client 'leave bed' request
* Fixes #1728
2015-02-08 21:21:48 +00:00
Mattes D 7dfeb67f01 Converted cServer to use the cNetwork API. 2015-01-27 14:53:31 +01:00
Kirill Kirilenko a216413a33 Fixed defect #71781 in Coverity list. 2015-01-23 19:06:07 +03:00
Mattes D 83ed6a2c1b Fixed type conversion warnings. 2015-01-18 11:25:16 +01:00
worktycho 6758c1d2a1 correct comment to say milliseconds 2015-01-17 22:24:25 +00:00
Tycho 2a9664d6ca Initial convertion of a_Dt to std::chrono
also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay
2015-01-11 21:12:26 +00:00
Tycho 4f75b94c99 Created new type cTickTime and rewrote cWorld::TickThread to use it 2015-01-11 01:54:18 +00:00
Mattes D ccdf03daaf Refactored all player block placing to go through hooks.
Fixes #1618.
2014-12-24 07:20:17 +01:00
Jonathan Fabian fbd0cf74bd Fix compile error on OS X introduced by commit ecf778bbec
The following error occurs on OS X with the order reversed: `MCServer/src/World.cpp:282:2: error: field 'm_LastSave' will be initialized after field 'm_LastUnload' [-Werror,-Wreorder] m_LastSave(0),`.    Reversing the order of initialization fixes this.
2014-12-21 23:02:02 -05:00
Mattes D ecf778bbec cWorld: Moved initialization into constructor.
Fixes CID 71781.
2014-12-21 22:19:22 +01:00
Mattes D 4947880a5d Merge pull request #1581 from mc-server/redstone
Resplit redstone .inc file and provided improvements
2014-12-17 08:38:23 +01:00
Howaner b3e5872c22 Fixed mob invisibility 2014-12-14 17:48:30 +01:00
Howaner bed456033f "& 0x0f" isn't needed 2014-12-14 13:14:48 +01:00
Howaner 2a8c234f46 Fixes 2014-12-13 20:31:37 +01:00
Tiger Wang 4b20a61519 Merge branch 'master' into redstone 2014-12-13 12:11:01 +00:00
Mattes D 781b3303a5 Merge pull request #1657 from mc-server/PrepareChunk
Prepare chunk
2014-12-11 17:06:18 +01:00
Mattes D fcd3d1bfed Added a cWorld:PrepareChunk function.
It prepares the chunk - loads or generates it and lights it.
The spawn prepare process uses this function.
2014-12-10 22:35:16 +01:00
Mattes D fbf98b8488 Merge pull request #1655 from tonibm19/patch-2
Added NetherOreNests to default nether generator.
2014-12-10 17:44:53 +01:00
tonibm19 7ceeefb26f Moved NetherOreNests 2014-12-10 17:13:20 +01:00
Mattes D 32bce44f1f Merge pull request #1623 from p-mcgowan/issue_1253
Prevent multiple logins with same username, unless allowed in settings
2014-12-10 11:17:11 +01:00
Mattes D 209de0268a Moved NaturalPatches in front of PreSimulator and Animals. 2014-12-08 21:28:14 +01:00
tonibm19 74ef586400 Added NetherOreNests to nether default generator.
Now there's quartz in the nether
2014-12-08 19:37:42 +01:00
tonibm19 98bd724294 Added NaturalPatches to finishers 2014-12-08 19:08:46 +01:00
Mattes D e08331a24b Fixed crash on server stop.
The entity destructors called through chunkmap destructor and chunk destructor were accessing the world which was in an already invalid state (half-destroyed).
Fixed by destroying chunkmap explicitly and providing a nullptr check in the HasEntity() function.
2014-12-07 16:14:27 +01:00