summaryrefslogtreecommitdiffstats
path: root/src/Chunk.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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-10 06:28:41 +0100