summaryrefslogtreecommitdiffstats
path: root/src/Blocks/BlockBed.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Temporarily commented out override directives."Tycho2014-09-051-2/+2
| | | | | | | | | | | | | | | This reverts commit 6db727c60c01264dc9a9c209c5b335da8f53cd64. Conflicts: src/Bindings/PluginLua.h src/Blocks/BlockFire.h src/Generating/ChunkGenerator.h src/LoggerListeners.cpp src/Mobs/Components/AIAggressiveComponent.h src/Mobs/Monster.h src/OSSupport/IsThread.h src/Protocol/Authenticator.h src/UI/SlotArea.h
* Temporarily commented out override directives.Samuel Barney2014-08-211-2/+2
|
* Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-221-3/+3
|\ | | | | | | | | | | | | | | 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-2/+2
| |
| * Fixed style: spaces after commas.madmaxoft2014-07-191-1/+1
| |
* | Merge branch 'master' into portalsTiger Wang2014-07-181-6/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Basic style fixes.madmaxoft2014-07-171-2/+2
| |
| * Normalized comments.madmaxoft2014-07-171-4/+4
| | | | | | | | | | 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.
* | Implemented bed homesTiger Wang2014-06-011-0/+2
| | | | | | | | | | | | + Implemented bed home positions * Fixed some inventory and health server/client mismatches after world change
* | Very minor code changesTiger Wang2014-05-291-1/+1
|/
* Fixed VERIFYTiger Wang2014-03-091-1/+1
|
* Beds now work properly fixes #707Tiger Wang2014-03-091-7/+66
| | | | | | | | Also fixes FS392 Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp
* BlockBed.cpp: Fixed space at if statementTheJumper2014-02-201-1/+1
| | | Added a space after an if statement and before the first bracket to keep up code conventions.
* BlockBed.cpp: Fixed Multiple people in one bed.TheJumper2014-02-201-7/+18
| | | OnUse in BlockBed.cpp now checks whether bit flag 0x4 in the Data values of the bed is set before somebody can try to sleep in the bed.
* Merge branch 'master' into playerimprovementsTiger Wang2014-02-091-2/+2
|\ | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua
| * Improved Type safety of eBlockFaceTycho2014-02-041-2/+2
| | | | | | | | May Fix #640
* | Server internally uses new functionsTiger Wang2014-02-061-1/+1
|/
* Changed pointers to referencesTycho2014-02-011-16/+16
|
* Changed signitures of Several BLockHandler MethodsTycho2014-02-011-1/+1
| | | | | | | | | | | | | Changed the signitures of the following to use interfaces: GetPlacementBlockTypeMeta OnPlaced OnPlacedByPlayer OnDestroyed OnNeighbourChanged NeighbourChanged OnUse CanBeAt Check
* Refactored cBlockHandler::OnUse and dependentsTycho2014-01-261-5/+5
|
* First attempt at Implementing InterfacesTycho2014-01-251-16/+16
|
* Moved source to srcAlexander Harkness2013-11-241-0/+88
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 02:47:23 +0100