summaryrefslogtreecommitdiffstats
path: root/src/World.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fix debug macro situation (#5114)Tiger Wang2021-01-261-2/+2
| | | Use the standard NDEBUG.
* Clarify cClientHandle, cPlayer ownership semanticsTiger Wang2021-01-121-304/+63
| | | | | | | | + A cPlayer, once created, has a strong pointer to the cClientHandle. The player ticks the clienthandle. If he finds the handle destroyed, he destroys himself in turn. Nothing else can kill the player. * The client handle has a pointer to the player. Once a player is created, the client handle never outlasts the player, nor does it manage the player's lifetime. The pointer is always safe to use after FinishAuthenticate, which is also the point where cProtocol is put into the Game state that allows player manipulation. + Entities are once again never lost by constructing a chunk when they try to move into one that doesn't exist. * Fixed a forgotten Super invocation in cPlayer::OnRemoveFromWorld. * Fix SaveToDisk usage in destructor by only saving things cPlayer owns, instead of accessing cWorld.
* Convert most calls to blocking GetHeight/GetBiomeAt to direct chunk accessesTiger Wang2021-01-111-18/+17
| | | | * Hopefully fixes #5094
* Don't prematurely exit "downloading terrain" screen on joinTiger Wang2020-12-261-1/+0
| | | | - Remove leftover SendPlayerMoveLook from #1500
* Avoid a gratuitous dirty when loading chunks with entitiesTiger Wang2020-12-261-15/+0
| | | | Loaded entities are directly moved into the chunk data, instead of having to go through cWorld, as if they were just spawned. This avoid dirtying the chunk.
* ViewDistance: unsigned -> signedTiger Wang2020-12-261-3/+2
|
* unique_ptr<cChunkMap> to plain memberTiger Wang2020-12-221-120/+91
|
* Warnings improvementsTiger Wang2020-12-181-2/+3
| | | | | | | | | * Turn off global-constructors warning. These are needed to implement cRoot signal handler functionality * Add Clang flags based on version lookup instead of a compile test. The CMake config process is single threaded and slow enough already * Reduced GetStackValue verbosity + Clarify EnchantmentLevel, StayCount, AlwaysTicked, ViewDistance signedness + Give SettingsRepositoryInterface a move constructor to simplify main.cpp code - Remove do {} while (false) construction in redstone handler
* Some const and inheritance correctness (#5014)12xx122020-11-131-1/+1
| | | | | | | * Some const and inheritance correctness * Devirtualise SendBlockTo(Vector3i) Co-authored-by: 12xx12 <12xx12100@gmail.com> Co-authored-by: Tiger Wang <ziwei.tiger@outlook.com>
* Add correct implementation of crops (#4802)0ddlyoko2020-11-061-30/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [FIX] Add correct implementation of seed drops. > Official percentage of drops has been implemented * Fix C++ conventions * Change "Vals" variable to "m_Vals" * [FIX] Add correct implementation of Carrots, Potatoes, Wheat & Beetroots seed * Add Fortune support with crops Add fortune support with Wheat, Carrots, Potatoes & Beetroots seeds * [FIX] Right-clicking on a grown Beetroot in survival consume 2 bone meals Fix #4805 * Add documentation for "cWorld::IsFullGrownPlantAt" method * Fix dispenser that full grown a plant > Change methods cItemDyeHandler::FertilizePlant & cItemDyeHandler::growPlantsAround to static * Display particle even if tree doesn't grow * When right-clicking on a full grown melon / pumpkin seed, no longer produce a melon / pumpkin Before this commit, when you right-click on a melon or a pumpkin seed, a melon / pumpkin block spawned. With this commit, it no longer spawns * [FIX] Do not create melon / pumpkin block when right-clicking with a bone meal This fix will prevent the creation of a melon / pumpkin block when you right-click with a bone meal on a melon / pumpkin plant - It just detect if the plant is full grown. if yes, the method "Grow" is not called - Remove IsFullGrownPlant Co-authored-by: 12xx12 <12xx12100@gmail.com> Co-authored-by: Tiger Wang <ziwei.tiger@outlook.com>
* Add beam target, configurable base visibility to Ender Crystals (#5010)12xx122020-10-291-0/+16
| | | | | * Fixes #4990 Co-authored-by: 12xx12 <12xx12100@gmail.com>
* TNT Changes (#4970)KingCol132020-10-241-2/+1
| | | | | + Make TNT drop pickups, change a few comments. + Give each ray random intensity, instead of each explosion. * Use direction instead of destination, rewrite for pairs of edges.
* Merged OnBreak with OnPlayerBreak (#4967)12xx122020-10-081-4/+24
| | | | Co-authored-by: 12xx12 <12xx12100@gmail.com> Co-authored-by: Tiger Wang <ziwei.tiger@outlook.com>
* Fix cmake not adding Werror on clang, and _lots_ of warnings (#4963)peterbell102020-10-051-1/+1
| | | | | | | | | | | | | | | * Fix cmake not adding Werror on clang, and _lots_ of warnings * WIP: Build fixes * Cannot make intermediate blockhandler instance * Tiger's changes * Fix BitIndex check * Handle invalid NextState values in cMultiVersionProtocol Co-authored-by: Tiger Wang <ziwei.tiger@outlook.com>
* Do not call into things we don't own in destructorsTiger Wang2020-09-251-5/+1
| | | | | - Remove improper accesses in cChunk destructor * Fixes #4894
* BlockHandler initialisation is a constant expression (#4891)Tiger Wang2020-09-201-2/+2
| | | | | | | | | | | | | * BlockHandler initialisation is a constant expression If we can't make it all namespaces, this is the next best I guess. + Tag handlers constexpr, const as needed + Inherit constructors * Privatise handler functions * More constexpr Co-authored-by: Alexander Harkness <me@bearbin.net>
* Reverse order of ChunkSender priorities (#4858)Tiger Wang2020-09-121-3/+3
| | | | | * Reduces confusion when using overloaded operator< and priority_queue Co-authored-by: peterbell10 <peterbell10@live.co.uk>
* Use tracing for explosions (#4845)Tiger Wang2020-09-121-38/+5
| | | | | | | | | | | | | | | | | | | | | | | | * TNT: Implement tracing algorithm + Add intensity tracing * Fix iterating over all players to SendExplosion, even those not in range * Implemented TNT entity interaction * Fixed misaligned destruction tracing * Finalise TNT algorithm - Remove BlockArea and just use chunks Using SetBlock makes it so that we can update everything properly, and does appear to be faster. * BlockInfo learns about explosion attentuation * Rename Explodinator parameters * TNT: pull block destruction into common function Co-authored-by: Alexander Harkness <me@bearbin.net>
* Rename AddEntityIfNotPresent to AddPlayerTiger Wang2020-09-031-1/+1
| | | | | + Always make a chunk for the player to go into * Fixes #4847
* Entities can fail to add into a chunkTiger Wang2020-08-291-6/+0
| | | | - MoveEntityToNewChunk, AddEntity can fail. Ensure we handle these cases correctly
* Clean up GenerateChunk/TouchChunkTiger Wang2020-08-281-10/+0
| | | | | | - Remove TouchChunk - Remove unused bool return value in GenerateChunk - Remove ShouldGenerateIfLoadFailed
* Remove unneeded MarkDirty, SendToClients parameters of SetMetaTiger Wang2020-08-281-2/+2
| | | | | | | | Partially reverts #3129, whose addition of these parameters was superseded by #3149 that fixed generated leaves' metas. References: https://github.com/cuberite/cuberite/pull/4417#discussion_r334950513 e0bcd754009f16480437b2c1fa5e7fbedab31496
* Changed tree-growing functions in cWorld to use Vector3i coords.Mattes D2020-08-271-30/+32
|
* large conifers sapplings growmBornand2020-08-051-1/+6
|
* Corrected wakeup sequencesTiger Wang2020-08-041-4/+3
| | | | | | | * Pistons/Ice no longer need to FastSetBlock first (#4600), and the former don't drop items when broken in creative - Begin migration away from stationary fluids * Tick the chunk after applying a client's changed * Broadcast pending blocks at the end of a tick
* OnBroken/OnPlaced are for entity actionsTiger Wang2020-08-041-17/+12
| | | | | | * Call OnPlaced/OnBroken in PlaceBlock/DigBlock - Remove unused Placing/Breaking handlers * Have the blockhandler's Check handle neighbour updating, instead of QueueTickBlockNeighbors
* Add WakeUp/AddBlock distinctionTiger Wang2020-08-021-1/+1
| | | | | | * WakeUp is for singular changes (block breaking for example). The simulator should check blocks around the position and discover other affected blocks as it sees fit * AddBlock is for when you know a whole area is to be updated; chunk loading, or area wakeups for example + Prepares for correct handling of destroyed blocks after removal of SolidBlockHandler in the redstone simulator
* Replaced cpp14::make_unique<> with std::make_unique<>.Mattes D2020-08-011-18/+18
|
* cWorld * -> cWorld (#4771)Tiger Wang2020-07-141-16/+15
| | | * cWorld * -> cWorld
* Enable some more clang-tidy linter checks (#4738)peterbell102020-05-151-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Avoid inefficient AString -> c_str() -> AString round trip * Avoid redundant string init expressions * Avoid unnecessary return, continue, etc. * Add .clang-format to help with clang-tidy fix-its * Avoid unnecessary passing by value * Avoid unnecessary local copying * Avoid copying in range-for loops * Avoid over-complicated boolean expressions * Some violations missed by my local clang-tidy * Allow unnecessary continue statements * Add brackets * Another expression missed locally * Move BindingsProcessor call into clang-tidy.sh and add space * Fix pushd not found error * Different grouping of CheckBlockInteractionRate
* Remove old Android leftovers (#4722)Mat2020-05-071-1/+1
|
* Assert if world is incorrectMat2020-05-031-0/+1
|
* Set entity world earlymathiascode2020-05-031-1/+0
|
* Vector3 in Handlers (#4680)Mattes D2020-04-211-1/+1
| | | Refactored all cBlockHandler and cItemHandler descendants to use Vector3.
* More Vector3 in cBlockHandler (#4644)Mattes D2020-04-171-3/+3
| | | | | * cBlockHandler.OnUpdate uses Vector3 params. Also slightly changed how block ticking works.
* Using Super.Mattes D2020-04-161-2/+2
|
* Acquire chunk map CS when accessing player entitiesPeter Bell2020-04-131-27/+23
|
* Don't set entity world twice (#4606)Mat2020-04-091-1/+1
| | | | | * Don't set entity world twice * Call HookSpawnedEntity when the entity actually spawned
* Falling blocks can now be spawned at any position. (#4620)Mattes D2020-04-091-1/+1
| | | | | | | * Falling blocks can now be spawned at any position. * Added a /cake command to Debuggers that throws a cake in a nice slow arc. * Fixed regular falling blocks.
* Initial resource pack support (#4622)Mat2020-04-071-0/+7
|
* Implement wither skeletons (#4563)Mat2020-04-041-1/+1
|
* Pulled the BlockID and BlockInfo headers from Globals.h. (#4591)Mattes D2020-04-031-0/+1
| | | | | | | | | The BlockID.h file was removed from Globals.h and renamed to BlockType.h (main change) The BlockInfo.h file was removed from Globals.h (main change) The ENUM_BLOCK_ID and ENUM_ITEM_ID enum names were replaced with ENUM_BLOCK_TYPE and ENUM_ITEM_TYPE (cosmetics) The various enums, such as eDimension, eDamageType and eExplosionSource were moved from BlockType.h to Defines.h, together with the helper functions for converting between them and strings (StringToDimension et al.) (minor) Many inline functions were moved from headers to their respective cpp files, so that BlockType.h could be included only into the cpp file, rather than the header. That broke our tests a bit, since they pick bits and pieces out of the main code and provide stubs for the rest; they had to be re-stubbed and re-verified. eMonsterType values are no longer tied to E_ITEM_SPAWN_EGG_META_* values
* Fix explosion knockback issues and tweak knockback strength (#4590)peterbell102020-04-021-3/+6
|
* Fix client disconnect assert (#4579)peterbell102020-03-291-2/+6
|
* Lock hopper when powered by redstone (#4347)Bond-0092020-03-271-0/+9
| | | | | | | | | * Lock hopper when powered by redstone * Add to manual bindings * Add hopper API documentation Co-authored-by: Mat <mail@mathias.is>
* Disable bonemealable settings for now (#4551)Mat2020-03-261-0/+4
|
* Fix nether mob spawning (#4546)Mat2020-03-251-1/+1
| | | | | * Fix nether mob spawning * Remove zombie from nether mobs
* Pickup spawn improvements (#4525)Mat2020-03-231-4/+4
| | | Pickups are now thrown around when spawned, like in vanilla. Pickups also bail out of the collision detection checks while being created, to prevent them from blasting too far off in e.g. cobblestone generators.
* TNT position fixes (#4519)Mat2020-03-221-3/+8
| | | | | | | | | | | | | | | | | | | * TNT position fixes * Don't add offset to explosion spawn coords * Don't make other entities push TNT * Correct initial TNT speed * Fix typo * Improvements * Revert unwanted change * Style fixes * Update format
* Improve explosion visuals (#4511)Mat2020-03-211-1/+17
|
* Stabilise MoveToWorld (#4004)Mat2020-03-051-11/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Stabilise MoveToWorld * Fix comments and deprecate ScheduleMoveToWorld * Enhanced thread safety for m_WorldChangeInfo * Return unique_ptr from cAtomicUniquePtr::exchange * cWorld now calls entity cEntity::OnAddToWorld and cEntity::OnRemoveFromWorld. Allows broadcasting entities added to the world from the world's tick thread. This also factors out some common code from cEntity::DoMoveToWorld and cEntity::Initialize. As a consequence, cEntity::Destroy(false) (i.e. Destroying the entity without broadcasting) is impossible. This isn't used anywhere in Cuberite so it's now deprecated. * Update entity position after removing it from the world. Fixes broadcasts being sent to the wrong chunk. * Fix style * cEntity: Update LastSentPosition when sending spawn packet * Add Wno-deprecated-declarations to the lua bindings * Kill uses of ScheduleMoveToWorld
* Improved large jungle and acacia tree generation (#4413)NiLSPACE2019-12-221-7/+7
|
* Moved growing from cWorld / cChunk to cBlockHandler descendants.Mattes D2019-10-281-338/+35
|
* Refactored block-to-pickup conversion. (#4417)Mattes D2019-10-161-13/+57
|
* Refactored more of Entities and BlockEntities to use Vector3. (#4403)Mattes D2019-09-291-37/+40
|
* Fixed MSVC warnings (#4400)Mattes D2019-09-271-1/+1
|
* NBTChunkSerializer: Cleaned up interface.Mattes D2019-09-241-2/+2
| | | | | | Removed dependency on cChunkDataCallback. Moved all the serializing code into a worker class. Changed the serialization into a single-call action.
* Moved the generator defaults to ComposableGenerator.Mattes D2019-09-061-50/+5
|
* Separated chunk generator from world / plugin interfaces.Mattes D2019-09-061-10/+96
| | | | The generator now only takes care of servicing synchronous "GetChunk(X, Y)" and "GetBiomes(X, Y)" requests.
* Add a formatting function for Vector3 (#4282)peterbell102018-09-241-4/+4
| | | | | | | | | | * Vector3: Add custom fmt compatible formatter. * cLuaState: Add fmt version of ApiParamError * Use vector formatting in manual bindings * Always log vectors with FLOG
* Experience orb (#4259)changyong guo2018-08-021-3/+60
| | | | | | | * Replace cWorld::FindClosesPlayer with cWorld::DoWithClosestPlayer * Implement experience reward splitting into the orb sizes used in vanilla * Modified speed calculation in cExpOrb::Tick to make the orbs fly towards the player Fixes #4216
* cWorld: Manually bind deprecated broadcast functions (#4265)peterbell102018-07-271-15/+16
| | | Ref: https://github.com/cuberite/cuberite/pull/4264#discussion_r204769193
* CheckBasicStyle: Check number of empty lines between functions (#4267)peterbell102018-07-261-13/+3
| | | | Add check for number of empty lines between functions and fix the corresponding failures
* Broadcast refactor (#4264)peterbell102018-07-241-487/+18
| | | | | | | | | | | | | | | | | | | | | | | * Move Broadcast functions from cChunkMap to cBroadcaster - Remove cBroadcastInterface in favour of cBroadcaster. - cChunk: Remove broadcast functions. * resurect broadcast interface * Absorb cBroadcaster into cWorld. Removes the need for forwarding the function calls. * Improve const-correctness * Use Int8 instead of char + Comment `ForClients` functions * Improve comments * Broadcaster: Rename ForClients functions
* Rewrite explosion knock back (#4251)changyong guo2018-07-231-14/+1
| | | | | | | 1. Base knockback on an entity's bounding box intersection with the explosion 2. Armor blast protection reduces knockback 3. Don't apply knockback to players flying in creative mode Fixes #4139
* Removed duplicate code (#4198)Bond-0092018-04-111-1/+1
| | | Should also fix dogs not despawning
* Deal with covered switches consistently (#4161)peterbell102018-02-051-12/+6
| | | | | | | * Fixes a number of "<function>: not all control paths return a value" warnings on MSVC. * Introduces the UNREACHABLE global macro and uses it instead of conditionally compiled switch defaults. * Move cNBTParseErrorCategory from FastNBT.h into FastNBT.cpp to prevent bad calls to message()
* Add world name in logs from cWorld (#4148)Bond-0092018-01-161-3/+3
|
* improve rain simulation (#4017)Alexander Harkness2017-12-261-0/+28
| | | | | | | | | | | * Uses vanilla logic to decide which blocks rain falls through. * Rain falls infinitely above the world, and stops at y=0. * Entities will now be extinguished if they are under rain-blocking blocks, and fire will now be extinguished by rain similarly. * Create IsWeatherWetAtXYZ to identify wetness at a particular location. * Use new code for enderman rain detection. * Fixes issue #916 * Disable warnings for global constructors in the fire simulator.
* cWorld Threads: Seperate initialization and thread start.peterbell102017-10-211-2/+4
| | | | Prevents nullptr dereferences before Start has been called.
* cWorld: Move Initialization from Start to the constructor.peterbell102017-10-211-218/+224
| | | | Start now does nothing more than launch the world's threads.
* BroadcastBlockBreakAnimation and BroadcastBlockEntity use vectors (#4038)Bond-0092017-09-251-4/+4
|
* Changed BroadcastSoundEffect, SendSoundEffect, and CastThunderbolt parameters to vectors (#3959)Lane Kolbly2017-09-191-9/+39
| | | | | | | | | | | | | | | | | | * Made BroadcastSoundEffect take vector parameters. * Added docs for new vectored methods * Removed old code * Fixed lua warnings * Made old BroadcastSoundEffect not an override. * m_Block to m_BlockPos, used Vector3d constructor where prettier. * a_Block to a_BlockPos * Changed thunderbolt a_Block to a_BlockPos
* Removed UTF-8 BOM (#4033)Lukas Pioch2017-09-191-1/+1
|
* Replace ItemCallbacks with lambdas (#3993)peterbell102017-09-111-131/+61
|
* Made world data paths adjustable, and added API to temporarily disable saving chunks to disk. (#3912)Lane Kolbly2017-09-071-11/+21
|
* Changed some int parameters to vector parameters (#3937)Bond-0092017-09-071-4/+4
|
* Add cWorld::RemoveEntity and use in cEntity (#4003)peterbell102017-09-051-0/+30
| | | | | | * Add cWorld::RemoveEntity and use in cEntity * cEntity: Remove uneeded asserts from Destroy and DoMoveToWorld
* Revert "Replace ItemCallbacks with lambdas (#3948)"LogicParrot2017-09-021-63/+133
| | | | This reverts commit 496c337cdfa593654018c171f6a74c28272265b5.
* Replace ItemCallbacks with lambdas (#3948)peterbell102017-09-011-133/+63
|
* cWorld: Add entities without holding of m_CSEntitiesToAddpeterbell102017-08-291-9/+12
| | | | * Fixes deadlock when cWorld::AddEntity is called while holding chunk map CS.
* Add cUUID class (#3871)peterbell102017-08-251-2/+3
|
* Fully implemented leashes (#3798)Pablo Beltrán2017-08-211-0/+18
|
* Merge pull request #3489 from cuberite/EntityOwnershipTiger Wang2017-08-181-106/+148
|\ | | | | * Changed entity ownership model to use smart pointers
| * Changed entity ownership model to use smart pointersTiger Wang2017-08-071-106/+148
| |
* | Changed int parameters to vector parameters in cCuboid and simulators (#3874)Lane Kolbly2017-08-171-4/+14
|/
* Remove double includes part 2 (#3890)peterbell102017-08-031-1/+0
|
* Removed double includes (#3885)Lukas Pioch2017-08-021-5/+0
|
* cWorld::SendBlockTo take player by refpeterbell102017-08-011-1/+1
|
* Remove smart pointer macrospeterbell102017-07-211-3/+3
|
* Simulators: Added area-based wakeup.Mattes D2017-07-161-1/+1
|
* Changing pickup lifetime and combining semantics, making these adjustable in the lua api. (#3843)Lane Kolbly2017-07-121-0/+16
|
* Added bed entity (#3823)Lukas Pioch2017-07-071-0/+9
| | | | | | | | | | * Added bed entity * Export cBedEntity to lua * Set color of bed through item damage value * Added bed entity to APIDoc * NBT: Added loading and saving * Crafting recipes for the colored beds
* Let water vaporise in the Nether by defaultBond-0092017-06-201-5/+6
|
* Remove sign conversionpeterbell102017-06-161-5/+5
|
* FastRandom rewrite (#3754)peterbell102017-06-131-28/+36
|
* Exported boatLukas Pioch2017-05-241-2/+2
| | | | | | | - NBT: Added saving / loading of material - Added the material in the item handler of the boat - Drop the correct boat if destroyed - APIDoc: Added desc and functions
* Don't destroy monster when last target type is a player (#3721)Pablo Beltrán2017-05-211-2/+2
| | | In current Cuberite version if you are pursued by monsters you just have to disconnect and connect again to get rid of them. If no other player is in your chunk monsters will get destroyed.
* Tracer replacement (#3704)Mattes D2017-05-111-22/+16
| | | | | | * Replaced cTracer usage with cLineBlockTracer. * Exported new cLineBlockTracer utility functions to Lua API.
* Added missing checks for Initialize function and updated APIDocLukas Pioch2017-05-081-7/+40
|
* Changed world_end to world_the_end #3531 (#3538)Bond-0092017-02-241-2/+7
|
* Updated sounds and effect IDs (#3422)mathiascode2017-02-151-3/+3
|
* Added some blocks and items (#3503)mathiascode2017-02-141-0/+22
|
* Made survival the default gamemode (#3563)Lawton Mizell2017-02-071-1/+1
|
* World: Remember the age persistently. (#3556)Mattes D2017-01-191-0/+3
|
* World: Removed LineBlockTracer test code. (#3555)Mattes D2017-01-191-53/+0
| | | The test for LineBlockTracer is already in the Debuggers plugin (/spidey and testtracer commands).
* Removed asserts about chunk queued.Mattes D2017-01-191-2/+0
| | | | The assumption is not needed and was invalid under a stress-test.
* DeadlockDetect now lists some tracked CS's stats.Mattes D2017-01-181-2/+14
|
* World: Add check for unknown RedstoneSimulator (#3496)Fabian Stein2016-12-291-0/+5
|
* Initial support for the 1.11 protocol.Mattes D2016-12-161-2/+2
|
* Use CMake's Android generators to crosscompileTiger Wang2016-12-121-3/+3
|
* Removed ClientHandle.h dependencies from common headers.Mattes D2016-11-181-0/+9
|
* Spectators added (#2852)bibo382016-10-121-2/+20
|
* Configurable dirty unused chunk cap to avoid RAM overuse (#3359)LogicParrot2016-09-031-10/+32
| | | Configurable dirty unused chunk cap to avoid RAM overuse
* Delay EntityChangedWorld players' callback until Entity fully linked to world (#3330)ElNounch2016-08-221-10/+25
| | | | Otherwise, some API calls just don't seem to happen .gitignore tweak for test executables
* Added cWorld:SetSpawn() API and Lua binding (#3316)ElNounch2016-08-151-12/+29
|
* Fix tab list sometimes not updating after a player leaves. (#3280)Alexander Harkness2016-07-311-1/+1
| | | | | | When a player leaves the game, their client handle has its state changed to csDestroyed. This should fix issue #3138
* Updated API documentation.Mattes D2016-07-181-2/+2
|
* Makes tall grass and large flowers bonemealableQUSpilPrgm2016-06-031-12/+75
| | | | Adds the bonemeal particle effect to some more places
* Update Dispensers and let them act more like in VanillaQUSpilPrgm2016-06-031-61/+70
| | | | | | | | - Added code to make bonemeal, potions, minecarts, XP bottles and boats work inside dispensers - Dispensers are now able to place TNT if the block is transparent but not air - Added return value that indicates the success of pumpkin, melon, sugarcane and cactus growing functions - Changed return value of "GrowRipePlant" so that it actually indicates if the block was able to grow - Fixed "GrowSugarcane" and "GrowCactus" in "GrowRipePlant" so that it only grows them a single block
* 1.9 / 1.9.2 / 1.9.3 / 1.9.4 protocol support (#3135)Pokechu222016-05-141-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Semistable update to 15w31a I'm going through snapshots in a sequential order since it should make things easier, and since protocol version history is written. * Update to 15w34b protocol Also, fix an issue with the Entity Equipment packet from the past version. Clients are able to connect and do stuff! * Partially update to 15w35e Chunk data doesn't work, but the client joins. I'm waiting to do chunk data because chunk data has an incomplete format until 15w36d. * Add '/blk' debug command This command lets one see what block they are looking at, and makes figuring out what's supposed to be where in a highly broken chunk possible. * Fix CRLF normalization in CheckBasicStyle.lua Normally, this doesn't cause an issue, but when running from cygwin, it detects the CR as whitespace and creates thousands of violations for every single line. Lua, when run on windows, will normalize automatically, but when run via cygwin, it won't. The bug was simply that gsub was returning a replaced version, but not changing the parameter, so the replaced version was ignored. * Update to 15w40b This includes chunk serialization. Fully functional chunk serialization for 1.9. I'm not completely happy with the chunk serialization as-is (correct use of palettes would be great), but cuberite also doesn't skip sending empty chunks so this performance optimization should probably come later. The creation of a full buffer is suboptimal, but it's the easiest way to implement this code. * Write long-by-long rather than creating a buffer This is a bit faster and should be equivalent. However, the code still doesn't look too good. * Update to 15w41a protocol This includes the new set passengers packet, which works off of the ridden entity, not the rider. That means, among other things, that information about the previously ridden vehicle is needed when detaching. So a new method with that info was added. * Update to 15w45a * 15w51b protocol * Update to 1.9.0 protocol Closes #3067. There are still a few things that need to be worked out (picking up items, effects, particles, and most importantly inventory), but in general this should work. I'll make a few more changes tomorrow to get the rest of the protocol set up, along with 1.9.1/1.9.2 (which did make a few changes). Chunks, however, _are_ working, along with most other parts of the game (placing/breaking blocks). * Fix item pickup packet not working That was a silly mistake, but at least it was an easy one. * 1.9.2 protocol support * Fix version info found in server list ping Thus, the client reports that it can connect rather than saying that the server is out of date. This required creating separate classes for 1.9.1 and 1.9.2, unfortunately. * Fix build errors generated by clang These didn't happen in MSVC. * Add protocol19x.cpp and protocol19x.h to CMakeLists * Ignore warnings in protocol19x that are ignored in protocol18x * Document BLOCK_FACE and DIG_STATUS constants * Fix BLOCK_FACE links and add separate section for DIG_STATUS * Fix bat animation and object spawning The causes of both of these are explained in #3135, but the gist is that both were typos. * Implement Use Item packet This means that buckets, bows, fishing rods, and several other similar items now work when not looking at a block. * Handle DIG_STATUS_SWAP_ITEM_IN_HAND * Add support for spawn eggs and potions The items are transformed from the 1.9 version to the 1.8 version when reading and transformed back when sending. * Remove spammy potion debug logging * Fix wolf collar color metadata The wrong type was being used, causing several clientside issues (including the screen going black). * Fix 1.9 chunk sending in the nether The nether and the end don't send skylight. * Fix clang build errors * Fix water bottles becoming mundane potions This happened because the can become splash potion bit got set incorrectly. Water bottles and mundane potions are only differentiated by the fact that water bottles have a metadata of 0, so setting that bit made it a mundane potion. Also add missing break statements to the read item NBT switch, which would otherwise break items with custom names and also cause incorrect "Unimplemented NBT data when parsing!" logging. * Copy Protocol18x as Protocol19x Aditionally, method and class names have been swapped to clean up other diffs. This commit is only added to make the following diffs more readable; it doesn't make any other changes (beyond class names). * Make thrown potions use the correct appearence This was caused by potions now using metadata. * Add missing api doc for cSplashPotionEntity::GetItem * Fix compile error in SplashPotionEntity.cpp * Fix fix of cSplashPotionEntity API doc * Temporarilly disable fall damage particles These were causing issues in 1.9 due to the changed effect ID. * Properly send a kick packet when connecting with an invalid version This means that the client no longer waits on the server screen with no indication whatsoever. However, right now the server list ping isn't implemented for unknown versions, so it'll only load "Old" on the ping. I also added a GetVarIntSize method to cByteBuffer. This helps clean up part of the code here (and I think it could clean up other parts), but it may make sense for it to be moved elsewhere (or declared in a different way). * Handle server list pings from unrecognized versions This isn't the cleanest way of writing it (it feels odd to use ProtocolRecognizer to send packets, and the addition of m_InPingForUnrecognizedVersion feels like the wrong technique), but it works and I can't think of a better way (apart from creating a full separate protocol class to handle only the ping... which would be worse). * Use cPacketizer for the disconnect packet This also should fix clang build errors. * Add 1.9.3 / 1.9.4 support * Fix incorrect indentation in APIDesc
* Fix Crash on stopping the server (#3176)LogicParrot2016-05-011-2/+0
|
* Disable Enderman Spawn (Issue #3108) (#3170)benf5162016-04-301-2/+2
| | | Temporarily disabled enderman spawning until the glitches can be fixed
* Reduced unnecessary block updatesLogicParrot2016-04-221-11/+2
|
* Auto clean bad world linkagesLogicParrot2016-04-191-16/+14
|
* Updated cChunk::SetMeta, fixed grass growth, reduced markDirty/setMeta usageLogicParrot2016-04-161-2/+4
|
* Revert "Move mob tick code to cChunk"LogicParrot2016-04-061-0/+46
|
* Move mob tick code to cChunkLogicParrot2016-04-061-46/+0
|
* Fix adding players to worldLogicParrot2016-03-311-1/+1
|
* Entities are never lostLogicParrot2016-03-301-19/+13
|
* Rewrite mob tick codeLogicParrot2016-03-231-18/+41
|
* Add check if entity is in chunk before changing tick statusMarvin Kopf2016-02-211-2/+8
|
* Proper entity destruction in non-ticking chunksLogicParrot2016-02-191-10/+21
|
* Add forum link to linkage error messageLogicParrot2016-02-091-1/+1
|
* Improve world linkage error messageLogicParrot2016-02-081-2/+2
|
* Merge pull request #2961 from LogicParrot/enforceLogicParrot2016-02-081-0/+34
|\ | | | | [PhantomWorlds - 4] Prevent server from starting if there's bad world linkage
| * Prevent server from starting if there's bad world linkageLogicParrot2016-02-051-0/+34
| |
* | Proper world linkages and dimension types for newly created world.ini'sLogicParrot2016-02-061-2/+12
| |
* | Tab completion for player names now case insensitive.Marvin Kopf2016-02-051-1/+1
|/
* cMonster::m_Target safety across worldsLogicParrot2016-02-031-0/+20
|
* Fixed non-natural spawning near player (egg, breeding, etc.)LogicParrot2016-01-161-9/+0
|
* Do not spawn mobs too close to playerLogicParrot2016-01-121-54/+63
|
* Fixed default Nether generator params.Mattes D2015-12-301-1/+1
| | | | The prefab file is "NetherFort"
* Fixed spawn point. Wrong number for divisions and wrong highest spawn point.Lukas Pioch2015-12-201-3/+4
|
* Reorganised the redstone simulatorTiger Wang2015-12-181-4/+2
| | | | | | -> Many thanks to @worktycho for the idea, and @Haxi52 for the implementation plan! * Uses classes and inheritance now * Speed should be improved
* Changed Nether defaults to use PieceStructures.Mattes D2015-12-011-1/+1
|
* Add enum for Sound and Particle EffectsDave Tucker2015-11-241-10/+10
| | | | | | Fixes #2603 Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
* Improved spawn location calculations.samoatesgames2015-11-131-69/+168
| | | | | | | | | | - 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);)
* Implemented brewingLukas Pioch2015-11-031-0/+18
|
* The bottom layer cannot hold a valid spawn pointworktycho2015-10-011-0/+6
| | | | Fixes #2510
* Added weather intervals to world.ini settings.Mattes D2015-09-281-4/+46
|
* Prepared ScheduleTask for threading refactorTiger Wang2015-09-251-131/+35
| | | | | * Llama-ified and condensed Schedule/QueueTask - Removed hackery done with piston animations
* Add new "ForEach" function: ForEachLoadedChunk.tycho2015-09-241-0/+9
|
* Increase robustness of the logging subsystemtycho2015-09-151-6/+0
|
* Unified the doxy-comment format.Mattes D2015-07-311-1/+0
|
* Silenced and fixed many warning messages across multiple files.Samuel Barney2015-07-291-26/+28
|
* Spawn baby mobshallucino2015-07-161-1/+6
|
* Improved mapsTiger Wang2015-07-141-1/+2
|
* Sapling Growth UpdateSamuel Barney2015-07-131-2/+16
| | | | | | | | | * 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.
* Squashed Bonemeal Plant Growth UpdateSamuel Barney2015-07-061-13/+85
| | | | | | * Fixed Crops growing to maturity with only 1 bonemeal * Trees now go through growth stages with bonemeal, as they do in Vanilla Minecraft
* Merge pull request #2224 from cuberite/ChunkQueueCollapsingworktycho2015-07-041-14/+43
|\ | | | | Chunk queue collapsing: MK II
| * Fixed minor errors in Tycho's codeTiger Wang2015-06-221-1/+1
| | | | | | | | Everything should work now :)
| * Reinstate "Chunk queue collapsing"Tiger Wang2015-06-101-14/+43
| | | | | | | | | | This reinstates commit f36acb683594daff5af3971dcbe3c3a171628b78 and reverts commit adfbc42c021e1bcfcb355933c0fd784306ce0e18.
* | Added a size check for portals.STRWarrior2015-06-281-0/+4
| | | | | | | | | | | | Made the portal size configurable Alpha-sorted SetXYZNetherPortalXYZ functions
* | Buttons no longer click on when already on. Buttons now play sound when clicking off.Hax522015-06-241-3/+9
|/
* Redstone wire and trapdoor fixesTiger Wang2015-06-061-1/+1
| | | | | | * Fixes #1887 * Fixes #1763 * Fixes #1083
* Made cLightingThread own its callbackstycho2015-05-301-4/+4
|
* Clean up Spawn Preparetycho2015-05-301-136/+2
| | | | | 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
* Merge branch 'master' into PreventNewWarningstycho2015-05-231-1/+1
|\
| * Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher.Lukas Pioch2015-05-231-1/+1
| |
* | Merge branch 'master' into PreventNewWarningstycho2015-05-231-0/+1
|\|
| * Merge pull request #2030 from beeduck/masterworktycho2015-05-211-0/+1
| |\ | | | | | | Issue #1868 and Issue #1984
| | * Added thunder sound effect to CastThunderbolt()b33duck2015-05-211-0/+1
| | |
* | | Fixed compile and a few more warningstycho2015-05-191-1/+1
|/ /
* | Merge pull request #2019 from mc-server/OverrideArgsAlexander Harkness2015-05-191-5/+5
|\ \ | | | | | | Initial Implementation of command line arguments
| * | Move make_unique into a namespace to avoid ADL issuestycho2015-05-161-5/+5
| |/ | | | | | | this prevents VS finding std::make_unique for constructors that take types from std
* / Updated the defaults for the overworld world generatorSTRWarrior2015-05-171-1/+1
|/
* Update World.cppMartin Fahy2015-05-141-2/+2
| | | 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.
* CheckBasicStyle: checks spaces around * and &.Mattes D2015-05-091-1/+1
|
* More style checking.Mattes D2015-05-091-2/+2
| | | | Spaces around some operators are checked.
* Added support for additional data in the ParticleEffect Packettycho2015-05-071-9/+15
| | | | Also started refactoring how broadcasts are handled
* Added Guardian and Rabbit to DefaultMonsters in OverworldMathias2015-04-291-1/+1
|
* cSetChunkData constructor explicitly requires std::move() instead ofWoazboat2015-04-271-1/+1
| | | | unsafely stealing data
* Added GlowStone finisherSTRWarrior2015-04-191-1/+1
|
* Merge pull request #1826 from mc-server/UnifyPacketizerMattes D2015-03-241-23/+22
|\ | | | | Unify packetizer
| * Changed cEntity::m_UniqueID to UInt32.Mattes D2015-03-211-23/+22
| |
* | Changed linked world name variables and setters / getters.Mattes D2015-03-211-10/+10
| | | | | | | | | | Ref.: #1792 Ref.: https://github.com/mc-server/MCServer/pull/1792#discussion_r25946707
* | Added cPluginLua::cResettable interface, used for scheduled tasks.Mattes D2015-03-201-5/+5
|/ | | | | 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.
* Fixed a clang warning, improved comments.Mattes D2015-03-191-7/+4
|
* World:DoWithEntityByID() checks the entities-to-add as well.Mattes D2015-03-181-0/+14
| | | | 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.
* Merge pull request #1734 from mc-server/pistonsMattes D2015-03-141-1/+1
|\ | | | | Handle client 'leave bed' request
| * Reverted non-functional changesTiger Wang2015-03-051-25/+0
| |
| * Handle client 'leave bed' requestTiger Wang2015-02-081-1/+26
| | | | | | | | * Fixes #1728
* | Fixed a small bugtumultenrx2015-03-141-1/+1
| |
* | Monsters will now attack. Additional checks have been added when generating spawn.tumultenrx2015-03-131-4/+64
|/ | | | Monsters will now attack. Additional checks have been added when generating spawn.
* Converted cServer to use the cNetwork API.Mattes D2015-01-271-14/+17
|
* Fixed defect #71781 in Coverity list.Kirill Kirilenko2015-01-231-0/+5
|
* Fixed type conversion warnings.Mattes D2015-01-181-3/+3
|
* correct comment to say millisecondsworktycho2015-01-171-1/+1
|
* Initial convertion of a_Dt to std::chronoTycho2015-01-111-42/+37
| | | | also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay
* Created new type cTickTime and rewrote cWorld::TickThread to use itTycho2015-01-111-6/+5
|
* Refactored all player block placing to go through hooks.Mattes D2014-12-241-2/+11
| | | | Fixes #1618.
* Fix compile error on OS X introduced by commit ecf778bbec2794562bf5e5b8645e2171f7cd081cJonathan Fabian2014-12-221-1/+1
| | | | 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.
* cWorld: Moved initialization into constructor.Mattes D2014-12-211-3/+2
| | | | Fixes CID 71781.
* Merge pull request #1581 from mc-server/redstoneMattes D2014-12-171-3/+3
|\ | | | | Resplit redstone .inc file and provided improvements
| * Merge branch 'master' into redstoneTiger Wang2014-12-131-160/+182
| |\
| * | Cleaned up simulatorsTiger Wang2014-10-251-3/+3
| | |
* | | Fixed mob invisibilityHowaner2014-12-141-1/+0
| | |
* | | "& 0x0f" isn't neededHowaner2014-12-141-1/+1
| | |
* | | FixesHowaner2014-12-131-1/+15
| |/ |/|
* | Merge pull request #1657 from mc-server/PrepareChunkMattes D2014-12-111-2/+11
|\ \ | | | | | | Prepare chunk
| * | Added a cWorld:PrepareChunk function.Mattes D2014-12-101-2/+11
| | | | | | | | | | | | | | | It prepares the chunk - loads or generates it and lights it. The spawn prepare process uses this function.
* | | Merge pull request #1655 from tonibm19/patch-2Mattes D2014-12-101-1/+1
|\ \ \ | | | | | | | | Added NetherOreNests to default nether generator.
| * | | Moved NetherOreNeststonibm192014-12-101-1/+1
| | | |
| * | | Added NetherOreNests to nether default generator.tonibm192014-12-081-1/+1
| | | | | | | | | | | | Now there's quartz in the nether
* | | | Merge pull request #1623 from p-mcgowan/issue_1253Mattes D2014-12-101-0/+1
|\ \ \ \ | | | | | | | | | | Prevent multiple logins with same username, unless allowed in settings
| * | | | removed GetUsernames() from WorldVincent2014-11-301-15/+0
| | | | |
| * | | | fixed naming of strings and changed from i to IVincent2014-11-291-3/+7
| | | | |
| * | | | issue 1253 - prevent multiple logins with same usernameVincent2014-11-291-0/+12
| | | | |
* | | | | Moved NaturalPatches in front of PreSimulator and Animals.Mattes D2014-12-081-1/+1
| |/ / / |/| | |
* | | | Added NaturalPatches to finisherstonibm192014-12-081-1/+1
| |/ / |/| |
* | | Fixed crash on server stop.Mattes D2014-12-071-0/+9
| | | | | | | | | | | | | | | 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.
* | | Fixed c++11 branch issues.Mattes D2014-12-071-1/+3
| | |
* | | Merge remote-tracking branch 'origin/master' into c++11Tiger Wang2014-12-061-3/+3
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: src/OSSupport/Thread.cpp
| * \ \ Merge branch 'master' of github.com:p-mcgowan/MCServer into animalTerrainFinisherp-mcgowan2014-12-051-3/+3
| |\ \ \ | | | | | | | | | | | | | | | update
| | * | | Fixed reported parentheses around comparisons.Mattes D2014-12-051-2/+2
| | | | |
| * | | | forgot generation defaul initp-mcgowan2014-12-031-1/+1
| | | | |
* | | | | Merged branch 'origin/master' into c++11.Mattes D2014-12-041-3/+5
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Allow Spectator Gamemode as a world default.Jonathan Fabian2014-12-031-1/+1
| |/ / /
| * | | Added better soulsand rimsSTRWarrior2014-12-011-1/+1
| | | | | | | | | | | | | | | | As a finisher called SoulsandRims
| * | | Fixed a crash in cSpawnPrepare.Mattes D2014-11-301-0/+2
| | | |
| * | | Improved comments for cWorld::DoWithPlayer().Mattes D2014-11-301-1/+1
| |/ /
| * | Merge pull request #1604 from mc-server/GeneratorShapeRefactorMattes D2014-11-241-13/+17
| |\ \ | | | | | | | | Generator shape refactor
| | * | cWorld: Changed generator defaults.Mattes D2014-11-201-13/+17
| | | |
| * | | Changed back capitalization.Mattes D2014-11-241-3/+3
| | | |
| * | | cWorld: Rewritten spawn preparation.Mattes D2014-11-221-120/+111
| |/ / | | | | | | | | | | | | It now supports pregeneration distance of any size and runs in two threads in parallel (generator / lighting). Fixes #1597.
* | | Merge remote-tracking branch 'origin-master' into c++11Tiger Wang2014-11-261-132/+123
| | |
* | | Merge remote-tracking branch 'origin/master' into c++11Tiger Wang2014-11-231-9/+23
|\| | | | | | | | | | | | | | | | | Conflicts: src/Noise/Noise.h src/World.h
| * | Merge pull request #1598 from mc-server/SignEditorMattes D2014-11-181-9/+3
| |\ \ | | | | | | | | Fixed a security problem with signs.
| | * | Fixed a security problem with signs.Howaner2014-11-151-9/+3
| | | |
| * | | Merge branch 'master' into ViewDistanceHowaner2014-11-141-0/+17
| |\| |
| | * | Merge branch 'master' of https://github.com/mc-server/MCServerMattes D2014-11-061-1/+1
| | |\|
| | * | renamed FindAndDoWithUUID to DoWithPlayerByUUID, fixed style and comments, added description to APIDumpLukas Pioch2014-11-051-2/+3
| | | |
| | * | Simplified FindAndDoWithUUID, formatted lineLukas Pioch2014-11-021-7/+1
| | | |
| | * | Added FindAndDoWithUUIDLukas Pioch2014-11-021-0/+22
| | |/
| * / Added a MaxViewDistance option.Howaner2014-10-301-0/+3
| |/
* | Merged branch 'master' into c++11.Mattes D2014-10-241-6/+5
|\|
| * Merge pull request #1565 from mc-server/MergedIniFileMattes D2014-10-241-1/+1
| |\ | | | | | | Merged ini file
| | * Merged IniFile into main MCS sources.Mattes D2014-10-231-1/+1
| | |
| * | Merge branch 'master' into ChunkLoaderHowaner2014-10-231-35/+35
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/ChunkSender.cpp src/ClientHandle.cpp src/World.h
| | * En masse NULL -> nullptr replaceTiger Wang2014-10-231-35/+35
| | |
| * | Merge branch 'master' into ChunkLoaderHowaner2014-10-211-33/+40
| |\| | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp
| * | Stream 4 chunks per tick. Added priority.Howaner2014-10-061-4/+4
| | |
| * | Optimized chunk loaderHowaner2014-10-021-1/+0
| | |
* | | Missing space fix.Alexander Harkness2014-10-211-1/+1
| | |
* | | En masse NULL -> nullptr replaceTiger Wang2014-10-201-35/+35
| | |
* | | Migrated cSleep and cTimer to std::chronoTiger Wang2014-10-201-16/+11
| | |
* | | Migrated random generators to std::randomTiger Wang2014-10-191-1/+0
| |/ |/|
* | Functions in cPluginManager get references instead of pointers.Mattes D2014-10-151-5/+5
| |
* | cWorld: Fixed scheduler.Mattes D2014-10-131-9/+18
| | | | | | | | | | Fixes #1534. Added a test case into the Debuggers plugin.
* | Fixed style.Mattes D2014-10-131-2/+4
| |
* | Fix styleworktycho2014-10-121-2/+2
| |
* | Update World.cppworktycho2014-10-121-1/+1
| |
* | Fix lambda captureworktycho2014-10-111-1/+2
| |
* | Moved a few objects to unique_ptrtycho2014-10-101-29/+24
|/
* Fixed iron trapdoorsHowaner2014-09-301-2/+2
|
* World: Fixed chunk generation by plugins.madmaxoft2014-09-291-1/+1
| | | | ChunkWorx was broken, it was trying to generate chunks that were not properly marked as InQueue.
* Merge branch 'master' into FixesHowaner2014-09-261-6/+6
|\
| * Merge pull request #1419 from mc-server/redstoneTestsworktycho2014-09-261-6/+6
| |\ | | | | | | Added test mocking to IncrementalRedstoneSimulator
| | * Merge branch 'master' into redstoneTestsTycho2014-09-251-7/+83
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/Mobs/Monster.h
| | * \ Merge branch 'master' into redstoneTestsTycho2014-09-171-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/ChunkInterface.h
| | * | | Added first test to show the object can be createdTycho2014-09-171-3/+3
| | | | |
| | * | | IncrementalRedstoneSimulator now has no dependencies on cChunkTycho2014-09-161-1/+1
| | | | |
| | * | | Possibly decoupled IncrementalRedstoneSimulator from the rest of the serverTycho2014-09-111-3/+3
| | | | | | | | | | | | | | | | | | | | THis wil hopefully allow for unit testing
* | | | | Fixed players custom name in 1.8Howaner2014-09-261-2/+2
|/ / / /
* | | / Improved searching for spawn.madmaxoft2014-09-261-3/+14
| |_|/ |/| | | | | | | | Won't spawn on a small island inside ocean anymore.
* | | Merge branch 'master' into EntityCustomNameHowaner2014-09-231-45/+139
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/ClientHandle.h src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/World.cpp src/World.h
| * | | Exported player list states to extra functions.Howaner2014-09-181-3/+75
| | | |
| * | | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-131-1/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: src/Items/ItemHoe.h
| | * | Fixed farmland issues.Howaner2014-09-121-1/+1
| | |/
| * | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-121-12/+24
| |\|
| | * Actually set defaultworktycho2014-09-091-0/+1
| | |
| | * use the correct ASSERTworktycho2014-09-081-2/+2
| | |
| | * FIxed a couple more warningsTycho2014-09-081-2/+8
| | |
| | * TimeOfDay does not need to be an Int64Tycho2014-09-081-1/+1
| | |
| | * Fixed a few compile warningsTycho2014-09-081-9/+14
| | |
| * | 1.8: Added ParticleEffect packet.Howaner2014-09-111-2/+2
| | |
| * | Added the player list to the 1.8 protocol.Howaner2014-09-091-3/+3
| |/
| * Rewritten chunk status to specify whether the chunk is in queue.Mattes D2014-09-051-18/+20
| | | | | | | | This fixes #1370.
| * Merge remote-tracking branch 'origin/master' into EntitiesInBoxmadmaxoft2014-09-041-11/+10
| |\
| | * Merge pull request #1351 from LO1ZB/remove-a_RelYMattes D2014-09-031-11/+10
| | |\ | | | | | | | | remove y-coord from chunks
| | | * hopefully the last commit for removing y-coord from chunks. :)LO1ZB2014-09-031-11/+2
| | | |
| | | * me being stupidLO1ZB2014-08-291-1/+1
| | | |
| | | * add commentsLO1ZB2014-08-291-1/+2
| | | |
| | | * fix chunk regeneratingLO1ZB2014-08-291-0/+8
| | | |
| | | * remove y-coord from chunksLO1ZB2014-08-281-11/+10
| | | |
| * | | Added cWorld::ForEachEntityInBox()madmaxoft2014-09-031-0/+9
| |/ /
* / / Added SetCustomName() to players.Howaner2014-09-021-5/+9
|/ /
* | Merge branch 'master' into fixesmadmaxoft2014-08-301-2/+4
|\ \
| * | Rewritten block entity loading.Mattes D2014-08-291-2/+4
| |/ | | | | | | | | | | Block entities are now loaded based on the blocktype at the coords they specify; before loading, their type ("id" NBT tag) is checked. The chunk now expects that all block entities given to it via cChunk::SetAllData() have their valid blocktype; asserts if they don't. Fixes #1354.
* | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-08-291-19/+57
|\| | | | | | | | | Conflicts: src/Server.cpp
| * World: Report chunk count for the spawn area.Mattes D2014-08-221-1/+1
| |
| * Added cWorld initializers.Mattes D2014-08-211-0/+30
| |
| * Code formatting fixes.Howaner2014-08-191-0/+1
| |
| * CheckBasicStyle checks the src folder as well.madmaxoft2014-08-141-1/+1
| |
| * Exported daylight cycle flag to the protocol.Howaner2014-08-111-8/+1
| |
| * Added a comment and simplified code.Howaner2014-08-101-5/+2
| |
| * Added IsDaylightCycleEnabled saving.Howaner2014-08-101-0/+2
| |
| * Renamed functions.Howaner2014-08-101-3/+3
| |
| * Renamed m_DoDaylightCycle to m_CycleDaylight.Howaner2014-08-081-3/+3
| |
| * Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.Howaner2014-08-071-17/+32
| | | | | | I need this for a GameRule plugin.
* | Improved explosion damageTiger Wang2014-08-291-3/+6
|/
* Fixed issues with autocomplete and time loadingTiger Wang2014-08-011-7/+33
| | | | * Fixes #1274
* Merge pull request #1269 from Howaner/BlockEntitysMattes D2014-08-011-0/+10
|\ | | | | Added beacon.
| * Exported the beacon.Howaner2014-07-301-0/+10
| |
* | Capitalised "incremental"Howaner2014-07-311-4/+4
| |
* | Added a default value to WaterSimulator, LavaSimulator and RedstoneSimulator.Howaner2014-07-311-2/+2
|/
* Merged branch 'howaner/Options'.madmaxoft2014-07-301-0/+3
|\
| * Add "Broadcasting" settings to world.iniHowaner2014-07-271-0/+3
| |
* | Slight cleanup after portalsTiger Wang2014-07-291-2/+4
| |
* | Merge branch 'master' into portalsTiger Wang2014-07-291-32/+63
|\| | | | | | | | | Conflicts: src/World.h
| * Added a queue for setting chunk data.madmaxoft2014-07-241-32/+53
| | | | | | | | Fixes #1196.
| * Made the cWorld::SpawnMobFinalize function more readable.STRWarrior2014-07-241-0/+10
| |
* | SuggestionsTiger Wang2014-07-231-6/+3
| |
* | Speed improvements, crash fixes, & self-suggestionsTiger Wang2014-07-221-11/+6
| |
* | Suggestion and failed merge fixTiger Wang2014-07-221-0/+5
| |
* | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-221-9/+4
|\| | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp
| * Style: Normalized to no spaces before closing parenthesis.madmaxoft2014-07-211-1/+1
| |
| * Style: Normalized spaces after if, for and while.madmaxoft2014-07-211-3/+3
| |
| * Fixed style: spaces after commas.madmaxoft2014-07-191-1/+1
| |
| * World.cpp: fixed not all enum fields being used in m_Dimension switcharchshift2014-07-191-1/+2
| |
* | SuggestionsTiger Wang2014-07-211-56/+79
| |
* | Bug and crash fixesTiger Wang2014-07-201-8/+16
| | | | | | | | | | | | | | | | | | * Fixes end portals' solidity * Fixed crashes to do with multithreading and removing an entity from the wrong world * Fixed crashes due to bad merge * Fixed crashes due to an object being deleted twice * Simplified cWorld::Start() and added comments to configuration files
* | Fix failed merge and other issuesTiger Wang2014-07-181-10/+6
| |
* | Merge branch 'master' into portalsTiger Wang2014-07-181-48/+65
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp src/ClientHandle.h src/Entities/Player.cpp src/Entities/Player.h src/Generating/FinishGen.cpp src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol16x.cpp src/Protocol/Protocol16x.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/Root.h src/World.cpp
| * Normalized comments.madmaxoft2014-07-171-10/+10
| | | | | | | | | | This was mostly done automatically and then visually inspected for obvious errors. All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
| * Fixed spaces around single-line comments.madmaxoft2014-07-171-17/+15
| | | | | | | | There should be at least two spaces in front and one space after //-style comments.
| * Fixed basic whitespace problems.madmaxoft2014-07-171-5/+5
| | | | | | | | Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
| * Merge pull request #1192 from mc-server/skinuuidMattes D2014-07-161-1/+1
| |\ | | | | | | Skins
| | * Player properties are now retrievedTiger Wang2014-07-141-1/+1
| | |
| * | Fixed FindClosestPlayerTycho2014-07-151-3/+6
| | |
| * | Made CreateProjectile a pointerworktycho2014-07-131-1/+1
| | |
| * | Changed BroadcastSoundEffect function to take floating pos.Howaner2014-07-131-3/+3
| |/
| * Merge pull request #1154 from mc-server/trappedchestsTiger Wang2014-07-131-4/+13
| |\ | | | | | | Implemented trapped chests & others
| | * Implemented trapped chests & othersTiger Wang2014-07-071-4/+13
| | | | | | | | | | | | | | | | | | | | | + Added trapped chests * Fixed a bunch of bugs in the redstone simulator concerning wires and repeaters * Other potential bugfixes
| * | Implemented support for forced chunk ticking.madmaxoft2014-07-101-0/+9
| | | | | | | | | | | | Fixes #1160.
| * | Fixed arrow collection animationTiger Wang2014-07-091-9/+0
| |/ | | | | | | * Fixed piston extension non-solidness
| * Removed world-saving log messages.madmaxoft2014-07-041-2/+0
| | | | | | | | Ref.: http://forum.mc-server.org/showthread.php?tid=1518
| * Added generic entity-collecting.Mattes D2014-06-271-1/+10
| | | | | | | | | | Now any cEntity can be collected, not only cPickups. This should help PR #1098.
* | Merge branch 'master' into portalsTiger Wang2014-06-211-6/+9
|\| | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h
| * Nullify deleted pointers.archshift2014-06-191-6/+9
| |
* | Fixed invalid iteratorsTiger Wang2014-06-211-10/+4
| |
* | Fixed order of initalisationTycho2014-06-121-3/+4
| |
* | Portals animate and delay correctlyTiger Wang2014-06-121-3/+6
| |
* | Merge branch 'master' into portalsTiger Wang2014-06-101-30/+106
|\| | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/Player.cpp src/Entities/Player.h src/Protocol/Protocol125.cpp src/Protocol/Protocol17x.cpp
| * Fixed a race condition when adding a player to a world.madmaxoft2014-06-101-4/+1
| |
| * Fixed deadlock when moving players to other worlds.Mattes D2014-06-081-29/+82
| | | | | | | | Fixes #1039, fixes #851
| * Added queue for adding entities to cWorld.Mattes D2014-06-081-1/+27
| | | | | | | | This alone doesn't work properly yet, further changes to cPlayer are needed.
* | Portal improvements and suggestionsTiger Wang2014-06-101-5/+13
| |
* | Fixed Time of dayworktycho2014-06-071-1/+1
| |
* | SuggestionsTiger Wang2014-06-051-9/+2
| |
* | Time and weather is saved, part of #1058Tiger Wang2014-06-041-0/+12
| | | | | | | | Also fixed unreliability in Health and LootPickup loading.
* | Configurable portalsTiger Wang2014-06-041-0/+26
| |
* | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-06-041-2/+45
|\|
| * Changed block send queue to use vectorsTiger Wang2014-05-291-11/+10
| | | | | | | | As suggested by @worktycho.
| * Hopefully fixed piston duplication issuesTiger Wang2014-05-251-2/+46
| | | | | | | | | | * Fixes #879 * Fixes #714
* | Implemented end and nether portalsTiger Wang2014-05-311-0/+31
|/
* World pre-generation distance is settable in world.ini.Mattes D2014-05-091-2/+6
|
* Fixed MSVC 64-bit build warnings.Mattes D2014-05-091-4/+3
|
* Moved the weather picker out of TickWeather(), squashing a warning and improving readability.archshift2014-04-261-24/+26
|
* Removed impossible default case.archshift2014-04-261-6/+0
| | | | Squashed a warning.
* Removed extraneous switch{} in Start()archshift2014-04-261-15/+0
| | | | Squashed a warning.
* Small changes; warning fixing.archshift2014-04-251-6/+3
|
* Merge pull request #909 from jfhumann/fixesMattes D2014-04-221-5/+5
|\ | | | | | | | | Bug fixes and optimizations. We need to visit the API functions and check that they return only those values expected. `cWorld::CreateProjectile()` seems affected, too, by the same issue of ToLua returning extra values. In the cleanest form, these functions will need moving to ManualBindings.cpp
| * Merge remote-tracking branch 'origin/master' into fixesjfhumann2014-04-181-5/+4
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Authenticator.cpp src/ClientHandle.cpp src/Entities/Minecart.cpp src/Protocol/Protocol17x.cpp
| * | Did some static analysis, fixed some bugs and optimized a lot of codejfhumann2014-04-181-5/+5
| | |
* | | Fixed #904Tiger Wang2014-04-181-0/+5
| |/ |/|
* | Rewrote redstone powering to use power levelsTiger Wang2014-04-151-1/+1
| |
* | Simplified pickup speed randomisationTiger Wang2014-04-121-4/+3
|/
* Fixed double projectile spawning.madmaxoft2014-04-051-1/+0
| | | | Two spawn packets were sent per projectile.
* Removed unused constants.madmaxoft2014-03-251-3/+0
| | | | DeadlockDetect reads the value from the ini file, and world lighting has a separate queue now.
* Fixed code style after recent merge.madmaxoft2014-03-201-30/+28
|
* Added bracesTiger Wang2014-03-201-0/+2
|
* ENUMified shrapnel levelTiger Wang2014-03-201-3/+3
|
* Merge branch 'master' into awesometntTiger Wang2014-03-181-6/+5
|\ | | | | | | | | Conflicts: src/ChunkMap.cpp
| * Merge branch 'master' into warningsTycho2014-03-141-3/+3
| |\
| | * Fixed a warning.madmaxoft2014-03-141-3/+3
| | |
| * | Added additional macros to support the MSVC size_t format and changed all formats to use the macrosTycho2014-03-121-2/+2
| | |
| * | Merge branch 'Werror' into warningsTycho2014-03-121-1/+0
| |\| | | | | | | | | | | | | Conflicts: src/Globals.h
| | * Unified Vector classesandrew2014-03-111-1/+0
| | |
| * | Fixed more Format issuesTycho2014-03-111-2/+2
| |/
* | Added levels of shrapnelTiger Wang2014-03-181-1/+3
| |
* | Merge remote-tracking branch 'origin/master' into awesometntTiger Wang2014-03-101-11/+11
|\| | | | | | | | | | | Conflicts: src/Items/ItemLighter.h src/Simulator/IncrementalRedstoneSimulator.cpp
| * Merge pull request #768 from Howaner/BlockEntitysTiger Wang2014-03-091-2/+2
| |\ | | | | | | Add TNT load/save
| | * Merge branch 'master' into BlockEntitysHowaner2014-03-081-8/+18
| | |\
| | * | Change TNT Fuse to ticksHowaner2014-03-081-2/+2
| | | |
| * | | Merge branch 'master' into ballisticmissilesTiger Wang2014-03-091-27/+112
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: src/ClientHandle.cpp
| * | | Improved formatting of username tabcompleteTiger Wang2014-03-091-7/+7
| | | |
| * | | Implemented ballistic missiles (fireworks)Tiger Wang2014-02-271-2/+2
| | | | | | | | | | | | | | | | + Added fireworks
* | | | Merge branch 'master' into awesometntTiger Wang2014-03-101-27/+112
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #763 from Howaner/BlockEntitysMattes D2014-03-071-2/+11
| |\ \ \ | | | |/ | | |/| Add Flower Pots
| | * | Add Lua Bindings for FlowerPotEntity.h and add documentation.Howaner2014-03-071-2/+2
| | | |
| | * | Add Flower PotsHowaner2014-03-071-0/+9
| | | |
| * | | Merge remote-tracking branch 'xdot/master'madmaxoft2014-03-061-8/+18
| |\ \ \ | | |/ / | |/| |
| | * | Implemented vanilla-like fluid simulatorandrew2014-03-051-8/+18
| | | |
| * | | Fixed an assert in map-loading.madmaxoft2014-03-041-3/+1
| | | | | | | | | | | | | | | | The maps were loaded too soon, the world wasn't initialized yet.
| * | | Fixed previous weather changes.madmaxoft2014-03-031-3/+3
| | | | | | | | | | | | | | | | cWorld::GetDefaultWeatherInterval() returns -1 for unknown weather.
| * | | Merge pull request #746 from Howaner/SlabsMattes D2014-03-031-13/+81
| |\ \ \ | | |/ / | |/| | Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs
| | * | Add cancelling to WeatherChanging event.Howaner2014-03-021-13/+40
| | | |
| | * | More documentation (thanks to madmaxoft) and use GetBlockTypeMetaHowaner2014-03-021-4/+8
| | | |
| | * | Add Trapdoor Functions to cWorld and fix Trapdoor Redstone BugsHowaner2014-03-021-0/+37
| | |/
| * / cBlockInfo now manages the respective cBlockHandlerandrew2014-03-021-1/+1
| |/
* | Shrapnel now configurableTiger Wang2014-03-101-2/+1
| |
* | Added extra awesomeness to TNTTiger Wang2014-03-051-1/+5
|/ | | | | | | + TNT now has a chance of flinging FallingBlock entities around * Improved TNT damage * Improved TNT spawning visuals * Possible fix for 'SetSwimState failure' messages in debug
* Merge pull request #669 from xdot/masterTiger Wang2014-02-241-0/+8
|\ | | | | Implementation of in-game maps :D
| * Maps: Improvementsandrew2014-02-231-3/+3
| |
| * Thread safe cMap managerandrew2014-02-201-1/+2
| |
| * Manual merge (Fixed conflicts)andrew2014-02-201-95/+85
| |\
| * | Map item handler; Fixed several bugsandrew2014-02-171-8/+20
| | |
| * | Send map when selectedandrew2014-02-141-2/+43
| | |
| * | IDCount Serializationandrew2014-02-131-0/+54
| | |
* | | Merge pull request #700 from Howaner/GlobalFixesMattes D2014-02-201-4/+6
|\ \ \ | |_|/ |/| | Add new Trees (without Generator)
| * | Add BlockNewLeaves.h and rename Darkoac to DarkoakHowaner2014-02-191-6/+6
| | |
| * | Add new Trees (without Generator)Howaner2014-02-191-0/+2
| | |
* | | Merge pull request #697 from Howaner/SkullMattes D2014-02-191-0/+9
|\ \ \ | |/ / |/| | Add Skulls/Heads to MCServer
| * | Rename SkullEntity to MobHeadEntityHowaner2014-02-191-2/+2
| | |
| * | Add Heads completelyHowaner2014-02-181-0/+9
| | |
* | | The cuboid for cWorld::SetAreaBiome() doesn't need sorting.madmaxoft2014-02-181-1/+5
| | |
* | | Added cWorld:SetAreaBiome() API function.madmaxoft2014-02-181-0/+37
|/ / | | | | | | Fixes #675.
* | Removed the unnecessary LoopPlayersAndBroadcastChat() functions.madmaxoft2014-02-151-1/+1
| |
* | Implemented cCompositeChat.madmaxoft2014-02-151-1/+19
| | | | | | | | | | This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions. Fixes #678.
* | Merged branch 'narroo/master'.madmaxoft2014-02-131-0/+22
|\ \ | |/ |/| | | This merges pull request #661.
| * Fixed formatting. Moved UnloadUnusedChunks from public to private.narroo2014-02-111-0/+7
| |
| * Fixed formatting of previous commit.narroo2014-02-111-0/+5
| |
| * Fixed bug #385. UnloadUnusedChunks now has the same interface asnarroo2014-02-111-0/+10
| | | | | | | | | | | | SaveAllChunks. Meaning, QueueUnloadUnusedChunks and the supporting cTaskUnloadUnusedChunks has been added. Use QueueUnloadUnusedChunks from now on to prevent deadlocking.
* | More gcc warnings fixed.madmaxoft2014-02-111-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into ChunkStaymadmaxoft2014-02-091-6/+9
|\|
| * Fixed compile and some warnings in MSVSTiger Wang2014-02-091-2/+0
| |
| * Merge remote-tracking branch 'origin/master' into playerimprovementsTiger Wang2014-02-091-4/+36
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp
| * \ Merge branch 'master' into playerimprovementsTiger Wang2014-02-091-3/+3
| |\ \ | | | | | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua
| * | | Moved Gamemode setting into General root tagTiger Wang2014-02-071-1/+1
| | | |
| * | | Added sender name to PM if prefixes disabledTiger Wang2014-02-071-1/+1
| | | | | | | | | | | | | | | | * Also moved the PVP setting into Mechanics
| * | | Improved chat messaging functionsTiger Wang2014-02-071-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Moved string manipulation into cClientHandle and therefore... + Added configuration option for prefixes. * Cleaned up code. * Updated documentation for API.
* | | | Initial ChunkStay code.madmaxoft2014-02-081-12/+0
| |_|/ |/| |
* | | Fixed comment.STRWarrior2014-02-081-1/+1
| | |
* | | Renamed cRedstoneManager to cRedstoneSimulator and renamed cRedstoneSimulator to cIncrementalRedstoneSimulator (Might change later).STRWarrior2014-02-071-12/+8
| | |
* | | Implemented an easy way of adding new redstone simulators.STRWarrior2014-02-071-3/+37
| | | | | | | | | | | | Also added a "noop" redstone simulator that does the same as the fluid version.
* | | Merge pull request #646 from worktycho/warningfixesAlexander Harkness2014-02-051-2/+2
|\ \ \ | |_|/ |/| | Fixed most of the reordering warnings
| * | Fixed most of the reordering warningsTycho2014-02-051-2/+2
| | |
* | | Merge pull request #635 from tonibm19/masterMattes D2014-02-041-1/+1
|\ \ \ | |/ / |/| | Exported Item:IsEnchantable and Monster:MoveToPosition to Lua API
| * | Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua APItonibm192014-02-031-1/+1
| |/
* / Increased Type safety of BiomesTycho2014-02-031-2/+2
|/ | | | | Changed a number of funcictions from using integers to store biomes to using EMCSBiome Note that switching from an int to an Enum is a non-breaking chang to the lua bindings
* Merge pull request #602 from mc-server/improvementsandfixesMattes D2014-02-031-3/+3
|\ | | | | Redstone crash fix and current console line replace function
| * Added IsBlockWaterOrIce()Tiger Wang2014-02-021-1/+1
| |
| * Revert "Added LOGREPLACELINE for line replacement"Tiger Wang2014-02-021-5/+5
| | | | | | | | This reverts commit 7d03876a3e11aedff0201a8330bfdb2b5523fc5e.
| * Revert "Improved code"Tiger Wang2014-02-021-2/+0
| | | | | | | | This reverts commit d8aa0b0ec7a2ebea2fc157c623ae8cd7d0b6ba1c.
| * Possibly fixed #618Tiger Wang2014-02-021-2/+2
| |
| * Added checks for ice into IsBlockWater()Tiger Wang2014-02-011-1/+1
| | | | | | | | | | * This fixes players spawning in vast oceans of ice, as opposed to the previous water
| * Improved codeTiger Wang2014-01-311-0/+2
| | | | | | | | | | * Fixed some issues * Fixed standard violation
| * Added LOGREPLACELINE for line replacementTiger Wang2014-01-291-5/+5
| |
* | Changed pointers to referencesTycho2014-02-011-4/+3
| |
* | Merge branch 'master' into GeneratingBenchmark2Tycho2014-02-011-2/+2
|\ \ | | | | | | | | | | | | Conflicts: src/World.h
| * | Attempt at implementing #563tonibm192014-01-301-2/+1
| |/ | | | | Not tested (I don't have RasPi)
| * The world can now be configured wether farmers should be able to harvest crops.STRWarrior2014-01-271-0/+1
| |
* | Merge branch 'master' into GeneratingBenchmark2Tycho2014-01-261-3/+37
|\| | | | | | | | | | | Conflicts: src/Blocks/BlockRail.h src/World.h
| * Did what xoft recommendedTiger Wang2014-01-251-1/+1
| |
| * Mob bugfixesTiger Wang2014-01-251-2/+11
| | | | | | | | | | | | | | | | | | | | * Mobs no longer require constant line-of-sight to a player to remain aggravated * Fixed an ASSERT * Fixed mobs jumping * Fixed Idle state not properly using AI + Added FILE_IO_PREFIX to favicon loading + Implemented #563
| * Command block fixes 2andrew2014-01-231-1/+26
| |
* | Refactored cBlockHandler::OnUse and dependentsTycho2014-01-261-88/+5
|/
* cWorld now saves/loads the scoreboardandrew2014-01-221-0/+9
|
* Merge branch 'master' of https://github.com/mc-server/MCServerandrew2014-01-211-15/+21
|\
| * Changed the cWorld::ScheduleTask() signature.madmaxoft2014-01-191-11/+21
| | | | | | | | Now it takes the delay in ticks as an argument, and a cTask descendant as the task to run. Lua API has been updated similarly.
| * Merge pull request #551 from worktycho/schedularMattes D2014-01-191-6/+2
| |\ | | | | | | Implemented xoft's suggestion for a saturating counter in the scheduler
| | * Fixed iterators bugTycho2014-01-181-2/+1
| | |
| | * switched to using m_WorldAge rather than m_TickIDTycho2014-01-181-6/+3
| | |
| | * Increased tick count to longTycho2014-01-171-2/+2
| | |
| | * Implemented xsofts suggestion for a saturating counter in the schedulerTycho2014-01-171-5/+5
| | |
* | | Scoreboard protocol supportandrew2014-01-211-1/+56
|/ /
* | Merge pull request #559 from mc-server/SpawnMobParticlesMattes D2014-01-191-3/+0
|\ \ | | | | | | Removed the particles when a mob spawns.
| * | Removed the particles when a mob spawns.STRWarrior2014-01-181-3/+0
| | |
* | | Basic command block implementationandrew2014-01-181-0/+9
|/ /
* / Added user setting compression factorTycho2014-01-171-1/+3
|/
* Merge pull request #534 from mc-server/SpawnMinecartMattes D2014-01-171-0/+24
|\ | | | | Added cWorld::SpawnMinecart.
| * Renamed cEmptyMinecart to cRideableMinecartSTRWarrior2014-01-121-2/+2
| |
| * EmptyMinecarts should be able to get a block inside of them.STRWarrior2014-01-121-3/+3
| |
| * Added cWorld::SpawnMinecart.STRWarrior2014-01-121-0/+24
| |
* | added cWorld::ScheduleTask FunctionTycho2014-01-141-0/+39
|/ | | | | ScheduleTask schedules a SceduledTask object to be run x ticks in the future. In is exported to lua, fixes #150
* Decoupled cChunkGenerator from cWorld and cRoot.madmaxoft2014-01-101-1/+77
| | | | Now the chunk generator can be used by other projects without depending on the two hugest structures in MCS.
* rewrote queue not to use promises for waitsTycho Bickerstaff2014-01-021-1/+4
|
* fixed warnings in World.cppTycho Bickerstaff2013-12-311-1/+3
|
* Implented BroadcastParticleEffectSTRWarrior2013-12-221-0/+9
|
* Fixed the rest of constructor reorders.madmaxoft2013-12-201-6/+6
|
* Removed some old cRedstone remnantsTiger Wang2013-12-161-24/+0
|
* This adds the cWorld::BroadcastEntityEffect and cWorld::BroadcastRemoveEntityEffect functions.STRWarrior2013-12-151-0/+18
|
* Implemented note block playing and fixed wireTiger Wang2013-12-141-0/+9
| | | | Game of Thrones music in Minecraft, here I come!
* Improved pickups spawning speed againTiger Wang2013-12-101-4/+4
|
* Merge pull request #408 from mc-server/SpawnPoint_FixMattes D2013-12-081-1/+1
|\ | | | | Now spawn points will not be in deep oceans or rivers etc.
| * Now spawn points will not be in deep oceans or rivers etc.STRWarrior2013-12-081-1/+1
| |
* | Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeaturesTiger Wang2013-12-081-2/+13
|\| | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp
| * Moved bindings-related to a Bindings subfolder.madmaxoft2013-12-081-2/+1
| | | | | | | | Ref.: #407
| * Added a SpawnFallingBlock function so plugins can make other blocks fall.STRWarrior2013-12-071-0/+12
| |
* | Bonemeal has particles, fixes #393Tiger Wang2013-12-081-0/+6
| |
* | Renamed animation functionTiger Wang2013-12-071-2/+2
| | | | | | | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know.
* | Fixed duplication glitch with QueueSetBlockTiger Wang2013-12-061-2/+2
| | | | | | | | | | | | | | If a coordinate was queued, and then the block there was broken, it would reappear: double items! Also now just sets meta if previous and current blocktypes matched.
* | Added pickup invalid item checkTiger Wang2013-12-061-0/+11
|/ | | | | They aren't spawned at all if their itemtype isn't valid; possibly fixes the client crashing with bad pickups.
* Lava can spawn fire.madmaxoft2013-12-041-0/+1
| | | | Settable in world.ini, lava can spawn fire to fuel blocks near it. Fix #65.
* Changed cBlockHandler->OnUpdate() to use cChunk directly.madmaxoft2013-11-301-2/+2
|
* Explicitly set spawnpoint fixes.madmaxoft2013-11-301-20/+11
| | | | | The value names are case-insensitive. The debug message is printed only once.
* Added the real tick duration to the OnWorldTick hook.madmaxoft2013-11-301-9/+10
|
* Made TNT pickups spawning chance 25%Tiger Wang2013-11-271-1/+1
|
* Merged master into redstonefixesTiger Wang2013-11-271-11/+73
|
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-261-0/+12
| | | | | Conflicts: VC2008/MCServer.vcproj
* Fixed another one.Alexander Harkness2013-11-261-1/+1
|
* Attempt to fix compilationTiger Wang2013-11-241-1/+1
|
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-241-0/+18
| | | | | Conflicts: GNUmakefile
* Moved source to srcAlexander Harkness2013-11-241-0/+2715