summaryrefslogtreecommitdiffstats
path: root/src/Chunk.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Send entities in cChunkSender (#4532)Mat2020-06-241-13/+0
| | | Confer issue #3696
* Enable some more clang-tidy linter checks (#4738)peterbell102020-05-151-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* Add cEntity::GetBoundingBox, and use where appropriate. (#4711)Alexander Harkness2020-05-031-3/+2
| | | * Add cEntity::GetBoundingBox, and use where appropriate.
* Modify pickup collection behaviour to correspond to vanilla.Alexander Harkness2020-05-031-16/+4
| | | | As documented here: https://www.spigotmc.org/threads/item-pickup-radius.337271/#post-3141146
* Get biome at world coords on mob spawn (#4692)Mat2020-04-251-3/+4
|
* More Vector3 in cBlockHandler (#4644)Mattes D2020-04-171-34/+15
| | | | | * cBlockHandler.OnUpdate uses Vector3 params. Also slightly changed how block ticking works.
* Manage block entity lifetime with unique_ptr (#4080)peterbell102020-04-031-21/+10
|
* 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
* Lock hopper when powered by redstone (#4347)Bond-0092020-03-271-0/+11
| | | | | | | | | * Lock hopper when powered by redstone * Add to manual bindings * Add hopper API documentation Co-authored-by: Mat <mail@mathias.is>
* Fixed unloading of chunks that contain player entities (#4508)Max Luchterhand2020-03-181-0/+16
| | | | Co-authored-by: peterbell10 <peterbell10@live.co.uk> Co-authored-by: mluchterhand <mluchterhand@max.de>
* Blocks only drop pickups when using correct tool (#4505)Max Luchterhand2020-03-181-1/+7
| | | Co-authored-by: mluchterhand <mluchterhand@max.de>
* Moved growing from cWorld / cChunk to cBlockHandler descendants.Mattes D2019-10-281-301/+75
|
* Refactored block-to-pickup conversion. (#4417)Mattes D2019-10-161-59/+59
|
* Refactored more of Entities and BlockEntities to use Vector3. (#4403)Mattes D2019-09-291-6/+6
|
* Cactus can now grow and will be dropped if there is no place to grow.Lukas Pioch2019-09-291-4/+17
|
* Fixed MSVC warnings (#4400)Mattes D2019-09-271-6/+6
|
* Separated chunk generator from world / plugin interfaces.Mattes D2019-09-061-18/+1
| | | | 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-5/+5
| | | | | | | | | | * Vector3: Add custom fmt compatible formatter. * cLuaState: Add fmt version of ApiParamError * Use vector formatting in manual bindings * Always log vectors with FLOG
* CheckBasicStyle: Check number of empty lines between functions (#4267)peterbell102018-07-261-1/+8
| | | | Add check for number of empty lines between functions and fix the corresponding failures
* Broadcast refactor (#4264)peterbell102018-07-241-401/+1
| | | | | | | | | | | | | | | | | | | | | | | * 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
* Optimise chunk set (#4260)peterbell102018-07-231-89/+70
| | | | | | | | | | | | | | | | | Closes #1244 Initially I was just going to add the cChunkData to cSetChunkData but profiling revealed that the copying wasn't even the biggest slowdown. Much more time was being spent in cChunk::CreateBlockEntities and cChunk::WakeUpSimulators than was in memcpy so I've made those significantly faster as well. Optimisations performed: * cSetChunkData now stores blocks in a cChunkData object * cChunkData objects can now perform moves even if they are using different pools * cChunk::CreateBlockEntities now iterates in the correct order and only over present chunk sections * Similarly for cChunk::WakeUpSimulators * cSetChunkData::CalculateHeightMap now shortcuts to the highest present chunk section before checking blocks directly
* Prefer static_cast to reinterpret_cast (#4223)peterbell102018-05-021-3/+3
| | | | | | | * Change reinterpret_cast -> static_cast wherever possible * Remove more unnecessary `const_cast`s. reinterpret_casts should be avoided for the same reason as c-style casts - they don't do any type-checking. reinterpret_cast was mainly being used for down-casting in inheritance hierarchies but static_cast works just as well while also making sure that there is actually an inheritance relationship there.
* cChunk and cChunkData: Use vectors for block get and set functions (#4172)peterbell102018-02-041-20/+11
| | | | | * cChunkData: Change interface to use Vector3i * cChunk: Add Vector3i overloads for bounded block get and set functions.
* Fix explosion interaction with block entities. (#4052)peterbell102017-09-271-3/+4
| | | | | | * WriteBlockArea: Fix erasing of block entities. * cChunkMap::DoExplosionAt destroys block entities
* BroadcastBlockBreakAnimation and BroadcastBlockEntity use vectors (#4038)Bond-0092017-09-251-6/+6
|
* Changed BroadcastSoundEffect, SendSoundEffect, and CastThunderbolt parameters to vectors (#3959)Lane Kolbly2017-09-191-6/+6
| | | | | | | | | | | | | | | | | | * 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
* Replace ItemCallbacks with lambdas (#3993)peterbell102017-09-111-49/+34
|
* cBlockArea: change MakeIndex to return size_tpeterbell102017-09-111-1/+1
|
* Revert "Replace ItemCallbacks with lambdas (#3948)"LogicParrot2017-09-021-35/+50
| | | | This reverts commit 496c337cdfa593654018c171f6a74c28272265b5.
* Replace ItemCallbacks with lambdas (#3948)peterbell102017-09-011-50/+35
|
* Snow only generates on blocks with a block light level of 10 or less (#3931)Bond-0092017-08-211-1/+7
|
* Fully implemented leashes (#3798)Pablo Beltrán2017-08-211-0/+22
|
* Merge pull request #3918 from peterbell10/GetBlockEntityTiger Wang2017-08-181-7/+11
|\ | | | | cChunk: Don't assume GetBlockEntity coords are valid
| * cChunk: Don't assume GetBlockEntity coords are validpeterbell102017-08-101-7/+11
| |
* | Merge pull request #3489 from cuberite/EntityOwnershipTiger Wang2017-08-181-50/+77
|\ \ | | | | | | * Changed entity ownership model to use smart pointers
| * | Changed entity ownership model to use smart pointersTiger Wang2017-08-071-50/+77
| |/
* / Changed int parameters to vector parameters in cCuboid and simulators (#3874)Lane Kolbly2017-08-171-4/+7
|/
* Break the cactus block when it grows next to a block. (#3851)Bond-0092017-07-181-4/+31
|
* Simulators: Added area-based wakeup.Mattes D2017-07-161-1/+0
|
* BigFlower fixes (#3826)peterbell102017-07-071-1/+1
| | | | | | | * BigFlowers fixes * Correct upper part meta * Documented parameters to DoesIgnoreBuildCollision
* Added bed entity (#3823)Lukas Pioch2017-07-071-0/+12
| | | | | | | | | | * 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
* cBlockArea supports block entities. (#3795)Mattes D2017-06-241-7/+51
|
* Generated tall flowers have flower type meta in both blockspeterbell102017-06-191-1/+1
|
* Remove sign conversionpeterbell102017-06-161-1/+1
|
* FastRandom rewrite (#3754)peterbell102017-06-131-12/+19
|
* Store cChunk::m_BlockEntities in a map (#3717)peterbell102017-05-221-476/+183
| | | | | | * Store block entities in a map from block index * Cleanup ForEachBlockEntity * Cleanup DoWithBlockEntityAt
* Removed asserts about chunk queued.Mattes D2017-01-191-1/+0
| | | | The assumption is not needed and was invalid under a stress-test.
* Initial support for the 1.11 protocol.Mattes D2016-12-161-2/+2
|
* Spectators added (#2852)bibo382016-10-121-1/+10
|
* cChunk::SetAlwaysTicked implies cChunk::stay (#3361)LogicParrot2016-10-091-0/+2
|
* Configurable dirty unused chunk cap to avoid RAM overuse (#3359)LogicParrot2016-09-031-0/+13
| | | Configurable dirty unused chunk cap to avoid RAM overuse
* Makes tall grass and large flowers bonemealableQUSpilPrgm2016-06-031-0/+31
| | | | Adds the bonemeal particle effect to some more places
* Update Dispensers and let them act more like in VanillaQUSpilPrgm2016-06-031-8/+11
| | | | | | | | - 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-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* Out of world blocks are now always considered air blocksLogicParrot2016-04-231-10/+0
|
* Reduced unnecessary block updatesLogicParrot2016-04-221-10/+12
|
* Revert "Move mob tick code to cChunk"LogicParrot2016-04-061-40/+10
|
* Move mob tick code to cChunkLogicParrot2016-04-061-10/+40
|
* Improved player freeze codeLogicParrot2016-04-051-2/+13
|
* Players never fall through unloaded chunks or end up inside solids on teleportLogicParrot2016-03-311-1/+1
|
* Entities are never lostLogicParrot2016-03-301-3/+2
|
* Fix #3030Alexander Harkness2016-02-201-9/+1
| | | | Logicparrot's instructions
* Proper entity destruction in non-ticking chunksLogicParrot2016-02-191-48/+34
|
* cMonster::m_Target safety across worldsLogicParrot2016-02-031-1/+9
|
* Fixed cChunk::m_Entities corruption upon world travelLogicParrot2016-02-021-1/+28
|
* Updated old forum linksMathias2016-01-311-1/+1
|
* Spiders now friendly at daylight, new cChunk functionsLogicParrot2016-01-211-69/+94
|
* Reorganised the redstone simulatorTiger Wang2015-12-181-96/+0
| | | | | | -> Many thanks to @worktycho for the idea, and @Haxi52 for the implementation plan! * Uses classes and inheritance now * Speed should be improved
* allow use failures to propagate from the entity/block to the playerGargaj2015-12-131-2/+3
|
* Add enum for Sound and Particle EffectsDave Tucker2015-11-241-1/+1
| | | | | | Fixes #2603 Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
* Adjusted height validation using cChunkDef::IsValidHeight()Julian Laubstein2015-11-231-9/+9
|
* Implemented brewingLukas Pioch2015-11-031-0/+53
|
* Maked it compileable for clang-3.7Lukas Pioch2015-09-251-1/+1
|
* Fixed wrong assumtion regarding RemoveClienttycho2015-09-191-1/+5
| | | | Remove client can be called with a client that is not present in the chunk
* Fixed erasetycho2015-09-191-1/+1
|
* Removed a significant performance issue.tycho2015-09-181-78/+62
| | | | | | Iterating through the list of clients in chunks was taking up a significant amount of time with larger numbers of clients due to processor stalls. Changing the data structure to a vector fixed the issue.
* Unified the doxy-comment format.Mattes D2015-07-311-1/+0
|
* Silenced and fixed many warning messages across multiple files.Samuel Barney2015-07-291-25/+25
|
* Merge pull request #2224 from cuberite/ChunkQueueCollapsingworktycho2015-07-041-16/+0
|\ | | | | Chunk queue collapsing: MK II
| * Reinstate "Chunk queue collapsing"Tiger Wang2015-06-101-16/+0
| | | | | | | | | | This reinstates commit f36acb683594daff5af3971dcbe3c3a171628b78 and reverts commit adfbc42c021e1bcfcb355933c0fd784306ce0e18.
* | Added neighbor specification in the OnNeighborChanged() block callback.Mattes D2015-07-011-1/+1
| | | | | | | | | | Fixes the OnNeighborChanged endless recursion with large melon / pumpkin fields. Fixes #2213.
* | BlockArea: Fixed a crash with areas higher than chunk height.Mattes D2015-06-301-1/+1
| |
* | Call Neighbour changed handlers when a melon is createdtycho2015-06-231-0/+3
| | | | | | | | Should prevent cascading farmland updates on breaking melons
* | Fixed melon metadata when growing from stem.Mattes D2015-06-231-6/+9
|/
* Implemented nether portal scanning code.Lane Kolbly2015-06-101-1/+1
|
* Revert "Chunk queue collapsing"worktycho2015-06-071-0/+16
|
* Moved Chunk Broadcasts over to the regular queuetycho2015-06-051-16/+0
|
* Make -Werror disabling file onlytycho2015-05-191-2/+2
| | | | Ad fix a load of warnings
* Merge remote-tracking branch 'origin/master' into warningsTiger Wang2015-05-101-12/+12
|\ | | | | | | | | | | Conflicts: src/Mobs/Monster.cpp src/Vector3.h
| * CheckBasicStyle: checks spaces around * and &.Mattes D2015-05-091-9/+9
| |
| * More style checking.Mattes D2015-05-091-3/+3
| | | | | | | | Spaces around some operators are checked.
* | Fixed some Visual Studio warningsTiger Wang2015-05-091-1/+1
|/
* Merge pull request #1826 from mc-server/UnifyPacketizerMattes D2015-03-241-4/+4
|\ | | | | Unify packetizer
| * Fixed signedness warnings in Protocol.Mattes D2015-03-211-2/+2
| |
| * Changed cEntity::m_UniqueID to UInt32.Mattes D2015-03-211-2/+2
| |
* | Correct world height validations.Tommy Santerre2015-03-201-3/+3
|/ | | | | Unify the way we test block above the current one (Height - 1 instead of a_RelY + 1). Allow generation of world of flat height = 255
* Fixed client kick/crash if many block changes happendHowaner2015-03-091-3/+15
|
* Weather: Snow starts forming when the top block is at the right height or higherSTRWarrior2015-02-251-66/+57
|
* Fixed flowing water turning into ice when snowingSTRWarrior2015-02-251-1/+1
|
* fix logic bug in cChunk::FastSetBlock filtering out leaves meta changesRaekye2015-01-261-7/+9
| | | | - send update if it's not a leaves block and (the original checks)
* filter out leaves meta changes from being sent to the clientRaekye2015-01-261-0/+4
|
* Initial convertion of a_Dt to std::chronoTycho2015-01-111-1/+1
| | | | also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay
* Refactored all player block placing to go through hooks.Mattes D2014-12-241-8/+8
| | | | Fixes #1618.
* cChunk: Fixed missing initialization.Mattes D2014-12-211-0/+2
| | | | Fixes CID 72670.
* Merge branch 'master' into redstoneTiger Wang2014-12-131-9/+11
|\
| * Merged branch 'origin/master' into c++11.Mattes D2014-12-041-7/+10
| |\
| | * Merge branch 'master' into MobSpawnerHowaner2014-11-291-6/+6
| | |\
| | | * Chunk: Fixed same-name iterators.Mattes D2014-11-271-5/+5
| | | |
| | * | Merge branch 'master' into MobSpawnerHowaner2014-11-181-60/+60
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: MCServer/Plugins/Core
| | * \ \ Merge branch 'master' into MobSpawnerHowaner2014-09-261-5/+9
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/MobSpawner.h src/Mobs/Monster.h
| | * | | | Implemented mob spawner.Howaner2014-09-191-2/+5
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/master' into c++11Tiger Wang2014-11-231-1/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: src/Noise/Noise.h src/World.h
| | * | | | Moved all Noise-related files into a separate folder.Mattes D2014-11-181-1/+1
| | | |_|/ | | |/| |
| * | | | Merged branch 'master' into c++11.Mattes D2014-10-241-1/+1
| |\| | |
| * | | | En masse NULL -> nullptr replaceTiger Wang2014-10-201-51/+51
| | | | |
| * | | | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-10-201-1/+1
| |\ \ \ \
| * | | | | Migrated random generators to std::randomTiger Wang2014-10-191-1/+0
| | | | | |
* | | | | | Cleaned up simulatorsTiger Wang2014-10-251-3/+3
| |_|/ / / |/| | | |
* | | | | Use 3 priorities.Howaner2014-10-231-1/+1
| | | | |
* | | | | Merge branch 'master' into ChunkLoaderHowaner2014-10-231-51/+51
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ChunkSender.cpp src/ClientHandle.cpp src/World.h
| * | | | | En masse NULL -> nullptr replaceTiger Wang2014-10-231-51/+51
| | |/ / / | |/| | |
* | | | | Use two lists and 2 chunk send prioritys.Howaner2014-10-211-1/+1
| | | | |
* | | | | Merge branch 'master' into ChunkLoaderHowaner2014-10-211-7/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp
| * | | | Fixed error with non-const functionJulian Laubstein2014-10-191-1/+1
| |/ / /
| * | | Merge pull request #1502 from mc-server/furnacesTiger Wang2014-10-181-1/+1
| |\ \ \ | | | | | | | | | | Improved furnaces
| | * | | Furnaces now update their block entity typeTiger Wang2014-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | Therefore improving cChunk's variable boundary checking.
| | * | | Improved furnacesTiger Wang2014-10-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed progress bar on 1.8 * Fixed bugs * Improved code * Fixes #1068 * Fixes #1070
| * | | | Functions in cPluginManager get references instead of pointers.Mattes D2014-10-151-5/+5
| |/ / /
* / / / Stream 4 chunks per tick. Added priority.Howaner2014-10-061-1/+1
|/ / /
* | | Update Chunk.cppworktycho2014-09-281-1/+1
| | |
* | | Use factory method to construct redstone simulator dataTycho2014-09-281-1/+1
| |/ |/|
* | Merge branch 'master' of https://github.com/mc-server/MCServerTycho2014-09-261-0/+3
|\ \
| * | Fixed issue with castingtycho2014-09-261-0/+3
| | |
* | | Removed more unessicary includesTycho2014-09-261-0/+1
|/ /
* | Merge branch 'master' into redstoneTestsTycho2014-09-251-2/+2
|\ \ | | | | | | | | | | | | Conflicts: src/Mobs/Monster.h
| * | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-121-1/+1
| |\|
| * | 1.8: Added ParticleEffect packet.Howaner2014-09-111-2/+2
| | |
* | | Merge branch 'master' into redstoneTestsTycho2014-09-171-1/+1
|\ \ \ | | |/ | |/| | | | | | | Conflicts: src/Blocks/ChunkInterface.h
| * | Fixed a redstone sim failure with droppers.Mattes D2014-09-111-1/+1
| |/
* / Possibly decoupled IncrementalRedstoneSimulator from the rest of the serverTycho2014-09-111-3/+3
|/ | | | THis wil hopefully allow for unit testing
* Removed chunk's unused Y coord.Mattes D2014-09-061-3/+3
| | | | This fixes the second issue of #1313.
* Rewritten chunk status to specify whether the chunk is in queue.Mattes D2014-09-051-12/+38
| | | | This fixes #1370.
* Merge remote-tracking branch 'origin/master' into EntitiesInBoxmadmaxoft2014-09-041-4/+3
|\
| * Merge pull request #1351 from LO1ZB/remove-a_RelYMattes D2014-09-031-4/+3
| |\ | | | | | | remove y-coord from chunks
| | * remove y-coord from chunksLO1ZB2014-08-281-4/+3
| | |
* | | Added cWorld::ForEachEntityInBox()madmaxoft2014-09-031-0/+25
|/ /
* / Rewritten block entity loading.Mattes D2014-08-291-0/+10
|/ | | | | | 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.
* Code formatting fixes.Howaner2014-08-191-0/+1
|
* CheckBasicStyle checks the src folder as well.madmaxoft2014-08-141-10/+16
|
* Fixed style issuesTycho2014-08-061-3/+3
|
* Removed dependecy of redstone simulator on NoteBlockTycho2014-08-051-0/+1
|
* Refactored Redstone simulator not to depend on TNTEntity or DropSpenserENtity DirectlyTycho2014-08-051-0/+34
|
* Exported the beacon.Howaner2014-07-301-0/+33
|
* Merge branch 'master' into portalsTiger Wang2014-07-291-23/+17
|\ | | | | | | | | Conflicts: src/World.h
| * Added a queue for setting chunk data.madmaxoft2014-07-241-23/+17
| | | | | | | | Fixes #1196.
* | Speed improvements, crash fixes, & self-suggestionsTiger Wang2014-07-221-12/+7
| |
* | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-221-46/+47
|\| | | | | | | | | | | | | | | 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-43/+43
| |
| * Style: Normalized spaces after if, for and while.madmaxoft2014-07-211-2/+3
| |
| * Fixed style: spaces after commas.madmaxoft2014-07-191-3/+3
| |
* | SuggestionsTiger Wang2014-07-211-3/+3
| |
* | Bug and crash fixesTiger Wang2014-07-201-3/+2
| | | | | | | | | | | | | | | | | | * 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
* | Merge branch 'master' into portalsTiger Wang2014-07-181-94/+125
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2/+2
| | | | | | | | | | 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-11/+11
| | | | | | | | There should be at least two spaces in front and one space after //-style comments.
| * Fixed basic whitespace problems.madmaxoft2014-07-171-14/+14
| | | | | | | | Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
| * Changed BroadcastSoundEffect function to take floating pos.Howaner2014-07-131-2/+2
| |
| * Merge pull request #1154 from mc-server/trappedchestsTiger Wang2014-07-131-3/+5
| |\ | | | | | | Implemented trapped chests & others
| | * Suggestions and bug fixTiger Wang2014-07-121-1/+1
| | | | | | | | | | | | | | | | | | * Fixed hoppers pushing/pulling to/from (trapped)chests that do not form a double-chest with the chest type directly connected to said hopper; thank you, @madmaxoft
| | * Implemented trapped chests & othersTiger Wang2014-07-071-3/+5
| | | | | | | | | | | | | | | | | | | | | + Added trapped chests * Fixed a bunch of bugs in the redstone simulator concerning wires and repeaters * Other potential bugfixes
| * | Fixed style consistency.madmaxoft2014-07-101-59/+62
| | |
| * | Implemented support for forced chunk ticking.madmaxoft2014-07-101-2/+28
| |/ | | | | | | Fixes #1160.
| * Added generic entity-collecting.Mattes D2014-06-271-2/+2
| | | | | | | | | | Now any cEntity can be collected, not only cPickups. This should help PR #1098.
* | Merge branch 'master' of https://github.com/mc-server/MCServer into portalsTiger Wang2014-06-241-0/+6
|\|
| * Added asserts for cChunk::GetBlockEntity() coords.Mattes D2014-06-241-0/+6
| |
* | Merge branch 'master' into portalsTiger Wang2014-06-211-2/+7
|\| | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h
| * Nullify deleted pointers.archshift2014-06-191-0/+4
| |
| * Merge branch 'master' of github.com:mc-server/MCServerTycho2014-06-161-1/+3
| |
* | Fixed invalid iteratorsTiger Wang2014-06-211-23/+10
| |
* | Fixed order of initalisationTycho2014-06-121-2/+2
| |
* | Removed unnessicary indirection from Entity iterator listTycho2014-06-121-5/+5
| |
* | Portals animate and delay correctlyTiger Wang2014-06-121-41/+33
| |
* | Merge branch 'master' into portalsTiger Wang2014-06-101-0/+1
|\| | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/Player.cpp src/Entities/Player.h src/Protocol/Protocol125.cpp src/Protocol/Protocol17x.cpp
| * Redstone fixes and improvements [SEE DESC]Tiger Wang2014-06-051-0/+1
| | | | | | | | | | | | | | | | Haha, see desc. * Improved redstone speed through a marking dirty system. Only a select few devices are still continuously simulated * Fixed redstone crashing with recent piston changes
* | Portal improvements and suggestionsTiger Wang2014-06-101-1/+14
| |
* | SuggestionsTiger Wang2014-06-051-2/+5
| |
* | Removed use of autoTiger Wang2014-06-041-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-06-041-163/+52
|\|
| * Merge remote-tracking branch 'origin/pistonfixes'Tiger Wang2014-06-021-14/+16
| |\ | | | | | | | | | | | | Conflicts: src/Chunk.cpp
| | * Suggestions twoTiger Wang2014-06-011-7/+9
| | |
| | * More comments!Tiger Wang2014-05-291-5/+4
| | |
| | * Hopefully fixed piston duplication issuesTiger Wang2014-05-251-5/+6
| | | | | | | | | | | | | | | * Fixes #879 * Fixes #714
| * | Added comments, reformatted code.madmaxoft2014-05-291-3/+3
| | |
| * | Implemented style changesTycho2014-05-241-2/+2
| | |
| * | Fixed stylistic issuesTycho2014-05-211-2/+2
| | |
| * | Renamed cChunkBuffer to cChunkDataTycho2014-05-211-19/+19
| | |
| * | Fixed minor style issuesTycho2014-05-211-4/+4
| | |
| * | Fixed bug in setting metasTycho2014-05-101-18/+0
| | |
| * | Merge branch 'master' into chunksparsing/structsTycho2014-05-101-1/+19
| |\| | | | | | | | | | | | | Conflicts: src/Chunk.h
| * | Fixed bad mergeTycho2014-04-271-13/+9
| | |
| * | Merge branch 'master' into chunksparsing/structsTycho2014-04-271-14/+19
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Chunk.h
| * | | Implemented Chunk Sparsing with segmentsTycho2014-04-261-153/+33
| | | |
* | | | Implemented end and nether portalsTiger Wang2014-05-311-36/+38
| | | |
* | | | Cauldrons fillTiger Wang2014-05-291-1/+0
| |_|/ |/| |
* | | Merge branch 'master' into redstoneimprovementsTiger Wang2014-05-041-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/FallingBlock.cpp src/Mobs/AggressiveMonster.cpp src/Simulator/IncrementalRedstoneSimulator.cpp
| * | | Fixed a buffer overflow in cChunk:SetLight().madmaxoft2014-05-021-2/+2
| | |/ | |/| | | | | | | There are only half as many bytes for light than there are blocktypes.
* / | Redstone simulator now directly accesses cChunkTiger Wang2014-04-271-1/+19
|/ / | | | | | | | | | | * Redstone simulator performance improvements * Added return values to some functions * Minor fixes
* | Merge pull request #863 from mc-server/chunkysparsingMattes D2014-04-261-33/+97
|\ \ | | | | | | Chunky sparsing
| * | Implemented commentsTiger Wang2014-04-251-6/+6
| | |
| * | Fixed indentTiger Wang2014-04-241-1/+1
| | |
| * | Another small speed improvement?Tiger Wang2014-04-241-12/+2
| | |
| * | Implemented suggestionsTiger Wang2014-04-241-22/+6
| |/
| * Replaced all the .data() calls so the code compiles in VS2008Tycho2014-04-101-5/+5
| |
| * Maybe speed improvements?Tiger Wang2014-04-071-47/+28
| | | | | | | | | | * Use a single index to determine from when to begin copying data * Use heightmap to determine first nonair block
| * Attempt to fix errorsTiger Wang2014-04-071-2/+2
| |
| * Blocklight and skylight now compressedTiger Wang2014-04-071-24/+82
| |
| * Nibbletypes are compressedTiger Wang2014-04-051-15/+34
| | | | | | | | | | + Added nibble compression * Fixed an off by one
| * Speed and memory improvementsTiger Wang2014-04-041-61/+14
| | | | | | | | * Changed array to be continuous, so no more layer splitting
| * Merge remote-tracking branch 'origin/master' into chunkysparsingTiger Wang2014-04-031-1/+12
| |\
| * | Fixed some bugsTiger Wang2014-04-031-3/+5
| | | | | | | | | | | | | | | * Fixed undefined behaviour * Fixed compression failure
| * | Performance improvements and chunk flipping fixedTiger Wang2014-04-021-30/+32
| | |
| * | Sort of implementation of chunk sparsingTiger Wang2014-03-231-17/+92
| | | | | | | | | | | | | | | | | | | | | Issues: * Chunks are flipped * Slow/inefficient/badly coded * Only blocktypes are 'compressed'
* | | Merge pull request #909 from jfhumann/fixesMattes D2014-04-221-2/+2
|\ \ \ | | | | | | | | | | | | | | | | 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
| * | | Did some static analysis, fixed some bugs and optimized a lot of codejfhumann2014-04-181-2/+2
| | | |
* | | | Implemented the skeleton code for the beacon.STRWarrior2014-04-121-0/+2
|/ / / | | | | | | | | | There is no handling for the GUI. It can now check how big the pyramid is under the beacon.
* | / Fixed missing - that caused all neighbour lookups to go to the chunkmapTycho2014-04-081-1/+1
| |/ |/|
* | Merge pull request #838 from mc-server/lilypadsworktycho2014-03-301-1/+1
|\ \ | | | | | | Lilypads
| * | Fixed a potential crashTiger Wang2014-03-281-1/+1
| |/
* / Fixed chunk neighbor-getting for long distances.madmaxoft2014-03-271-0/+11
|/ | | | This fixes a server hang when teleporting to coords too far away.
* Add Lua Bindings for FlowerPotEntity.h and add documentation.Howaner2014-03-071-1/+1
|
* Add Flower PotsHowaner2014-03-071-0/+35
|
* g_BlockXXX => cBlockInfo::XXXandrew2014-03-011-5/+5
|
* Removed an unused member variable from cChunk.madmaxoft2014-02-241-7/+0
|
* Merge pull request #697 from Howaner/SkullMattes D2014-02-191-0/+35
|\ | | | | Add Skulls/Heads to MCServer
| * Rename SkullEntity to MobHeadEntityHowaner2014-02-191-3/+3
| |
| * Add Heads completelyHowaner2014-02-181-0/+33
| |
| * Add Skulls/HeadsHowaner2014-02-171-0/+2
| |
* | Added cWorld:SetAreaBiome() API function.madmaxoft2014-02-181-0/+32
|/ | | | Fixes #675.
* Initial ChunkStay code.madmaxoft2014-02-081-1/+0
|
* Changed Signiture of OnUpdateTycho2014-02-021-4/+10
|
* Changed pointers to referencesTycho2014-02-011-1/+1
|
* Changed signitures of Several BLockHandler MethodsTycho2014-02-011-2/+4
| | | | | | | | | | | | | Changed the signitures of the following to use interfaces: GetPlacementBlockTypeMeta OnPlaced OnPlacedByPlayer OnDestroyed OnNeighbourChanged NeighbourChanged OnUse CanBeAt Check
* Basic command block implementationandrew2014-01-181-0/+34
|
* Disabled excessive entity-related logging in Debug mode.madmaxoft2014-01-161-2/+15
|
* fixed bad mergeTycho Bickerstaff2013-12-221-4/+0
|
* merged in changesTycho Bickerstaff2013-12-221-0/+9
|\
| * Merge branch 'master' of github.com:mc-server/MCServerTycho Bickerstaff2013-12-221-0/+16
| |\
| * | Chunk is now warnings cleanTycho Bickerstaff2013-12-211-3/+2
| | |
* | | merged in warnings changesTycho Bickerstaff2013-12-221-11/+4
| |/ |/|
* | Implented BroadcastParticleEffectSTRWarrior2013-12-221-0/+16
|/
* Fixed the rest of constructor reorders.madmaxoft2013-12-201-20/+21
|
* Attempt at fixing cChunkDef::Height signedness.madmaxoft2013-12-201-6/+1
|
* This adds the cWorld::BroadcastEntityEffect and cWorld::BroadcastRemoveEntityEffect functions.STRWarrior2013-12-151-0/+32
|
* Implemented note block playing and fixed wireTiger Wang2013-12-141-0/+32
| | | | Game of Thrones music in Minecraft, here I come!
* Improved redstone loading performanceTiger Wang2013-12-131-2/+10
|
* Fixed QueueSetBlock not sending to client changesTiger Wang2013-12-131-2/+1
|
* Redstone data is now loaded on chunk loadTiger Wang2013-12-131-0/+6
|
* Fixed warning unchecked enum value at Chunk.cpp line 841worktycho2013-12-091-2/+4
|
* Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeaturesTiger Wang2013-12-081-1/+1
|\ | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp
| * Moved bindings-related to a Bindings subfolder.madmaxoft2013-12-081-1/+1
| | | | | | | | Ref.: #407
* | Added basic ender chestsTiger Wang2013-12-071-0/+2
| | | | | | | | Note that they just mirror chests now, so no per player inventory.
* | 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-5/+26
|/ | | | | | | 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.
* Fixed an error in cChunk's block ticking.madmaxoft2013-12-041-2/+2
| | | | Absolute coords were passed to a handler expecting relative coords.
* Changed cBlockHandler->OnUpdate() to use cChunk directly.madmaxoft2013-11-301-1/+18
|
* Fixed VC2008 compilation, normalized include paths.madmaxoft2013-11-271-1/+1
|
* Fixed some of tiger's derpyness.Alexander Harkness2013-11-271-1/+1
|
* Fixed loads more of them.Alexander Harkness2013-11-261-1/+1
|
* Attempt to fix compilationTiger Wang2013-11-241-2/+2
|
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-241-7/+51
| | | | | Conflicts: GNUmakefile
* Moved source to srcAlexander Harkness2013-11-241-0/+2732
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 05:04:12 +0100