1
0
Fork 0
Commit Graph

435 Commits

Author SHA1 Message Date
Marvin Kopf f9506f6405 Add check if entity is in chunk before changing tick status 2016-02-21 00:07:58 +01:00
LogicParrot 83459d0d89 Proper entity destruction in non-ticking chunks 2016-02-19 07:05:22 +02:00
LogicParrot f3e0a5f656 Add forum link to linkage error message 2016-02-09 09:30:22 +02:00
LogicParrot 91fd275c0b Improve world linkage error message 2016-02-09 00:40:26 +02:00
LogicParrot ed97946bb9 Merge pull request #2961 from LogicParrot/enforce
[PhantomWorlds - 4] Prevent server from starting if there's bad world linkage
2016-02-08 11:57:57 +02:00
LogicParrot 96f9afa278 Proper world linkages and dimension types for newly created world.ini's 2016-02-06 10:18:13 +02:00
Marvin Kopf 0b826b0e52 Tab completion for player names now case insensitive. 2016-02-05 21:27:31 +01:00
LogicParrot d8861da599 Prevent server from starting if there's bad world linkage 2016-02-05 15:34:16 +02:00
LogicParrot 4aade202e0 cMonster::m_Target safety across worlds 2016-02-03 22:50:17 +02:00
LogicParrot ac2c79f797 Fixed non-natural spawning near player (egg, breeding, etc.) 2016-01-16 16:40:47 +02:00
LogicParrot e77af000df Do not spawn mobs too close to player 2016-01-12 15:47:13 +02:00
Mattes D 6c9be8df4b Fixed default Nether generator params.
The prefab file is "NetherFort"
2015-12-30 13:37:28 +01:00
Lukas Pioch 938833bd6b Fixed spawn point. Wrong number for divisions and wrong highest spawn point. 2015-12-20 13:05:43 +01:00
Tiger Wang 5b62c4c314 Reorganised the redstone simulator
-> Many thanks to @worktycho for the idea, and @Haxi52 for the implementation plan!
* Uses classes and inheritance now
* Speed should be improved
2015-12-18 13:17:38 +00:00
Mattes D 3de22f5183 Changed Nether defaults to use PieceStructures. 2015-12-01 11:39:02 +01:00
Dave Tucker 83870f9fc0 Add enum for Sound and Particle Effects
Fixes #2603

Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
2015-11-24 13:21:40 +00:00
samoatesgames 19ea5d5423 Improved spawn location calculations.
- Supports Overworld and Nether spawns.
 - Supports spawning under objects, but still above ground (e.g. under the leaves of a tree).
 - Protects against spawning in oceans.
 - Protects against spawning in water.
 - Uses a radial search about the origin, rather than a linear.
 - Correctly calculates Nether spawn on spawn world generation (fixes: cuberite#2548)
 - Fixes a bug in CheckPlayerSpawnPoint() where the X offset was used in both the X and Z coords (BLOCKTYPE BlockType = GetBlock(a_PosX + Coords[i].x, a_PosY, a_PosZ + Coords[i].x);)
2015-11-13 15:08:16 +00:00
Lukas Pioch 9749c3aac9 Implemented brewing 2015-11-03 18:00:55 +01:00
worktycho dacab890cc The bottom layer cannot hold a valid spawn point
Fixes #2510
2015-10-01 14:49:26 +01:00
Mattes D 7d551fe9f6 Added weather intervals to world.ini settings. 2015-09-28 01:02:17 +02:00
Tiger Wang a8bfe3a4c1 Prepared ScheduleTask for threading refactor
* Llama-ified and condensed Schedule/QueueTask
- Removed hackery done with piston animations
2015-09-25 18:56:49 +01:00
tycho 6e86d20f73 Add new "ForEach" function: ForEachLoadedChunk. 2015-09-24 15:54:32 +01:00
tycho 3187dbf0aa Increase robustness of the logging subsystem 2015-09-15 16:19:49 +01:00
Mattes D 6e4122e551 Unified the doxy-comment format. 2015-07-31 16:49:10 +02:00
Samuel Barney 804805d35a Silenced and fixed many warning messages across multiple files. 2015-07-29 09:49:30 -06:00
hallucino 9c85ed5864 Spawn baby mobs 2015-07-16 22:49:55 +02:00
Tiger Wang 8656e149c8 Improved maps 2015-07-14 21:46:30 +01:00
Samuel Barney d017fe5e39 Sapling Growth Update
* Growth has been slowed down
* Saplings do not grow if they do not have enough space to grow
* Saplings do not grow unless the light level is 9 or above
* Dark Oak doesn't grow unless it is in a 2x2

Jungle Trees now will grow into a large tree when 2x2 saplings are used.
2015-07-13 15:24:38 -06:00
Samuel Barney 2faff189d4 Squashed Bonemeal Plant Growth Update
* Fixed Crops growing to maturity with only 1 bonemeal
* Trees now go through growth stages with bonemeal, as they do in
Vanilla Minecraft
2015-07-06 15:41:08 -06:00
worktycho 106e06617a Merge pull request #2224 from cuberite/ChunkQueueCollapsing
Chunk queue collapsing: MK II
2015-07-04 14:43:00 +01:00
STRWarrior e5cfe0cd96 Added a size check for portals.
Made the portal size configurable

Alpha-sorted SetXYZNetherPortalXYZ functions
2015-06-28 17:05:44 +02:00
Hax52 9f1d1c058f Buttons no longer click on when already on. Buttons now play sound when clicking off. 2015-06-24 13:52:56 -05:00
Tiger Wang 33fc1474d9 Fixed minor errors in Tycho's code
Everything should work now :)
2015-06-22 21:27:13 +01:00
Tiger Wang dd4b415051 Reinstate "Chunk queue collapsing"
This reinstates commit f36acb6835
     and reverts commit adfbc42c02.
2015-06-10 15:16:05 +01:00
Tiger Wang 84534dfeb2 Redstone wire and trapdoor fixes
* Fixes #1887
* Fixes #1763
* Fixes #1083
2015-06-06 12:21:19 +01:00
tycho 06a74e45e2 Made cLightingThread own its callbacks 2015-05-30 11:11:17 +01:00
tycho 4feccaa64a Clean up Spawn Prepare
Made cSpawnPrepare execute on the same thread since it is a syncronous operation, and most of the code happens on the lighting thread.
Also moved cSpawnPrepare into its own file
2015-05-30 00:19:20 +01:00
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
Mattes D 3c3cb198f3 Fixed c++11 branch issues. 2014-12-07 15:46:27 +01:00
Tiger Wang 3acdf25b05 Merge remote-tracking branch 'origin/master' into c++11
Conflicts:
	src/OSSupport/Thread.cpp
2014-12-06 17:41:48 +00:00
p-mcgowan a8bbd5efe4 Merge branch 'master' of github.com:p-mcgowan/MCServer into animalTerrainFinisher
update
2014-12-05 11:24:09 -08:00
Mattes D 44644ae025 Fixed reported parentheses around comparisons. 2014-12-05 12:58:47 +01:00
Mattes D c014f5624c Merged branch 'origin/master' into c++11. 2014-12-04 22:04:16 +01:00
Jonathan Fabian b0e4643eb6 Allow Spectator Gamemode as a world default. 2014-12-02 20:24:05 -05:00
p-mcgowan 7f8f2f1e70 forgot generation defaul init 2014-12-02 15:57:41 -08:00
STRWarrior fa4a85c915 Added better soulsand rims
As a finisher called SoulsandRims
2014-12-01 16:36:48 +01:00
Mattes D db0f791d43 Fixed a crash in cSpawnPrepare. 2014-11-30 18:19:29 +01:00
Mattes D a73c800377 Improved comments for cWorld::DoWithPlayer(). 2014-11-30 11:11:47 +01:00
Vincent 20dcceb7e6 removed GetUsernames() from World 2014-11-29 15:46:31 -08:00
Vincent a7bf2725c8 fixed naming of strings and changed from i to I 2014-11-29 11:22:03 -08:00
Vincent 61e761fdc2 issue 1253 - prevent multiple logins with same username 2014-11-29 00:36:15 -08:00