summaryrefslogtreecommitdiffstats
path: root/src/BlockEntities (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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