summaryrefslogtreecommitdiffstats
path: root/src/Items/ItemBucket.h (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Use Vector3 for cLineBlockTracer and cBlockTracer (#4715)mBornand2020-05-081-7/+7
| | | * cLineBlockTracer uses Vector
* Vector3 in Handlers (#4680)Mattes D2020-04-211-10/+24
| | | Refactored all cBlockHandler and cItemHandler descendants to use Vector3.
* Pulled the BlockID and BlockInfo headers from Globals.h. (#4591)Mattes D2020-04-031-1/+2
| | | | | | | | | 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
* Replace buckets to the selected hotbar slot, rather than the first available. (#4580)Alexander Harkness2020-04-021-26/+6
| | | | | | | | | | | | | | | | | | | | | | | | * Replace buckets to the selected hotbar slot, rather than the first available. Replicates vanilla behaviour, as well as being more logical. * Refactor cInventory::AddItem. Behaviour is now documented * Add new cInventory::ReplaceOneEquippedItem and ::SetEquippedItem methods * Return empty potion to the same slot after drinking * Replace buckets correctly in other situations, not simply water and lava Uses the new ReplaceOneEquippedItem method * Correct collecting water from source block with bottle * Add cPlayer::ReplaceOneEquippedItemTossRest method * Handle stacked filled buckets (in theory) Use new cPlayer::ReplaceOneEquippedItemTossRest method
* Don't remove items twice (#4524)Mat2020-03-221-2/+1
| | | * Don't remove items twice
* Disable block placement in adventure mode (#4424)Mat2019-12-301-0/+12
|
* Refactored block-to-pickup conversion. (#4417)Mattes D2019-10-161-7/+5
|
* Buckets: Be able to place fluids through other fluids. (#4331)Zach DeCook2019-05-071-2/+2
|
* Keep players in gmNotSet (#4248)changyong guo2018-07-231-1/+1
| | | | This allows players game mode to update to the default after portal to another world. Fixes #4207
* Removed unneeded includes (#3902)Lukas Pioch2017-08-061-1/+0
|
* Tracer replacement (#3704)Mattes D2017-05-111-4/+5
| | | | | | * Replaced cTracer usage with cLineBlockTracer. * Exported new cLineBlockTracer utility functions to Lua API.
* Bulk clearing of whitespaceLogicParrot2016-02-051-12/+12
|
* Merge branch 'master' into PreventNewWarningstycho2015-05-281-2/+2
|\ | | | | | | | | Conflicts: src/Inventory.cpp
| * Merge pull request #2061 from mc-server/fixesAlexander Harkness2015-05-271-2/+2
| |\ | | | | | | Fixes
| | * Fixes #2052Tiger Wang2015-05-181-2/+2
| | |
* | | Merge branch 'master' into PreventNewWarningstycho2015-05-241-0/+14
|\| |
| * | Fixes #2059Blitz Rakete2015-05-211-0/+14
| |/
* / Made -Weverything an error.tycho2015-05-241-1/+1
|/
* Scooping up fluid calls the player placement hooks.Mattes D2015-04-141-4/+12
| | | | Ref.: #1857.
* Placing a fluid from bucket calls plugin hooks.Mattes D2015-04-141-19/+43
| | | | Ref.: #1857.
* Fixed various warnings.Mattes D2015-01-181-6/+6
|
* Removed more unessicary includesTycho2014-09-261-0/+1
|
* Fixed style: spaces after commas.madmaxoft2014-07-191-1/+1
|
* More trailing whitespace fixes.madmaxoft2014-07-171-4/+4
|
* 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 a bug with bucketsTiger Wang2014-07-161-1/+1
| | | | | * Additionally fixed cLineBlockTracer's EntryFace parameter when a block was hit on the first iteration along the projected line
* Fixed placing liquids over liquidsTiger Wang2014-07-141-1/+1
| | | | * Fixes #1182
* Comment grammar correctionTiger Wang2014-07-121-1/+1
|
* Simplified buckets code slightlyTiger Wang2014-07-121-32/+15
|
* Changesdaniel09162014-07-121-5/+4
|
* Changesdaniel09162014-07-111-24/+16
|
* Changesdaniel09162014-07-101-20/+22
|
* Maybe fixed whitespacesdaniel09162014-07-101-7/+7
|
* Maybe fixed whitespacesdaniel09162014-07-101-1/+1
|
* Fixed Bucket Placingdaniel09162014-07-101-6/+57
|
* Fixed Bucket placingdaniel09162014-07-091-1/+1
|
* Implemented lilypad placementTiger Wang2014-03-231-4/+4
|
* Improved Type safety of eBlockFaceTycho2014-02-041-2/+2
| | | | May Fix #640
* Changed Signiture of OnUpdateTycho2014-02-021-1/+4
|
* Fixed naming and initialization.madmaxoft2013-12-171-4/+12
|
* Forgot to change one Vector3d to Vector3i.STRWarrior2013-12-171-1/+1
|
* Renamed Pos to m_Pos.STRWarrior2013-12-171-3/+3
|
* Using Recommendations.STRWarrior2013-12-171-10/+23
|
* Made buckets work when the player does not 'look' at a block. This fixes #265STRWarrior2013-12-171-32/+53
|
* Moved source to srcAlexander Harkness2013-11-241-0/+160