summaryrefslogtreecommitdiffstats
path: root/src/BlockEntities (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fix potential destruction crashes (#5095)Tiger Wang2021-01-0216-225/+221
| | | | | | | | | | * Fix potential destruction crashes * Fix destructors accessing destroyted objects * Fix cPlayer not destroying windows (Destroyed never called) * Tentatively fixes #4608, fixes #3236, fixes #3262 - Remove cEntity::Destroyed() and replace with cEntity::OnRemoveFromWorld() * Add missing call to OnRemoveFromWorld
* Command Blocks: fix a crashTiger Wang2020-12-301-3/+3
| | | | * Don't store a temporary
* Comment and code style fixTiger Wang2020-12-211-13/+8
| | | | | + Add static keyword - Don't capture everything in lambda
* Add correct implementation of crops (#4802)0ddlyoko2020-11-061-38/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [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>
* Remove BLOCKENTITY_PROTODEFTiger Wang2020-10-2421-153/+10
|
* Adding more customize options to mob spawners and improving the way to look for surrounding entities (#4955)12xx122020-10-102-80/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added nearly any customize option * fixed unnecessary diff added comments * removed unnecessary const qualifier * fixed build * changed to ForEachEntityInBox * added docs * updated lua api description * checkstyle * added changes suggested by @peterbell10 And now the player may break the server by setting ridiculous ranges * updated docs changed cast to static cast * fixed clang * fixed clang on WSSAnvil.cpp Co-authored-by: 12xx12 <12xx12100@gmail.com>
* Beacon now checks for players in surrounding square (#4972)12xx122020-10-091-21/+14
| | | | | | | | | | | | | * Beacon now check for players in surrounding square not every player * added proper BoundingBox Co-authored-by: Alexander Harkness <me@bearbin.net> * one symbol to change everything one symbol to break the whole build Co-authored-by: 12xx12 <12xx12100@gmail.com> Co-authored-by: Alexander Harkness <me@bearbin.net>
* Remove SetProperty(...cPlayer)Tiger Wang2020-10-034-4/+4
| | | | Enchantment table, anvil windows are already opened one per-player.
* Fixing Mob spawner behaviour (#4930)12xx122020-09-272-20/+15
| | | | | | | | | | | | | | | | | | | * fixed mob spawner failure (whoopsie in the BlockEntity.GetChunkZ()) Style * fixed spawning behaviour * fixed saving entity type saving * checkstyle * removed debug log * removed short saving * Style Co-authored-by: 12xx12 <12xx12100@gmail.com> Co-authored-by: Tiger Wang <ziwei.tiger@outlook.com>
* Do not call into things we don't own in destructorsTiger Wang2020-09-252-14/+0
| | | | | - Remove improper accesses in cChunk destructor * Fixes #4894
* Deleted BiomeDef.h and ChunkDef.h from Globals.h (#4885)KingCol132020-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Removed BiomeDef.h * Removed ChunkDef.h from Globals.h * Added to CONTRIBUTORS. * Re-added empty last line to Globals.h * Included stddef and StringUtils in BiomeDef.h * Fixed build tools compiling. It compiles, but at what cost? * Added include to src/Generating/Trees.h * Include added in ChunkGeneratorThread.h * Moved rearranged includes in LineBlockTracer.cpp * Re-arrange headers in ChunkInterface.cpp * Included ChunkDef.h in Path.h * Included ChunkDef.h in NBTChunkSerializer.h * Rearranged included and added required includes to headers. * Removed unnecessary included in StringUtils.h.
* BlockEntity: clarify ConvertToPickups behaviourTiger Wang2020-09-251-1/+1
|
* Unify block entity pickup conversionTiger Wang2020-09-2511-1/+68
| | | | | - Removed normal BlockHandler knowledge of block entities during conversion + Added cBlockEntity::ConvertToPickups that handles it
* Small cleanup in JukeboxesTiger Wang2020-09-252-13/+18
| | | | * Fixed creative players not tracking stats, and the code trying to "place" a record when they used one
* Limit fortune level, style fixesTiger Wang2020-09-231-3/+2
|
* Implement Dropspenser Hook (#4903)KrystilizeNevaDies2020-09-212-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Implement Dropspenser Hook Implemented a hook for dropspensing. HOOK_DROPSPENSE When plugin callback returns true then dropspense is cancelled * Update src/Bindings/PluginManager.h Co-authored-by: peterbell10 <peterbell10@live.co.uk> * Create OnDropSpense.lua * Fix indent * Forgot include Forgot to include the plugin manager. Although now im confused why it was working on my end without including the plugin manager * Update plugins.lua with dropspense * fix typos * haha notepad++ go brr Co-authored-by: peterbell10 <peterbell10@live.co.uk>
* Added end portal and enchanting table block entities12xx122020-09-206-19/+178
|
* Add more statistic tracking (#4837)12xx122020-09-0510-1/+35
| | | | | | | | + Added possible 1.8 stats + Added stat tracking for 1.8.2 + Added stat tracking for 1.9 + Added the breed cow achievement Co-authored-by: 12xx12 <12xx12100@gmail.com>
* Use pitch lookup in noteblock block entity (#4826)12xx122020-09-052-45/+80
| | | | | | | - Removed the calculation in the noteblock block entity I did the calculation in python if anyone is interested where the numbers are from Co-authored-by: 12xx12 <12xx12100@gmail.com>
* Streamline startup sequenceTiger Wang2020-09-051-1/+1
| | | | | * Clean up cRoot & main * Move some OS-specifics into OSSupport
* Remove redundant DoWithChunkAt in chestsTiger Wang2020-08-282-12/+6
|
* Remove unused variables in ChestEntity/BlockEntityWithItemsTiger Wang2020-08-212-4/+0
|
* Add Statistics and Achievements for newer Network standards12xx122020-08-191-1/+1
|
* Remove the redstone solid block handlerTiger Wang2020-08-082-8/+2
| | | | | | | - Remove cSolidBlockHandler * Functionality now integrated into simulator dispatcher * Fix door double open/close issues, arisen due to the top/bottom halves getting different power + Small migration to block states for redstone wire
* Always use relative coordinates in AddBlockTiger Wang2020-08-023-42/+44
| | | | | + Pass block, use relatives * Fixes everything immediately converting abs back to rel and getting block, when these data were already available
* Replaced cpp14::make_unique<> with std::make_unique<>.Mattes D2020-08-011-19/+19
|
* Call BlockEntityWithItems from ChestEntity slot changed handlerTiger Wang2020-07-262-37/+53
| | | | | * Small degree of unification for what to do with the current entity * Make sure to do necessary actions for both sides of a double chest
* Precompile unordered_map/setTiger Wang2020-07-191-1/+0
| | | | | | + Add inclusions to Globals.h * Sort Globals.h - Remove sys/stat.h from Globals.h
* Upgrade to C++17 [CMake] (#4717)Tiger Wang2020-05-161-8/+2
| | | * Make our CMake slightly less insane
* Enable some more clang-tidy linter checks (#4738)peterbell102020-05-153-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* Update submodules (#4727)peterbell102020-05-091-1/+1
| | | | | | | | | | | | | Closes #4708 This updates jsoncpp, mbedtls, TCLAP and SQLiteCpp to their latest stable release. A few additional changes were needed: * jsoncpp deprecated Reader, FastWriter and StyledWriter which I've replaced with some helper functions in JsonUtils.cpp * SQLiteCpp changed how it builds with external sqlite libraries, now expecting them to be installed. The simplest path was to remove sqlite from cuberite's submodule and just use SQLiteCpp's internal version.
* Update DispenserEntity.cppLukas Pioch2020-04-251-1/+1
| | | Removed unneeded cast
* Fixed spawning of mobs from dispenserLukas Pioch2020-04-251-2/+3
|
* Using Super.Mattes D2020-04-1637-59/+59
|
* Block entity for beacon was not created (#4618)Lukas Pioch2020-04-041-0/+1
|
* Manage block entity lifetime with unique_ptr (#4080)peterbell102020-04-032-29/+29
|
* Pulled the BlockID and BlockInfo headers from Globals.h. (#4591)Mattes D2020-04-036-3/+8
| | | | | | | | | 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-272-4/+25
| | | | | | | | | * Lock hopper when powered by redstone * Add to manual bindings * Add hopper API documentation Co-authored-by: Mat <mail@mathias.is>
* Play sound when brewing is completeMat2020-03-231-0/+1
|
* Jukebox improvements (#4537)Mat2020-03-232-4/+23
| | | | | * Add jukebox block handler Co-authored-by: peterbell10 <peterbell10@live.co.uk>
* Don't remove items twice (#4524)Mat2020-03-221-1/+1
| | | * Don't remove items twice
* Remove leading slash from command block commands (#4502)Mat2020-03-191-6/+20
|
* Prevent container item duplication (#4476)Mat2020-03-042-15/+0
|
* Moved growing from cWorld / cChunk to cBlockHandler descendants.Mattes D2019-10-283-22/+22
|
* Fixed crash in hopper while pulling items from blockentity above itself (#4412)NiLSPACE2019-10-041-2/+2
|
* Refactored more of Entities and BlockEntities to use Vector3. (#4403)Mattes D2019-09-2938-399/+420
|
* Wake up redstone simulator on slot changes for blockentities (#4348)Bond-0092019-08-112-0/+16
| | | | | Fix #1898 Fix #2194 Fix #3063
* Add a formatting function for Vector3 (#4282)peterbell102018-09-242-7/+7
| | | | | | | | | | * Vector3: Add custom fmt compatible formatter. * cLuaState: Add fmt version of ApiParamError * Use vector formatting in manual bindings * Always log vectors with FLOG
* Force all headers other than "Globals.h" to be included with relative paths (#4269)peterbell102018-08-296-9/+6
| | | | | | | Closes #4236 CMake now creates a header file in the build directory under the path "include/Globals.h" which just includes "src/Globals.h" with an absolute path. Then instead of adding "src/" to the include directories, it adds "include/". #include "Globals.h" still works by including the build generated file and any other src-relative path will not work.
* cWorld: Manually bind deprecated broadcast functions (#4265)peterbell102018-07-272-3/+3
| | | Ref: https://github.com/cuberite/cuberite/pull/4264#discussion_r204769193
* CheckBasicStyle: Check number of empty lines between functions (#4267)peterbell102018-07-266-12/+4
| | | | Add check for number of empty lines between functions and fix the corresponding failures
* Broadcast refactor (#4264)peterbell102018-07-241-4/+2
| | | | | | | | | | | | | | | | | | | | | | | * 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
* Prefer static_cast to reinterpret_cast (#4223)peterbell102018-05-0215-15/+15
| | | | | | | * 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.
* Smelting Gives Experience (#4094)Alex Sweet2018-04-112-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Smelting Exp Smelting now gives experience * Furnace.txt update Exp rewards are entered in furnace.txt, Reward calculation is now done is the furnaceentity class * furnace.txt update Changed alignment tabs to spaces Included documentation of exp in recipe * Updated StringToFloat changed strtod to strtof * Explicit Float to Int * Reworked Smelting Rewards * No C casts -Adds new function to the api -Sets reward counter to 0 in furnace constructor * Style and exp lock removed -Fixed style mistakes accoring to PR notes -XP isn't locked to a single player anymore * No Smelter API -Removed SetLastSmelter and GetLastSmelter -Fixed comments -Fixed log reward amounts
* Add the fmt library (#4065)peterbell102018-01-031-0/+1
| | | | | | | * Replaces AppendVPrintf with fmt::sprintf * fmt::ArgList now used as a type safe alternative to varargs. * Removed SIZE_T_FMT compatibility macros. fmt::sprintf is fully portable and supports %zu. * Adds FLOG functions to log with fmt's native formatting style.
* cChunkInterface GetBlock, GetBlockMeta, GetBlockTypeMeta use vectors (#4050)Bond-0092017-11-201-4/+3
|
* Fixed 2 small warnings (#4055)Bond-0092017-10-022-7/+3
|
* BroadcastBlockBreakAnimation and BroadcastBlockEntity use vectors (#4038)Bond-0092017-09-255-14/+12
|
* Changed BroadcastSoundEffect, SendSoundEffect, and CastThunderbolt parameters to vectors (#3959)Lane Kolbly2017-09-192-6/+4
| | | | | | | | | | | | | | | | | | * 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-192-2/+2
|
* Fix switch warnings (#4013)peterbell102017-09-142-10/+12
| | | | | | | | | | | | | | | * Fix switch warnings * Fix a variety of -Wswitch and -Wswitch-enum warnings * Remove unneeded -Wno-error flags * Reorganise some eMonsterType switches * Alpha sort eMonsterType cases in WriteMobMetadata and in cNBTChunkSerializer::AddMonsterEntity * List all mob types in protocol 1.12 and NBTChunkSerializer * cStructGenTrees::GetNumTrees: remove switch default * cWSSAnvil::LoadOldMinecartFromNBT: Log unhandled minecart type
* Replace ItemCallbacks with lambdas (#3993)peterbell102017-09-114-107/+43
|
* Changed some int parameters to vector parameters (#3937)Bond-0092017-09-071-2/+2
|
* Revert "Replace ItemCallbacks with lambdas (#3948)"LogicParrot2017-09-024-43/+107
| | | | This reverts commit 496c337cdfa593654018c171f6a74c28272265b5.
* Replace ItemCallbacks with lambdas (#3948)peterbell102017-09-014-107/+43
|
* Add cUUID class (#3871)peterbell102017-08-252-9/+14
|
* Award player an achievement when creating a beacon (#3930)Bond-0092017-08-211-13/+36
|
* cBeaconEntity fix no world crashpeterbell102017-08-181-1/+4
|
* Merge pull request #3489 from cuberite/EntityOwnershipTiger Wang2017-08-181-2/+2
|\ | | | | * Changed entity ownership model to use smart pointers
| * Changed entity ownership model to use smart pointersTiger Wang2017-08-071-2/+2
| |
* | Sitting cats block enderchests from opening (#3906)Bond-0092017-08-172-25/+11
|/
* Removed double includes (#3885)Lukas Pioch2017-08-021-1/+0
|
* Added basic ocelot behavior (#3829)Bond-0092017-07-121-2/+29
|
* Added bed entity (#3823)Lukas Pioch2017-07-074-0/+106
| | | | | | | | | | * 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
* Added 1.12 blocks (#3760)Bond-0092017-06-302-3/+41
|
* cBlockArea supports block entities. (#3795)Mattes D2017-06-242-3/+56
|
* Fixed missing "override"Mattes D2017-06-161-1/+1
|
* BlockEntities: Support cloning self.Mattes D2017-06-1637-231/+538
|
* FastRandom rewrite (#3754)peterbell102017-06-132-7/+7
|
* Fixes problems with windows:Lukas Pioch2017-06-057-7/+7
| | | | | - Changed cPlayer:OpenWindow to accept a ref, tolua adds a nil check - Close open lua window in destructor, to avoid dangling pointers
* Fixed double chests (#3741)peterbell102017-06-032-7/+24
| | | | | Normal and trapped chests next to each other don't open a double chest window. Slot changes in the secondary chest are broadcast. Placing a chest in +x of another updates the original chest's metadata.
* Minor cBrewingRecipes cleanup (#3731)peterbell102017-05-281-4/+4
|
* Double chest window fix (#3735)peterbell102017-05-282-52/+130
|
* Broadcast mob head changesmathiascode2017-05-281-0/+5
|
* Exported boatLukas Pioch2017-05-241-1/+6
| | | | | | | - 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
* Clang 5.0 fixesLukas Pioch2017-05-217-7/+7
| | | | | - Added override keyword - Removed inherited member variables
* Fixed invisible chests (#3722)Pablo Beltrán2017-05-213-5/+15
| | | Fixes #3479, #3403, #3696
* Corrected brewingstand and added support for fuelLukas Pioch2017-05-082-19/+66
|
* Added a nullptr check to cEntity::IsA (#3659)Marvin Kopf2017-04-011-1/+1
| | | Fixes #3603
* Fireworks can be fired from a dispenserBond-0092017-03-221-1/+4
|
* Updated sounds and effect IDs (#3422)mathiascode2017-02-153-10/+10
|
* Added some blocks and items (#3503)mathiascode2017-02-141-8/+118
|
* Fixed bindings for cBlockArea:Read and Write. (#3568)Mattes D2017-02-051-1/+1
| | | The original bindings accepted nil as the World param, causing a crash.
* Removed ClientHandle.h dependencies from common headers.Mattes D2016-11-185-6/+12
|
* Fixed type-casting-related warnings.Mattes D2016-08-241-2/+1
|
* CMake: Remove needless minimum version specifications.Mattes D2016-07-181-2/+0
|
* Updated API documentation.Mattes D2016-07-182-4/+4
|
* - Add a activation flag to droppers and dispensers. Previously droppers and dispensers shot items with every block update.QUSpilPrgm2016-06-152-4/+4
| | | | - Fixes a range check inside cIncrementalRedstoneSimulator::Simulate
* Update Dispensers and let them act more like in VanillaQUSpilPrgm2016-06-032-10/+81
| | | | | | | | - 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
* Reduced unnecessary block updatesLogicParrot2016-04-222-2/+1
|
* Proper entity destruction in non-ticking chunksLogicParrot2016-02-191-1/+1
|
* Bulk clearing of whitespaceLogicParrot2016-02-0520-159/+159
|
* Changed the format of the MobHead data to allow MobHeads working on MInecraft 1.8bibo382016-01-112-11/+56
| | | | | | The NBT format now carries the texture data and transmit it to the client. See: http://minecraft.gamepedia.com/Head#Block_entity Related to #2674
* Renamed leftover strings to Cuberite / Server, as needed.Mattes D2016-01-011-1/+1
| | | | Also upgraded the user setting file for MSVC to 2013.
* Reorganised the redstone simulatorTiger Wang2015-12-188-89/+4
| | | | | | -> Many thanks to @worktycho for the idea, and @Haxi52 for the implementation plan! * Uses classes and inheritance now * Speed should be improved
* Moved variables into scope, removed unused variables and fixed variablesLukas Pioch2015-12-171-1/+1
|
* allow use failures to propagate from the entity/block to the playerGargaj2015-12-1329-33/+52
|
* Add enum for Sound and Particle EffectsDave Tucker2015-11-243-10/+12
| | | | | | Fixes #2603 Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
* Fix memory leakworktycho2015-11-081-1/+1
| | | Fixes CID 132249
* Implemented brewingLukas Pioch2015-11-034-0/+449
|
* Update Loops required for JsonCPPLukas Pioch2015-10-261-2/+2
|
* Added CircleCI for stylechecking.Mattes D2015-09-172-4/+24
| | | | This will allow us to remove the stylecheck from Travis builds, making them a bit faster, and having fast style checks
* Fixes #2485Tiger Wang2015-09-021-1/+0
|
* Unified the doxy-comment format.Mattes D2015-07-319-60/+49
|
* Silenced and fixed many warning messages across multiple files.Samuel Barney2015-07-292-4/+4
|
* Spawn baby mobshallucino2015-07-161-1/+1
|
* Fixed DropSpenser sound #2333mmdk952015-07-121-2/+2
|
* (Ender) Chests are obstructed by opaque blocks.Nounours Heureux2015-07-072-15/+13
|
* Merge pull request #2224 from cuberite/ChunkQueueCollapsingworktycho2015-07-041-0/+1
|\ | | | | Chunk queue collapsing: MK II
| * Reinstate "Chunk queue collapsing"Tiger Wang2015-06-101-0/+1
| | | | | | | | | | This reinstates commit f36acb683594daff5af3971dcbe3c3a171628b78 and reverts commit adfbc42c021e1bcfcb355933c0fd784306ce0e18.
* | Fixes #2245Tiger Wang2015-06-171-1/+1
| | | | | | | | Whoops :/
* | Fixed overridetycho2015-06-151-1/+1
|/ | | | This was causing a compile error in clang 3.6
* Merge pull request #2144 from mc-server/comparatorsAlexander Harkness2015-06-092-1/+19
|\ | | | | Redstone improvements [SEE DESC]
| * ComparatorsTiger Wang2015-06-062-1/+19
| |
* | Revert "Chunk queue collapsing"worktycho2015-06-071-1/+0
| |
* | Rewrote ChunkSending queue for significantly improved performancetycho2015-06-051-0/+1
| |
* | Fixes multiple furnace issues, including from loading world storageHaoTNN2015-06-032-14/+37
| |
* | Merge branch 'master' of https://github.com/mc-server/MCServerHaoTNN2015-06-034-11/+29
|\|
| * Fix commentstycho2015-05-282-6/+9
| |
| * Made -Weverything an error.tycho2015-05-243-9/+19
| |
| * Merge branch 'master' into PreventNewWarningstycho2015-05-232-2/+2
| |\
| * | Make -Werror disabling file onlytycho2015-05-192-2/+7
| | | | | | | | | | | | Ad fix a load of warnings
* | | Merge remote-tracking branch 'upstream/master'HaoTNN2015-05-232-2/+2
|\ \ \ | | |/ | |/|
| * | Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher.Lukas Pioch2015-05-232-2/+2
| |/
* / Fixes lit furnace issue in #2051haotnn2015-05-191-0/+1
|/
* Improved hoppersTiger Wang2015-05-112-27/+16
| | | | * Fixes #1994
* More style checking.Mattes D2015-05-092-2/+2
| | | | Spaces around some operators are checked.
* Merge pull request #1826 from mc-server/UnifyPacketizerMattes D2015-03-243-14/+28
|\ | | | | Unify packetizer
| * Changed cEntity::m_UniqueID to UInt32.Mattes D2015-03-213-14/+28
| |
* | Correct world height validations.Tommy Santerre2015-03-201-2/+2
|/ | | | | 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
* Removed unwanted base classes from Lua API.Mattes D2015-03-191-0/+2
|
* Moved window code into cpp filesHowaner2015-03-101-1/+1
|
* Merge branch 'master' into InventoryHowaner2015-01-2513-13/+13
|\
| * Initial convertion of a_Dt to std::chronoTycho2015-01-1113-13/+13
| | | | | | | | also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay
* | Merge branch 'master' into InventoryHowaner2014-12-171-2/+2
|\|
| * NULL -> nullptrTiger Wang2014-12-171-2/+2
| |
* | Own classes for all windows.Howaner2014-12-136-3/+6
|/
* MobSpawner fixes.Howaner2014-12-013-3/+10
|
* Many api fixes, add vanilla names to mob type -> string functions and mob spawner fixes.Howaner2014-11-293-57/+12
|
* Merge branch 'master' into MobSpawnerHowaner2014-11-2916-24/+25
|\
| * BlockEntities: Removed the extra semicolon.Mattes D2014-11-2716-24/+25
| |
* | Finished mob spawner implementation.Howaner2014-11-1813-121/+10
| |
* | Merge branch 'master' into MobSpawnerHowaner2014-11-1831-735/+274
|\| | | | | | | | | Conflicts: MCServer/Plugins/Core
| * En masse NULL -> nullptr replaceTiger Wang2014-10-2316-54/+64
| |
| * Fixed trailing whitespace.Mattes D2014-10-212-2/+2
| |
| * Merged branch 'master' of git://github.com/sriehl/MCServerMattes D2014-10-218-97/+64
| |\
| | * fix std:min call, include algorithm and compare same typeSteven Riehl2014-10-121-2/+2
| | |
| | * refactor an if block to std::minSteven Riehl2014-10-121-4/+1
| | |
| | * convert old style casts to fix warningsSteven Riehl2014-10-128-105/+74
| | |
| * | cLuaState: cBlockEntity descendants are pushed with proper class type.Mattes D2014-10-1916-25/+62
| | |
| * | Furnaces now update their block entity typeTiger Wang2014-10-181-2/+4
| | | | | | | | | | | | Therefore improving cChunk's variable boundary checking.
| * | Simpler code.Alexander Harkness2014-10-181-3/+2
| | |
| * | Nullptr?Alexander Harkness2014-10-161-2/+2
| | |
| * | Fixed a number of stylistic issues.Alexander Harkness2014-10-161-7/+7
| | |
| * | Improved furnacesTiger Wang2014-10-032-142/+109
| |/ | | | | | | | | | | | | | | * Fixed progress bar on 1.8 * Fixed bugs * Improved code * Fixes #1068 * Fixes #1070
| * Removed WSSCompactTiger Wang2014-09-3024-437/+0
| |
| * Compilation fixTiger Wang2014-09-281-2/+2
| |
| * SuggestionsTiger Wang2014-09-273-9/+8
| |
| * Merge remote-tracking branch 'origin/master' into chestcartsTiger Wang2014-09-2724-41/+19
| |\ | | | | | | | | | | | | Conflicts: src/Entities/Minecart.cpp
| * | Implemented Chest MinecartsTiger Wang2014-09-137-7/+2
| | |
* | | Fixed compile errors.Howaner2014-09-272-42/+42
| | |
* | | Merge branch 'master' into MobSpawnerHowaner2014-09-2624-41/+19
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: src/MobSpawner.h src/Mobs/Monster.h
| * | Removed more unessicary includesTycho2014-09-2622-35/+12
| | |
| * | Merge pull request #1419 from mc-server/redstoneTestsworktycho2014-09-262-4/+5
| |\ \ | | | | | | | | Added test mocking to IncrementalRedstoneSimulator
| | * | Added first test to show the object can be createdTycho2014-09-171-1/+1
| | | |
| | * | Possibly decoupled IncrementalRedstoneSimulator from the rest of the serverTycho2014-09-112-4/+5
| | |/ | | | | | | | | | THis wil hopefully allow for unit testing
| * | Fixed dispender direction bugHowaner2014-09-251-1/+1
| | |
| * | A few compiler warning fixesChris Darnell2014-09-231-1/+1
| |/
* | Implemented mob spawner.Howaner2014-09-193-43/+323
| |
* | Created MobSpawnerEntity class.Howaner2014-09-174-1/+165
|/
* Added Y-wise asserts to signs.Mattes D2014-09-061-0/+1
| | | | This should help detect #1313's second case.
* Merge pull request #1365 from mc-server/coverityFixesMattes D2014-09-011-5/+4
|\ | | | | Coverity fixes
| * Fixed style.madmaxoft2014-09-011-1/+2
| |
| * Changed null check to assertworktycho2014-08-311-5/+3
| | | | | | Changed the null check to clarify that the function should not be called before the entity has been attached to a world.
* | Rewrited furnace.txt loading.Howaner2014-08-311-1/+1
|/
* Fixed style.madmaxoft2014-08-301-2/+3
|
* Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-08-294-9/+38
|\ | | | | | | | | Conflicts: src/Server.cpp
| * Fixed potential null dereferenceTycho2014-08-101-5/+5
| | | | | | | | Fixes CID 70466
| * Fixed style issuesTycho2014-08-062-2/+5
| |
| * Fixed multiple inhertance being output by toluaTycho2014-08-062-6/+10
| |
| * Removed dependecy of redstone simulator on NoteBlockTycho2014-08-052-1/+13
| |
| * Refactored Redstone simulator not to depend on TNTEntity or DropSpenserENtity DirectlyTycho2014-08-052-3/+13
| |
* | Improved command block securityTiger Wang2014-08-291-6/+19
|/
* Fixed a bug who can used from hacked clients.Howaner2014-08-021-0/+2
|
* Use "default:" in switch.Howaner2014-07-311-3/+6
|
* Renamed "select..." methods to "set..." and better IsValidEffect() function.Howaner2014-07-312-51/+15
|
* Updated documentation.Howaner2014-07-311-3/+3
|
* Renamed functions and added beacon json saving.Howaner2014-07-312-46/+44
|
* Added window update.Howaner2014-07-301-0/+23
|
* Added beacon load/save.Howaner2014-07-301-0/+3
|
* Changed return type from GetPrimaryPotion() and GetSecondaryPotion()Howaner2014-07-301-2/+2
|
* Exported the beacon.Howaner2014-07-302-17/+27
|
* Added beacon.Howaner2014-07-303-32/+337
|
* Removed redundant semicolons and re-added warningarchshift2014-07-243-4/+4
|
* Style: Normalized to no spaces before closing parenthesis.madmaxoft2014-07-218-12/+12
|
* Code style: Fixed braces on separate lines.madmaxoft2014-07-193-3/+6
|
* Subdirs: Only add_library if not using MSVCarchshift2014-07-191-1/+3
|
* BlockEntities/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+35
|
* Fixed spaces before commas.madmaxoft2014-07-181-2/+2
|
* Basic style fixes.madmaxoft2014-07-1710-11/+11
|
* Normalized comments.madmaxoft2014-07-174-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 a DropSpenser AddFace bugTiger Wang2014-07-151-1/+1
|
* Pass cItem by reference.madmaxoft2014-07-151-1/+1
| | | | Fixes CID 66445.
* Fixed Issue with Comparing agast the wrong chest, potentially causing crashes.worktycho2014-07-131-7/+7
|
* Changed BroadcastSoundEffect function to take floating pos.Howaner2014-07-131-1/+1
|
* cHopperEntity: Simplified chest conditions.madmaxoft2014-07-121-10/+4
|
* cChestEntity: Renamed a member to avoid confusion.madmaxoft2014-07-122-8/+9
|
* Fixed alignment.madmaxoft2014-07-121-2/+3
|
* Suggestions and bug fixTiger Wang2014-07-122-10/+18
| | | | | | * 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
* SuggestionsTiger Wang2014-07-111-4/+4
|
* Made things consistentTiger Wang2014-07-081-4/+5
|
* Implemented trapped chests & othersTiger Wang2014-07-074-13/+36
| | | | | | | + Added trapped chests * Fixed a bunch of bugs in the redstone simulator concerning wires and repeaters * Other potential bugfixes
* Properly implemented enderchestsTiger Wang2014-06-292-93/+44
|
* Fixed crashes in HopperEntity.Mattes D2014-06-241-19/+58
| | | | | Some of the coords were off and some functions were assuming too much. Fixes the crash reported in http://forum.mc-server.org/showthread.php?tid=1497
* Chests don't open if obstructedTiger Wang2014-06-221-0/+13
| | | | * Fixes FS383
* Merge branch 'master' into GlobalFixesHowaner2014-06-172-22/+94
|\
| * DispenserEntity code cleanup after PR merge.madmaxoft2014-06-112-30/+30
| |
| * - Fixed a lot of alignmentJoannisO2014-06-051-7/+7
| |
| * - Removed the code that removed fireworks from a dispenser even thoughtJoannisO2014-06-041-3/+0
| | | | | | they weren't launched.
| * - Fixed variable names in a function.JoannisO2014-06-041-2/+2
| |
| * - Fixed a lot of astethicsJoannisO2014-06-042-14/+17
| |
| * - Fixed an issue where there were 2 "DispChunk"-s in the same function.JoannisO2014-06-031-16/+5
| | | | | | Resused the initial one.
| * - Fixed a bug where I didn't return anything in the GetShootVectorJoannisO2014-06-031-0/+2
| | | | | | function. This was however passed as "working" by GCC.
| * - Fixed a bug where I used the FireCharge ITEM instead of the ProjectileJoannisO2014-06-031-1/+1
| | | | | | ENUM
| * - Cleaned up the code massivelyJoannisO2014-06-032-90/+31
| | | | | | | | | | | | | | - Stopped using cChunk in the GetShootVector class. Parameter is now the Metadata of the block - Stopped using cChunk in the SpawnProjectileFromDispenser method now using coordinates and finding the chunk by itself. - Removed the matrix calculations from GetShootVector.
| * - Added doxy comments and exported to luaJoannis2014-06-032-22/+64
| | | | | | | | - Manipulation of the ShootVector is not to be done by the function that wants to spawn a projectile.
| * - Changed the name of the ProjectileLookVector method.JoannisO2014-05-312-3/+3
| | | | | | | | Note: I still think the new name is unclear. Any other suggestions are welcome.
| * - Prefixed all args with "a_"JoannisO2014-05-292-6/+10
| | | | | | - Added braces around the cases.
| * - Removed breaks. I thought it wouldn't compile without them but theJoannisO2014-05-281-2/+0
| | | | | | issue was appearantly solved with an earlier commit.
| * - Fixed an issue where dispensers would only shoot arrows (appearantlyJoannisO2014-05-281-33/+24
| | | | | | | | some commits didn't come through) - Cleaned up the code according to suggestions.
| * - Implemented vertical dispensing for projectiles.Joannis2014-05-282-16/+40
| | | | | | - Fixed some terrible commit issues on my side.
| * - Fixed the ampersands and asterisks to fit the format.Joannis2014-05-272-8/+8
| | | | | | - Fixed the method "SpawnProjectileFromDispenser" to use CamelCasing.
| * - Added support for more types of projectiles in the DispenserJoannisO2014-05-262-38/+51
| | | | | | | | - Improved the method of spawning projectiles in the world - Added another method for spawning the projectiles
| * Added Arrow- and FireCharge-Dispensing to DispenserEntity.JoannisO2014-05-262-27/+95
| |
* | Code improvementsHowaner2014-05-281-5/+2
| |
* | Fix skull bugs.Howaner2014-05-281-0/+5
|/
* Added static const, initialized fields.archshift2014-04-272-1/+4
|
* Cmake generated projects for IDEs include headers in project files.archshift2014-04-251-0/+1
|
* Merge pull request #909 from jfhumann/fixesMattes D2014-04-223-11/+16
|\ | | | | | | | | 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
| * Fixed Flint and Steel, reverted Minecart change, renamed a parameter namejfhumann2014-04-191-5/+5
| |
| * Did some static analysis, fixed some bugs and optimized a lot of codejfhumann2014-04-183-8/+13
| |
* | Fixed formatting, made function static.madmaxoft2014-04-192-13/+18
| |
* | Some tweaksSTRWarrior2014-04-121-5/+17
| | | | | | | | | | GetPyramidLevel returns 0 when no layers were found, 1 for one layer etc. Auto adjust the minY and/or maxY to 0 if the beacon is low.
* | Removed debug message.STRWarrior2014-04-121-1/+0
| |
* | Simplefied GetPyramidLevelSTRWarrior2014-04-121-10/+3
| |
* | Implemented the skeleton code for the beacon.STRWarrior2014-04-123-0/+153
|/ | | | There is no handling for the GUI. It can now check how big the pyramid is under the beacon.
* Fixed a few MSVC type warnings.Mattes D2014-04-031-1/+1
|
* Fixed double to float conversions.madmaxoft2014-03-161-1/+1
|
* Add fireball interactHowaner2014-03-141-0/+6
|
* Change TNT Fuse to ticksHowaner2014-03-081-1/+1
|
* Add Flower PotsHowaner2014-03-073-0/+210
|
* Documented the changes in cJukeboxEntity.madmaxoft2014-02-281-2/+3
|
* Merge pull request #709 from Howaner/GlobalFixesMattes D2014-02-282-16/+48
|\ | | | | Add 'Group not found', when the Server load the users.ini and add auto g...
| * Better Jukebox APIHowaner2014-02-212-16/+48
| |
* | Fixed compilation in MSVC (forward class definitions).madmaxoft2014-02-242-0/+2
| |
* | BlockEntities is warnings freeTycho2014-02-246-3/+11
|/
* Rename SkullEntity to MobHeadEntityHowaner2014-02-195-189/+189
|
* Add break to Protocol17x.cpp and use new comment delimiterHowaner2014-02-191-7/+7
|
* Add Heads completelyHowaner2014-02-183-5/+3
|
* Add Skulls/HeadsHowaner2014-02-173-0/+191
|
* Fixed typographical errorTiger Wang2014-02-151-2/+1
|
* Removed debug messages againTiger Wang2014-02-151-6/+0
|
* Added proper debug messagesTiger Wang2014-02-131-3/+8
|
* Fancy stuff with constant referencesTiger Wang2014-02-131-2/+2
|
* Added more missing GetClassStatic()sTiger Wang2014-02-122-0/+4
|
* Removed some unneeded BroadcastWholeWindow()sTiger Wang2014-02-124-23/+2
|
* Changed inheritance a bitTiger Wang2014-02-127-33/+47
| | | | * cBlockEntityWithItems now inherits from cBlockEntityWindowOwner
* Fixed #190Tiger Wang2014-02-111-2/+67
| | | | + Hoppers now collect pickups above them
* Fixed #612Tiger Wang2014-02-112-0/+16
| | | | * Chests send contents updates to client
* Minor style improvements for the merged PR.Mattes D2014-01-231-4/+4
|
* Command block fixes 2andrew2014-01-231-6/+20
|
* Removed unneeded paramtersTiger Wang2014-01-191-1/+1
|
* Changed SendBlockEntity format slightlyTiger Wang2014-01-191-24/+2
| | | | | * Writing NBT is now in Protocol, not BlockEntity files * Fixed a last output bug
* Improved command blocksTiger Wang2014-01-191-5/+37
| | | | | | | * Their command and previous output are displayed on the client * They have a BlockHandler implementation, so you can't place blocks on them anymore + As a side effect, implemented UpdateBlockEntity
* Command block fixesandrew2014-01-182-38/+5
|
* Parse the MC|AdvCdm plugin messageandrew2014-01-181-0/+2
|
* Command blocks: Execute()andrew2014-01-181-5/+27
|
* Command block (de)serializationandrew2014-01-182-3/+42
|
* Basic command block implementationandrew2014-01-183-11/+271
|
* Removed obsoleted functionsTiger Wang2014-01-162-4/+4
|
* Fixed a few MSVC warnings.madmaxoft2014-01-062-5/+4
|
* Fixed compilation in VC2008.madmaxoft2013-12-301-2/+1
| | | | Also removed an unused inline header file (yuck).
* converted commneted paramater names to the unused macroTycho Bickerstaff2013-12-222-2/+8
|
* Chunk is now warnings cleanTycho Bickerstaff2013-12-213-3/+3
|
* fixed hidden bug with furnaces ignoring time burntTycho Bickerstaff2013-12-211-1/+1
| | | | | | this patch fixes an issue with furnaces where they would ignore the time burnt in setBurnTimes this did not cause a problem as this function was only called with the same value as the one it was using for time burnt
* ChunkSender is now warnings cleanTycho Bickerstaff2013-12-211-1/+1
|
* Merge branch 'master' into cmakeTycho Bickerstaff2013-12-202-4/+4
|\
| * Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT).madmaxoft2013-12-202-4/+4
| |
* | added blocks and blockentitiesTycho Bickerstaff2013-12-191-0/+11
|/
* Fixed multiple inheritance in ToLua++.madmaxoft2013-12-165-20/+20
| | | | This fixes #422.
* 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-073-10/+201
| | | | | | | | Note that they just mirror chests now, so no per player inventory.
* | Fixed pickups spawning for BlockEntitiesTiger Wang2013-12-061-1/+1
|/
* Moved json includes to where they are really needed.madmaxoft2013-11-281-0/+1
|
* Fixed VC2008 compilation, normalized include paths.madmaxoft2013-11-275-5/+5
|
* Fixed the remaining derpsAlexander Harkness2013-11-275-5/+5
|
* Further attempts to fix compileTiger Wang2013-11-255-5/+5
|
* Attempt to fix compilationTiger Wang2013-11-245-5/+5
|
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-241-0/+5
| | | | | Conflicts: GNUmakefile
* Moved source to srcAlexander Harkness2013-11-2421-0/+3033